… | |
… | |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
|
|
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
10 | * |
11 | * |
11 | * This program is free software; you can redistribute it and/or modify |
12 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by |
13 | * it under the terms of the GNU General Public License as published by |
13 | * the Free Software Foundation; either version 2 of the License, or |
14 | * the Free Software Foundation; either version 2 of the License, or |
14 | * (at your option) any later version. |
15 | * (at your option) any later version. |
… | |
… | |
62 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
63 | #define SWCH(opt, option, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
64 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | |
66 | |
66 | /* convenient macros */ |
67 | /* convenient macros */ |
67 | #define optList_strlen(i) \ |
68 | #define optList_isString(i) \ |
68 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | (optList[i].flag == 0) |
69 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
70 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
71 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
72 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
73 | #define optList_size \ |
74 | #define optList_size \ |
… | |
… | |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
99 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
100 | #if HAVE_SCROLLBARS |
|
|
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
103 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
103 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
104 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
104 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
105 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
105 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
106 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
106 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
107 | #endif |
|
|
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
109 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
112 | #if ENABLE_TRANSPARENCY |
111 | #if ENABLE_TRANSPARENCY |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
116 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), |
115 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
117 | #endif |
116 | #endif |
118 | #if OFF_FOCUS_FADING |
117 | #if OFF_FOCUS_FADING |
119 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
118 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
120 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
121 | #endif |
120 | #endif |
122 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
121 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
123 | #ifndef NO_BELL |
122 | #ifndef NO_BELL |
124 | # if ENABLE_FRILLS |
123 | # if ENABLE_FRILLS |
… | |
… | |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
170 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
171 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
173 | #if ENABLE_FRILLS |
172 | #if ENABLE_FRILLS |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
173 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
175 | #endif |
174 | #endif |
176 | #ifdef KEEP_SCROLLCOLOR |
|
|
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
175 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
176 | #ifdef RXVT_SCROLLBAR |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | #endif /* KEEP_SCROLLCOLOR */ |
178 | #endif |
180 | #ifdef OPTION_HC |
179 | #ifdef OPTION_HC |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
182 | #endif |
181 | #endif |
183 | #ifndef NO_CURSORCOLOR |
182 | #ifndef NO_CURSORCOLOR |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
183 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
… | |
… | |
214 | #if ENABLE_XEMBED |
213 | #if ENABLE_XEMBED |
215 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
214 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
216 | #endif |
215 | #endif |
217 | #if XFT |
216 | #if XFT |
218 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
217 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
|
|
218 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
219 | #endif |
219 | #endif |
220 | #if ENABLE_FRILLS |
220 | #if ENABLE_FRILLS |
221 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
221 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
222 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
222 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
223 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
223 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
… | |
… | |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
240 | #endif |
240 | #endif |
241 | #ifndef NO_DELETE_KEY |
241 | #ifndef NO_DELETE_KEY |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
243 | #endif |
243 | #endif |
244 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
245 | #ifdef PRINTPIPE |
244 | #ifdef PRINTPIPE |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
247 | #endif |
246 | #endif |
248 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
249 | #ifdef CUTCHAR_RESOURCE |
248 | #ifdef CUTCHAR_RESOURCE |
… | |
… | |
360 | "pointerBlank," |
359 | "pointerBlank," |
361 | #endif |
360 | #endif |
362 | #if defined(NO_RESOURCES) |
361 | #if defined(NO_RESOURCES) |
363 | "NoResources," |
362 | "NoResources," |
364 | #endif |
363 | #endif |
365 | "scrollbars=" |
364 | "scrollbars=plain" |
366 | #if !defined(HAVE_SCROLLBARS) |
|
|
367 | "NONE" |
|
|
368 | #else |
|
|
369 | # if defined(PLAIN_SCROLLBAR) |
|
|
370 | "plain" |
|
|
371 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
372 | "+" |
|
|
373 | # endif |
|
|
374 | # endif |
|
|
375 | # if defined(RXVT_SCROLLBAR) |
365 | #if defined(RXVT_SCROLLBAR) |
376 | "rxvt" |
366 | "+rxvt" |
377 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
378 | "+" |
|
|
379 | # endif |
|
|
380 | # endif |
367 | #endif |
381 | # if defined(NEXT_SCROLLBAR) |
368 | #if defined(NEXT_SCROLLBAR) |
382 | "NeXT" |
369 | "+NeXT" |
383 | # if defined(XTERM_SCROLLBAR) |
|
|
384 | "+" |
|
|
385 | # endif |
|
|
386 | # endif |
370 | #endif |
387 | # if defined(XTERM_SCROLLBAR) |
371 | #if defined(XTERM_SCROLLBAR) |
388 | "xterm" |
372 | "+xterm" |
389 | # endif |
|
|
390 | #endif |
373 | #endif |
391 | "\nUsage: "; /* Usage */ |
374 | "\nUsage: "; /* Usage */ |
392 | |
375 | |
393 | #define INDENT 18 |
376 | #define INDENT 18 |
394 | |
377 | |
… | |
… | |
413 | for (col = 1, i = 0; i < optList_size; i++) |
396 | for (col = 1, i = 0; i < optList_size; i++) |
414 | if (optList[i].desc != NULL) |
397 | if (optList[i].desc != NULL) |
415 | { |
398 | { |
416 | int len = 0; |
399 | int len = 0; |
417 | |
400 | |
418 | if (!optList_isBool (i)) |
401 | if (optList[i].arg) |
419 | { |
402 | len = strlen (optList[i].arg) + 1; |
420 | len = optList_strlen (i); |
|
|
421 | if (len > 0) |
|
|
422 | len++; /* account for space */ |
|
|
423 | } |
|
|
424 | #ifdef DEBUG_STRICT |
403 | #ifdef DEBUG_STRICT |
425 | assert (optList[i].opt != NULL); |
404 | assert (optList[i].opt != NULL); |
426 | #endif |
405 | #endif |
427 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
406 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
428 | col += len; |
407 | col += len; |
429 | if (col > 79) |
408 | if (col > 79) |
|
|
409 | { |
430 | { /* assume regular width */ |
410 | /* assume regular width */ |
431 | rxvt_log ("\n"); |
411 | rxvt_log ("\n"); |
432 | col = 1 + len; |
412 | col = 1 + len; |
433 | } |
413 | } |
434 | |
414 | |
435 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
415 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
436 | if (optList_strlen (i)) |
416 | if (optList[i].arg) |
437 | rxvt_log (" %s]", optList[i].arg); |
417 | rxvt_log (" %s]", optList[i].arg); |
438 | else |
418 | else |
439 | rxvt_log ("]"); |
419 | rxvt_log ("]"); |
440 | } |
420 | } |
441 | break; |
421 | break; |
… | |
… | |
493 | int i, bad_option = 0; |
473 | int i, bad_option = 0; |
494 | |
474 | |
495 | for (i = 1; i < argc; i++) |
475 | for (i = 1; i < argc; i++) |
496 | { |
476 | { |
497 | unsigned int entry, longopt = 0; |
477 | unsigned int entry, longopt = 0; |
498 | const char *flag, *opt; |
478 | const char *opt; |
|
|
479 | int flag; |
499 | |
480 | |
500 | opt = argv[i]; |
481 | opt = argv[i]; |
501 | |
482 | |
502 | if (*opt == '-') |
483 | if (*opt == '-') |
503 | { |
484 | { |
504 | flag = resval_on; |
485 | flag = 1; |
505 | |
486 | |
506 | if (*++opt == '-') |
487 | if (*++opt == '-') |
507 | longopt = *opt++; /* long option */ |
488 | longopt = *opt++; /* long option */ |
508 | } |
489 | } |
509 | else if (*opt == '+') |
490 | else if (*opt == '+') |
510 | { |
491 | { |
511 | flag = resval_off; |
492 | flag = 0; |
512 | |
493 | |
513 | if (*++opt == '+') |
494 | if (*++opt == '+') |
514 | longopt = *opt++; /* long option */ |
495 | longopt = *opt++; /* long option */ |
515 | } |
496 | } |
516 | else |
497 | else |
… | |
… | |
534 | break; |
515 | break; |
535 | |
516 | |
536 | if (entry < optList_size) |
517 | if (entry < optList_size) |
537 | { |
518 | { |
538 | if (optList_isReverse (entry)) |
519 | if (optList_isReverse (entry)) |
539 | flag = flag == resval_on ? resval_off : resval_on; |
520 | flag = !flag; |
540 | |
521 | |
541 | if (optList_strlen (entry)) |
522 | if (optList_isString (entry)) |
542 | { |
523 | { |
543 | /* |
524 | /* |
544 | * special cases are handled in main.c:main () to allow |
525 | * special cases are handled in main.c:main () to allow |
545 | * X resources to set these values before we settle for |
526 | * X resources to set these values before we settle for |
546 | * default values |
527 | * default values |
547 | */ |
528 | */ |
548 | |
529 | |
549 | if (optList[entry].doff != -1) |
530 | if (optList[entry].doff != -1) |
550 | { |
531 | { |
551 | if (flag == resval_on && i+1 == argc) |
532 | if (flag && i+1 == argc) |
552 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
533 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
553 | |
534 | |
554 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
535 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
555 | } |
536 | } |
556 | } |
537 | } |
557 | else |
538 | else |
|
|
539 | { |
558 | { /* boolean value */ |
540 | /* boolean value */ |
559 | set_option (optList[entry].index, flag == resval_on); |
541 | set_option (optList[entry].index, flag); |
560 | |
542 | |
561 | if (optList[entry].doff != -1) |
543 | if (optList[entry].doff != -1) |
562 | rs[optList[entry].doff] = flag; |
544 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
563 | } |
545 | } |
564 | } |
546 | } |
565 | #ifndef NO_RESOURCES |
547 | #ifndef NO_RESOURCES |
566 | else if (!strcmp (opt, "xrm")) |
548 | else if (!strcmp (opt, "xrm")) |
567 | { |
549 | { |
… | |
… | |
624 | } |
606 | } |
625 | |
607 | |
626 | /* |
608 | /* |
627 | * look for something like this (XK_Delete) |
609 | * look for something like this (XK_Delete) |
628 | * rxvt*keysym.0xFFFF: "\177" |
610 | * rxvt*keysym.0xFFFF: "\177" |
629 | * |
|
|
630 | * arg will be |
|
|
631 | * NULL for ~/.Xdefaults and |
|
|
632 | * non-NULL for command-line options (need to allocate) |
|
|
633 | */ |
611 | */ |
634 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
635 | |
612 | |
636 | struct keysym_vocabulary_t |
613 | struct keysym_vocabulary_t |
637 | { |
614 | { |
638 | const char *name; |
615 | const char *name; |
639 | unsigned short len; |
616 | unsigned short len; |
640 | unsigned short value; |
617 | unsigned short value; |
641 | }; |
618 | }; |
642 | keysym_vocabulary_t keysym_vocabulary[] = |
619 | static const keysym_vocabulary_t keysym_vocabulary[] = |
643 | { |
620 | { |
644 | { "ISOLevel3", 9, Level3Mask }, |
621 | { "ISOLevel3", 9, Level3Mask }, |
645 | { "AppKeypad", 9, AppKeypadMask }, |
622 | { "AppKeypad", 9, AppKeypadMask }, |
646 | { "Control", 7, ControlMask }, |
623 | { "Control", 7, ControlMask }, |
647 | { "NumLock", 7, NumLockMask }, |
624 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
669 | }; |
646 | }; |
670 | |
647 | |
671 | int |
648 | int |
672 | rxvt_term::parse_keysym (const char *str, const char *arg) |
649 | rxvt_term::parse_keysym (const char *str, const char *arg) |
673 | { |
650 | { |
674 | int n, sym; |
651 | int sym; |
675 | unsigned int state = 0; |
652 | unsigned int state = 0; |
676 | const char *pmodend = NULL; |
653 | const char *key = strrchr (str, '-'); |
677 | char *newarg = NULL; |
|
|
678 | char newargstr[NEWARGLIM]; |
|
|
679 | |
654 | |
680 | if (arg == NULL) |
655 | if (!key) |
681 | { |
656 | key = str; |
682 | n = sizeof ("keysym.") - 1; |
|
|
683 | if (strncmp (str, "keysym.", n)) |
|
|
684 | return 0; |
|
|
685 | |
|
|
686 | str += n; /* skip `keysym.' */ |
|
|
687 | if (!(pmodend = strchr (str, ':'))) |
|
|
688 | return -1; |
|
|
689 | } |
|
|
690 | else |
657 | else |
691 | pmodend = str + strlen(str); |
658 | key++; |
692 | |
659 | |
693 | for (--pmodend; str < pmodend; --pmodend) |
660 | // string or key is empty |
694 | if (*pmodend == '-') |
661 | if (*arg == '\0' || *key == '\0') |
695 | break; |
662 | return -1; |
696 | |
663 | |
|
|
664 | // parse modifiers |
697 | while (str < pmodend) |
665 | while (str < key) |
698 | { |
666 | { |
699 | unsigned int i; |
667 | unsigned int i; |
700 | |
668 | |
701 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
669 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
702 | { |
670 | { |
… | |
… | |
713 | |
681 | |
714 | if (*str == '-') |
682 | if (*str == '-') |
715 | ++str; |
683 | ++str; |
716 | } |
684 | } |
717 | |
685 | |
718 | /* some scanf () have trouble with a 0x prefix */ |
686 | // convert keysym name to keysym number |
719 | if (str[0] == '0' && toupper (str[1]) == 'X') |
687 | if ((sym = XStringToKeysym (str)) == None) |
720 | { |
688 | { |
721 | str += 2; |
689 | // fallback on hexadecimal parsing |
722 | |
690 | char *end; |
|
|
691 | sym = strtol (str, &end, 16); |
723 | if (arg) |
692 | if (*end) |
724 | { |
|
|
725 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
726 | return -1; |
|
|
727 | } |
|
|
728 | else |
|
|
729 | { |
|
|
730 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
731 | return -1; |
|
|
732 | |
|
|
733 | /* cue to ':', it's there since sscanf () worked */ |
|
|
734 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
735 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
736 | newarg = newargstr; |
|
|
737 | } |
|
|
738 | } |
|
|
739 | else |
|
|
740 | { |
|
|
741 | /* |
|
|
742 | * convert keysym name to keysym number |
|
|
743 | */ |
|
|
744 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
745 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
746 | |
|
|
747 | if (arg == NULL) |
|
|
748 | { |
|
|
749 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
750 | return -1; |
|
|
751 | |
|
|
752 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
753 | } |
|
|
754 | |
|
|
755 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
756 | return -1; |
693 | return -1; |
757 | } |
694 | } |
758 | |
695 | |
759 | if (newarg == NULL) |
|
|
760 | { |
|
|
761 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
762 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
763 | newarg = newargstr; |
|
|
764 | } |
|
|
765 | |
|
|
766 | if (*newarg == '\0') |
|
|
767 | return -1; |
|
|
768 | |
|
|
769 | keyboard->register_user_translation (sym, state, newarg); |
696 | keyboard->register_user_translation (sym, state, arg); |
770 | return 1; |
697 | return 1; |
771 | } |
698 | } |
772 | |
699 | |
773 | # endif /* KEYSYM_RESOURCE */ |
700 | # endif /* KEYSYM_RESOURCE */ |
774 | #endif /* NO_RESOURCES */ |
701 | #endif /* NO_RESOURCES */ |