… | |
… | |
397 | switch (type) |
397 | switch (type) |
398 | { |
398 | { |
399 | case 0: /* brief listing */ |
399 | case 0: /* brief listing */ |
400 | rxvt_log (" [-help] [--help]\n"); |
400 | rxvt_log (" [-help] [--help]\n"); |
401 | |
401 | |
402 | for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) |
402 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
403 | if (optList[i].desc != NULL) |
403 | if (optList[i].desc != NULL) |
404 | { |
404 | { |
405 | int len = 0; |
405 | int len = 0; |
406 | |
406 | |
407 | if (optList[i].arg) |
407 | if (optList[i].arg) |
… | |
… | |
425 | break; |
425 | break; |
426 | |
426 | |
427 | case 1: /* full command-line listing */ |
427 | case 1: /* full command-line listing */ |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
429 | |
429 | |
430 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
430 | for (i = 0; i < ecb_array_length (optList); i++) |
431 | if (optList[i].desc != NULL) |
431 | if (optList[i].desc != NULL) |
432 | { |
432 | { |
433 | assert (optList[i].opt != NULL); |
433 | assert (optList[i].opt != NULL); |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
… | |
… | |
444 | |
444 | |
445 | case 2: /* full resource listing */ |
445 | case 2: /* full resource listing */ |
446 | rxvt_log (" [options] [-e command args]\n\n" |
446 | rxvt_log (" [options] [-e command args]\n\n" |
447 | "where resources (long-options) include:\n"); |
447 | "where resources (long-options) include:\n"); |
448 | |
448 | |
449 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
449 | for (i = 0; i < ecb_array_length (optList); i++) |
450 | if (optList[i].kw != NULL) |
450 | if (optList[i].kw != NULL) |
451 | rxvt_log (" %s: %*s%s\n", |
451 | rxvt_log (" %s: %*s%s\n", |
452 | optList[i].kw, |
452 | optList[i].kw, |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
… | |
… | |
507 | |
507 | |
508 | if (!strcmp (opt, "h")) |
508 | if (!strcmp (opt, "h")) |
509 | rxvt_usage (0); |
509 | rxvt_usage (0); |
510 | |
510 | |
511 | /* feature: always try to match long-options */ |
511 | /* feature: always try to match long-options */ |
512 | for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
512 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
514 | || (!longopt |
514 | || (!longopt |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
516 | break; |
516 | break; |
517 | |
517 | |
518 | if (entry < ARRAY_LENGTH(optList)) |
518 | if (entry < ecb_array_length (optList)) |
519 | { |
519 | { |
520 | if (optList_isReverse (entry)) |
520 | if (optList_isReverse (entry)) |
521 | flag = !flag; |
521 | flag = !flag; |
522 | |
522 | |
523 | if (optList_isString (entry)) |
523 | if (optList_isString (entry)) |
… | |
… | |
584 | * Define key from XrmEnumerateDatabase. |
584 | * Define key from XrmEnumerateDatabase. |
585 | * quarks will be something like |
585 | * quarks will be something like |
586 | * "rxvt" "keysym" "0xFF01" |
586 | * "rxvt" "keysym" "0xFF01" |
587 | * value will be a string |
587 | * value will be a string |
588 | */ |
588 | */ |
589 | int |
589 | static int |
590 | rxvt_define_key (XrmDatabase *database UNUSED, |
590 | rxvt_define_key (XrmDatabase *database ecb_unused, |
591 | XrmBindingList bindings UNUSED, |
591 | XrmBindingList bindings ecb_unused, |
592 | XrmQuarkList quarks, |
592 | XrmQuarkList quarks, |
593 | XrmRepresentation *type UNUSED, |
593 | XrmRepresentation *type ecb_unused, |
594 | XrmValue *value, |
594 | XrmValue *value, |
595 | XPointer closure UNUSED) |
595 | XPointer closure ecb_unused) |
596 | { |
596 | { |
597 | int last; |
597 | int last; |
598 | |
598 | |
599 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
599 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
600 | ; |
600 | ; |
… | |
… | |
663 | // parse modifiers |
663 | // parse modifiers |
664 | while (str < key) |
664 | while (str < key) |
665 | { |
665 | { |
666 | unsigned int i; |
666 | unsigned int i; |
667 | |
667 | |
668 | for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) |
668 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
669 | { |
669 | { |
670 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
670 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
671 | { |
671 | { |
672 | state |= keysym_vocabulary[i].value; |
672 | state |= keysym_vocabulary[i].value; |
673 | str += keysym_vocabulary[i].len; |
673 | str += keysym_vocabulary[i].len; |
674 | break; |
674 | break; |
675 | } |
675 | } |
676 | } |
676 | } |
677 | |
677 | |
678 | if (i >= ARRAY_LENGTH(keysym_vocabulary)) |
678 | if (i >= ecb_array_length (keysym_vocabulary)) |
679 | return -1; |
679 | return -1; |
680 | |
680 | |
681 | if (*str == '-') |
681 | if (*str == '-') |
682 | ++str; |
682 | ++str; |
683 | } |
683 | } |
… | |
… | |
690 | sym = strtol (str, &end, 16); |
690 | sym = strtol (str, &end, 16); |
691 | if (*end) |
691 | if (*end) |
692 | return -1; |
692 | return -1; |
693 | } |
693 | } |
694 | |
694 | |
|
|
695 | wchar_t *ws = rxvt_mbstowcs (arg); |
695 | keyboard->register_user_translation (sym, state, arg); |
696 | keyboard->register_user_translation (sym, state, ws); |
|
|
697 | free (ws); |
696 | return 1; |
698 | return 1; |
697 | } |
699 | } |
698 | |
700 | |
699 | # endif /* KEYSYM_RESOURCE */ |
701 | # endif /* KEYSYM_RESOURCE */ |
700 | #endif /* NO_RESOURCES */ |
702 | #endif /* NO_RESOURCES */ |
… | |
… | |
743 | XrmMergeDatabases (option_db, &database); |
745 | XrmMergeDatabases (option_db, &database); |
744 | option_db = NULL; |
746 | option_db = NULL; |
745 | /* |
747 | /* |
746 | * Query resources for options that affect us |
748 | * Query resources for options that affect us |
747 | */ |
749 | */ |
748 | for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
750 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
749 | { |
751 | { |
750 | int s; |
752 | int s; |
751 | const char *kw = optList[entry].kw; |
753 | const char *kw = optList[entry].kw; |
752 | |
754 | |
753 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
755 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
791 | class_prefix[2] = NULLQUARK; |
793 | class_prefix[2] = NULLQUARK; |
792 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
794 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
793 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
795 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
794 | XrmEnumOneLevel, rxvt_define_key, NULL); |
796 | XrmEnumOneLevel, rxvt_define_key, NULL); |
795 | # ifdef RESFALLBACK |
797 | # ifdef RESFALLBACK |
796 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
797 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
798 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
798 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
799 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
800 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
799 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
801 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
800 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
802 | XrmEnumOneLevel, rxvt_define_key, NULL); |
801 | XrmEnumOneLevel, rxvt_define_key, NULL); |
803 | # endif |
802 | # endif |
804 | # endif |
803 | # endif |