aboutsummaryrefslogtreecommitdiff
path: root/console-client
Commit message (Collapse)AuthorAgeFilesLines
* Add more keymapsSamuel Thibault2012-09-231-0/+268
| | | | | * console-client/xkb/xkb-data/keymap/hurd: Add keymaps used by the Debian installer.
* Fix out-of-tree buildSamuel Thibault2012-07-101-1/+2
| | | | | | * console-client/Makefile (xkb/kstoucs_map.c): Make xkb directory in build tree. (CPPFLAGS): Add -I$(CURDIR)/xkb
* Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurdSamuel Thibault2012-07-011-0/+1
|\
| * TODO: make xkb use rulesSamuel Thibault2012-07-011-0/+1
| |
* | Use path to x11 locales from x11.pc instead of our prefixSamuel Thibault2012-07-011-3/+3
|/ | | | | | * configure.in (X11_PREFIX): Define from x11.pc's prefix variable. * console-client/xkb/compose.c (get_compile_file_for_locale): Use X11_PREFIX "/share" instead of DATADIR.
* Fix kstoucs generation dependencySamuel Thibault2012-07-011-3/+3
| | | | | * console-client/Makefile: Make kstoucs.o and kstoucs_pic.o depend on kstoucs_map.c, not kstoucs_map.c
* Merge branch 'master' into xkbSamuel Thibault2012-07-011-5/+1
|\ | | | | | | | | Conflicts: console-client/Makefile
| * Replace fragile manual »make dist« system with one based on »git archive«.Thomas Schwinge2012-04-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makeconf (lndist): Remove target. (dist-hook, dist.tar): New targets. * Makefile (dist): Rewrite this target's as well as accompanying rules. (%-lndist, cp-linked-files, $(lf-inst)): Remove targets. (%.bz2, %.gz, %/dist-hook): New targets. (DISTFILES): Set. * doc/Makefile (DISTFILES): Set. * doc/Makefile (lndist, lndist-info-targets): Remove targets. * include/Makefile (lndist): Remove target. * libthreads/Makefile (lndist, lndist-i386-files, lndist-map-file): Remove targets. * pfinet/Makefile (lndist, lndist-linux-src-net-core-files) (lndist-linux-src-net-ethernet-files, lndist-linux-src-net-ipv4-files) (lndist-linux-src-net-ipv6-files, lndist-linux-src-asm-files) (lndist-linux-src-include-linux-files, lndist-linux-src-include-net-files) (lndist-linux-src-include-asm-files, lndist-glue-include-linux-files) (lndist-glue-include-asm-files): Remove targets. * auth/Makefile (LCLHDRS): Don't set. * boot/Makefile (LCLHDRS, DIST_FILES): Likewise. * bsdfsck/Makefile (LCLHDRS): Likewise. * config/Makefile (DIST_FILES): Likewise. * console-client/Makefile (LCLHDRS): Likewise. * console/Makefile (LCLHDRS, DIST_FILES): Likewise. * doc/Makefile (DIST_FILES): Likewise. * exec/Makefile (LCLHDRS, DIST_FILES): Likewise. * ext2fs/Makefile (LCLHDRS): Likewise. * fatfs/Makefile (LCLHDRS): Likewise. * ftpfs/Makefile (LCLHDRS): Likewise. * hostmux/Makefile (LCLHDRS): Likewise. * hurd/Makefile (DIST_FILES): Likewise. * include/Makefile (LCLHDRS): Likewise. * isofs/Makefile (LCLHDRS, DIST_FILES): Likewise. * libcons/Makefile (LCLHDRS): Likewise. * libdirmgt/Makefile (LCLHDRS): Likewise. * libdiskfs/Makefile (LCLHDRS): Likewise. * libfshelp/Makefile (LCLHDRS): Likewise. * libftpconn/Makefile (LCLHDRS): Likewise. * libihash/Makefile (LCLHDRS): Likewise. * libiohelp/Makefile (LCLHDRS): Likewise. * libnetfs/Makefile (LCLHDRS): Likewise. * libpager/Makefile (LCLHDRS): Likewise. * libpipe/Makefile (LCLHDRS): Likewise. * libports/Makefile (LCLHDRS): Likewise. * libps/Makefile (LCLHDRS): Likewise. * libshouldbeinlibc/Makefile (LCLHDRS): Likewise. * libstore/Makefile (LCLHDRS, DIST_FILES): Likewise. * libthreads/Makefile (LCLHDRS): Likewise. * libtreefs/Makefile (LCLHDRS): Likewise. * libtrivfs/Makefile (LCLHDRS): Likewise. * mach-defpager/Makefile (LCLHDRS): Likewise. * nfs/Makefile (LCLHDRS): Likewise. * nfsd/Makefile (LCLHDRS): Likewise. * pfinet/Makefile (LCLHDRS): Likewise. * pflocal/Makefile (LCLHDRS): Likewise. * proc/Makefile (LCLHDRS, DIST_FILES): Likewise. * release/Makefile (DIST_FILES): Likewise. * storeio/Makefile (LCLHDRS): Likewise. * sutils/Makefile (LCLHDRS): Likewise. * term/Makefile (LCLHDRS, DIST_FILES): Likewise. * tmpfs/Makefile (LCLHDRS): Likewise. * ufs-fsck/Makefile (LCLHDRS): Likewise. * ufs/Makefile (LCLHDRS): Likewise. * usermux/Makefile (LCLHDRS): Likewise. * utils/Makefile (LCLHDRS): Likewise.
| * Automatically regenerate files that depend on $(hurd-version).Thomas Schwinge2012-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to 05f5cc229323a61799388fbb52da84ca8cb502c9 (»configure: Use modern `AC_INIT' invocation.«). * Makeconf (%: %.sh): Depend on config.make. * Makefile (version.h): Use a stamp file. (stamp-version): Depend on config.make. * doc/Makefile (stamp-version): Likewise. * Makeconf (make-deps): Take additional target-specific dependencies, $*-DEPS. * console-client/Makefile (driver-DEPS): Depend on config.make. * libstore/Makefile (module-DEPS): Likewise.
* | Merge branch 'master' into xkbSamuel Thibault2012-07-0110-67/+42
|\| | | | | | | | | | | Conflicts: config.make.in configure.in
| * fix common misspellingsJonathan Neuschäfer2011-08-206-12/+12
| | | | | | | | | | | | * Fix spelling with codespell[1] and manually review it. [1] http://git.profusion.mobi/cgit.cgi/lucas/codespell/
| * Fix restoring from XorgSamuel Thibault2011-08-081-1/+1
| | | | | | | | | | * console-client/vga.c (vga_display_restore_status): Use VGA_GFX_MISC_B8TOBF instead of VGA_GFX_MISC_A0TOAF.
| * Let GNU Mach messages appear under Hurd consoleSamuel Thibault2011-08-083-53/+28
| | | | | | | | | | | | | | | | | | | | | | * console-client/vga-dynafont.c (dynafont_new): Force ASCII glyphs as being always trivially mapped. * console-client/vga-hw.h (VGA_VIDEO_MEM_BASE_ADDR): Set macro to 0x0b8000. * console-client/vga-support.c [!OSKIT_MACH]: Do not include <device/device.h> and <hurd.h>, remove VIDMMAP_BEGIN, VIDMMAP_SIZE and VIDMMAP_KDOFS macros. (vga_init): Remove code which maps video memory from the kd device. Use VGA_GFX_MISC_B8TOBF instead of VGA_GFX_MISC_A0TOAF or VGA_GFX_MISC_A0TOBF.
| * Fix typoSamuel Thibault2011-08-081-1/+1
| | | | | | | | * console-client/vga-dynafont.c (dynafont_lookup_internal): Fix typo.
* | Print KeySymToUcs4 calls.Diego Nieto Cid2011-04-161-0/+13
| |
* | Find the absolute path to <X11/keysymdef.h>Diego Nieto Cid2011-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying the header file relative to $(includeir) won't work because it is defined in terms of prefix variable which is redefined during installation to the destination directory. And the dependency check will fail during 'make install' because the header might not be in the destination tree. * config.make.in (X11_KEYSYMDEF_H, SED): New variables. * configure.in: Check for sed. Find X11/keysymdef.h absolute location using the preprocessor and save it in X11_KEYSYMDEF_H variable. * console-client/Makefile (kstoucs_map.c): Use X11_KEYSYMDEF_H to depend on the header file.
* | Use locale's compose file by default.Diego Nieto Cid2011-04-163-6/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * console-client/Makefile [HAVE_X11=yes](compose-CFLAGS): Define DATADIR. * console-client/pc-kbd.c (pc_kbd_init): Load compose file unconditionally. * console-client/xkb/compose.c: Include fcntl.h, unistd.h and locale.h (struct map_entry, enum callback_result, map_callback): New types. (map_iterate): New function. (struct matcher_context): New type. (match_left_set_right, match_right_set_left): New functions. (get_compose_file_for_locale): Likewise. (read_composefile): Use get_compose_file_for_locale result when argument composefn is NULL.
* | Avoid redefinition of NoSymbol.Diego Nieto Cid2011-04-162-4/+0
| | | | | | | | | | * console-client/xkb/xkb.c: Remove macro NoSymbol. * console-client/xkb/compose.c: Likewise.
* | Delete xkb/HACKING file.Diego Nieto Cid2011-04-161-35/+0
| |
* | Cleanup.Diego Nieto Cid2011-04-164-24/+1
| |
* | Deallocate memory on errors.Diego Nieto Cid2011-04-161-1/+7
| | | | | | | | * console-client/xkb/parser.y(parse_xkbconfig): Free cwd.
* | Remove default keymap.Diego Nieto Cid2011-04-165-2679/+5
| | | | | | | | | | | | | | | | * console-client/xkb/default.xkb: Removed file. * console-client/xkb/makeconf.sh: Likewise. * console-client/xkb/xkbdefaults.c: Likewise. * console-client/xkb/parser.y(parse_xkbconfig): Don't use harcoded defaults, return error when no keymap file is given.
* | Delete Compose file.Diego Nieto Cid2011-04-162-442/+1
| |
* | Add missing dependency.Diego Nieto Cid2011-04-161-0/+2
| |
* | Reimplement KeySymToUcs4.Diego Nieto Cid2011-04-163-311/+60
| | | | | | | | | | | | | | * console-client/Makefile (DIST_FILES): Add xkb/kstoucs_map.sh. (kstoucs_map.c): New target. * console-client/xkb/kstoucs.c: Reimplement KeySymToUcs4. * console-client/xkb/kstoucs_map.sh: New file.
* | Depend on X11 for string to keysym mappings.Diego Nieto Cid2011-04-087-5685/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * config.make.in (HAVE_X11,X11_CFLAGS,X11_LIBS,XKB_BASE): New variables. * configure.in: Check for x11 module. * console-client/Makefile (PC_KBD_SO_SRCS): Move XKB sources... * console-client/Makefile (XKB_SRCS): ... here. New variable. * console-client/Makefile (SRCS): Add $(XKB_SRCS). * console-client/Makefile (LCLHDRS): Add xkb/xkb.h. * console-client/Makefile (XKB_DATA_DIR): Removed variable. * console-client/Makefile (pc_kbd.so.$(hurd-version)): Use patsubst. Depend on XKB objects when HAVE_X11 = yes. * console-client/Makefile (install): Depend on XKB datafiles when HAVE_X11 = yes. * console-client/Makefile (pc-kbd-CFLAGS): Set variable when HAVE_X11 = yes * console-client/Makefile ($(XKB_DATA_DIR),$(XKB_DATA_DIR)/%): Replaced by... * console-client/Makefile[HAVE_X11=yes]($(XKB_BASE),$(XKB_BASE)/%): ... this targets. * console-client/Makefile[HAVE_X11=yes](pc_kbd-LDLIBS): New variable. * console-client/xkb/keysymdef.h: Removed file. * console-client/xkb/ks_tables.h: Likewise. * console-client/xkb/symname.c: Likewise. * console-client/xkb/xkb.c: Include <X11/keysymdef.h>. * console-client/xkb/compose.c: Likewise. * console-client/xkb/xkb.h: Remove XStringToKeysym prototype. Include <X11/Xlib.h>.
* | Update xkb/README.Diego Nieto Cid2011-04-081-22/+17
| | | | | | | | | | | | | | * console-client/xkb/README: Refer to this artifact as "module" instead of "input driver". Key repeater is now implemented by pc-kbd. Update the module's installation and usage procedures.
* | Use first section when there's no default.Diego Nieto Cid2011-04-081-2/+30
| | | | | | | | | | | | * console-client/xkb/parser.y (skip_to_firstsection): New function. (include_section): Call skip_to_firstsection when skip_to_defaultsection fails.
* | * console-client/xkb/parser.y (include_section): Free filename.Diego Nieto Cid2011-04-081-0/+3
| |
* | * console-client/xkb/parser.y (include_section): Remove superflous strdup.Diego Nieto Cid2011-04-081-1/+1
| |
* | Added an example for selecting the keymap.Arne Babenhauserheide2011-04-081-1/+1
| | | | | | | | * console-client/xkb/README: Keymap selection example.
* | Symbols 0..9 stand for their ascii character.Diego Nieto Cid2011-04-081-1/+7
| | | | | | | | * console-client/xkb/parser.y(symbolname): Shift by '0' numbers [0..9].
* | Add support for hexadecimal symbols.Diego Nieto Cid2011-04-081-0/+1
| | | | | | | | * console-client/xkb/parser.y(symbolname): Match and return hex value.
* | Update foreign files.Diego Nieto Cid2011-04-085-4140/+5346
| | | | | | | | | | | | | | | | * console-client/xkb/keysymdef.h: Replaced file. * console-client/xkb/ks_tables.h: Likewise. * console-client/xkb/kstoucs.c: Likewise. * console-client/xkb/symname.c: Likewise. * console-client/xkb/HACKING: New file, added foreign files information.
* | Document new options.Diego Nieto Cid2011-04-081-0/+6
| | | | | | | | * console-client/xkb/README: Updated.
* | * console-client/xkb/xkb.c (iskeypad): Access up to 'width' symbols.Diego Nieto Cid2011-04-081-1/+1
| |
* | 'vmods' is an alias for 'virtual_modifiers'.Diego Nieto Cid2011-04-081-0/+1
| |
* | Fix handling of error conditions.Diego Nieto Cid2011-04-081-2/+2
| | | | | | | | | | * console-client/xkb/parser.y (key_set_action): Test actions variable. (key_set_keysym): Test keysyms instead of keys.
* | Fix memory errors.Diego Nieto Cid2011-04-081-4/+4
| | | | | | | | | | | | | | * console-client/xkb/parser.y (key_set_keysym): Consider symbol's size when reallocing. (key_set_action): Consider (xkb_action_t *)'s size when reallocing. Start clearing levels from 'width' and up to 'level'.
* | Add neo supportAlexander Preisinger2011-04-081-0/+7
| | | | | | | | * console-client/xkb/xkb-data/keymap/hurd: New keymap neo.
* | README updateAlexander Preisinger2011-04-081-4/+4
| |
* | Enable hurd extensions in every layout.Diego Nieto Cid2011-04-081-98/+98
| |
* | Remove obsolete variable declaration.Diego Nieto Cid2011-04-081-1/+0
| |
* | Use vfprintf in debug_printf and write to stderr.Diego Nieto Cid2011-04-081-1/+1
| |
* | Add debugging messages.Diego Nieto Cid2011-04-083-6/+17
| | | | | | | | | | | | | | | | | | * console-client/xkb/lex.l(include_file): Log file changes. * console-client/xkb/parser.y(key_set_keysym): Log symbol associations. (include_section): Log section being read. (symbolssect,keycodesect,key_new): Log current key. * console-client/xkb/xkbdata.c(keyname_add): Log keyname, keycode and hash. (set_rmod_keycode): Log modifier, keyname and keycode.
* | Emit warnings on undeclared virtual modifiers.Diego Nieto Cid2011-04-081-0/+2
| |
* | Report inexistent section.Diego Nieto Cid2011-04-081-6/+36
| | | | | | | | | | | | | | * console-client/xkb/parser.y (include_section): Declare scanner_get_current_location and scanner_get_current_file prototypes. New local variables current_location, current_file and err. Report error and exit when a section cannot be processed successfully.
* | Add function to read the state of the scanner.Diego Nieto Cid2011-04-081-0/+12
| | | | | | | | | | * console-client/xkb/lex.l (scanner_get_current_location): New function. (scanner_get_current_file): Likewise.
* | Check for end of file.Diego Nieto Cid2011-04-081-7/+19
| | | | | | | | | | | | | | | | | | * console-client/xkb/parser.y [!YY_NULL]: Define YY_NULL, the end of file token. * console-client/xkb/parser.y (skip_to_sectionname): If the end of file is reached while skipping symbols return an error. Return 0 on success. * console-client/xkb/parser.y (skip_to_defaultsection): Likewise.
* | Propagate error on unexpected end of files.Diego Nieto Cid2011-04-081-7/+9
| | | | | | | | | | | | * console-client/xkb/lex.l (close_include): Return an error code on failure. (yywrap): Indicate termination when close_include fails.