| … | |
… | |
| 33 | |
33 | |
| 34 | /* place holders used for parsing command-line options */ |
34 | /* place holders used for parsing command-line options */ |
| 35 | #define Optflag_Reverse 0x40000000UL |
35 | #define Optflag_Reverse 0x40000000UL |
| 36 | #define Optflag_Boolean 0x80000000UL |
36 | #define Optflag_Boolean 0x80000000UL |
| 37 | #define Optflag_mask 0x3fffffffUL |
37 | #define Optflag_mask 0x3fffffffUL |
| 38 | |
|
|
| 39 | /* #define DEBUG_RESOURCES */ |
|
|
| 40 | |
38 | |
| 41 | /*{{{ monolithic option/resource structure: */ |
39 | /*{{{ monolithic option/resource structure: */ |
| 42 | /* |
40 | /* |
| 43 | * `string' options MUST have a usage argument |
41 | * `string' options MUST have a usage argument |
| 44 | * `switch' and `boolean' options have no argument |
42 | * `switch' and `boolean' options have no argument |
| … | |
… | |
| 218 | #if ENABLE_FRILLS |
216 | #if ENABLE_FRILLS |
| 219 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
217 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
| 220 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
218 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
| 221 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
219 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
| 222 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
220 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
|
|
221 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
| 223 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
| 224 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
| 225 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
| 226 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
| 227 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
| … | |
… | |
| 318 | #if defined(TRANSPARENT) |
317 | #if defined(TRANSPARENT) |
| 319 | "transparent," |
318 | "transparent," |
| 320 | #endif |
319 | #endif |
| 321 | #if TINTING |
320 | #if TINTING |
| 322 | "tint," |
321 | "tint," |
| 323 | #endif |
|
|
| 324 | #if defined(UTMP_SUPPORT) |
|
|
| 325 | "utmp," |
|
|
| 326 | #endif |
322 | #endif |
| 327 | #if defined(USE_XIM) |
323 | #if defined(USE_XIM) |
| 328 | "XIM," |
324 | "XIM," |
| 329 | #endif |
325 | #endif |
| 330 | "scrollbars=" |
326 | "scrollbars=" |
| … | |
… | |
| 364 | "8bitctrls," |
360 | "8bitctrls," |
| 365 | #endif |
361 | #endif |
| 366 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
| 367 | "frills," |
363 | "frills," |
| 368 | #endif |
364 | #endif |
| 369 | #if defined(PREFER_24BIT) |
|
|
| 370 | "24bit," |
|
|
| 371 | #endif |
|
|
| 372 | #if defined(SELECTION_SCROLLING) |
365 | #if defined(SELECTION_SCROLLING) |
| 373 | "selectionscrolling," |
366 | "selectionscrolling," |
| 374 | #endif |
367 | #endif |
| 375 | #if MOUSE_WHEEL |
368 | #if MOUSE_WHEEL |
| 376 | "wheel," |
369 | "wheel," |
| … | |
… | |
| 386 | #endif |
379 | #endif |
| 387 | #if defined(POINTER_BLANK) |
380 | #if defined(POINTER_BLANK) |
| 388 | "pointerBlank," |
381 | "pointerBlank," |
| 389 | #endif |
382 | #endif |
| 390 | #if defined(NO_RESOURCES) |
383 | #if defined(NO_RESOURCES) |
| 391 | "NoResources" |
384 | "NoResources," |
| 392 | #endif |
385 | #endif |
|
|
386 | "v" VERSION |
| 393 | "\nUsage: "; /* Usage */ |
387 | "\nUsage: "; /* Usage */ |
| 394 | |
388 | |
| 395 | #define INDENT 18 |
389 | #define INDENT 18 |
| 396 | |
390 | |
| 397 | /*{{{ usage: */ |
391 | /*{{{ usage: */ |
| … | |
… | |
| 495 | { |
489 | { |
| 496 | unsigned int entry, longopt = 0; |
490 | unsigned int entry, longopt = 0; |
| 497 | const char *flag, *opt; |
491 | const char *flag, *opt; |
| 498 | |
492 | |
| 499 | opt = argv[i]; |
493 | opt = argv[i]; |
| 500 | #ifdef DEBUG_RESOURCES |
494 | |
| 501 | fprintf (stderr, "argv[%d] = %s: ", i, opt); |
|
|
| 502 | #endif |
|
|
| 503 | if (*opt == '-') |
495 | if (*opt == '-') |
| 504 | { |
496 | { |
| 505 | flag = On; |
497 | flag = On; |
| 506 | if (*++opt == '-') |
498 | if (*++opt == '-') |
| 507 | longopt = *opt++; /* long option */ |
499 | longopt = *opt++; /* long option */ |
| … | |
… | |
| 548 | rs[optList[entry].doff] = flag == On && argv[i+1] |
540 | rs[optList[entry].doff] = flag == On && argv[i+1] |
| 549 | ? argv[++i] : 0; |
541 | ? argv[++i] : 0; |
| 550 | } |
542 | } |
| 551 | else |
543 | else |
| 552 | { /* boolean value */ |
544 | { /* boolean value */ |
| 553 | #ifdef DEBUG_RESOURCES |
|
|
| 554 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
|
|
| 555 | optList[entry].opt, optList[entry].kw, flag); |
|
|
| 556 | #endif |
|
|
| 557 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
545 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
| 558 | |
546 | |
| 559 | if (optList[entry].doff != -1) |
547 | if (optList[entry].doff != -1) |
| 560 | rs[optList[entry].doff] = flag; |
548 | rs[optList[entry].doff] = flag; |
| 561 | } |
549 | } |
| … | |
… | |
| 594 | * "rxvt" "keysym" "0xFF01" |
582 | * "rxvt" "keysym" "0xFF01" |
| 595 | * value will be a string |
583 | * value will be a string |
| 596 | */ |
584 | */ |
| 597 | /* ARGSUSED */ |
585 | /* ARGSUSED */ |
| 598 | int |
586 | int |
| 599 | rxvt_define_key (XrmDatabase *database __attribute__((unused)), |
587 | rxvt_define_key (XrmDatabase *database UNUSED, |
| 600 | XrmBindingList bindings __attribute__((unused)), |
588 | XrmBindingList bindings UNUSED, |
| 601 | XrmQuarkList quarks, |
589 | XrmQuarkList quarks, |
| 602 | XrmRepresentation *type __attribute__((unused)), |
590 | XrmRepresentation *type UNUSED, |
| 603 | XrmValue *value, |
591 | XrmValue *value, |
| 604 | XPointer closure __attribute__((unused))) |
592 | XPointer closure UNUSED) |
| 605 | { |
593 | { |
| 606 | int last; |
594 | int last; |
| 607 | |
595 | |
| 608 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
596 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
| 609 | ; |
597 | ; |
| … | |
… | |
| 777 | } |
765 | } |
| 778 | |
766 | |
| 779 | const char * |
767 | const char * |
| 780 | rxvt_term::x_resource (const char *name) |
768 | rxvt_term::x_resource (const char *name) |
| 781 | { |
769 | { |
| 782 | XrmDatabase database = XrmGetDatabase (display->display); |
770 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 783 | |
771 | |
| 784 | const char *p = get_res (database, rs[Rs_name], name); |
772 | const char *p = get_res (database, rs[Rs_name], name); |
| 785 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
773 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
| 786 | |
774 | |
| 787 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
775 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
| … | |
… | |
| 839 | |
827 | |
| 840 | /* |
828 | /* |
| 841 | * [R5 or later]: enumerate the resource database |
829 | * [R5 or later]: enumerate the resource database |
| 842 | */ |
830 | */ |
| 843 | # ifdef KEYSYM_RESOURCE |
831 | # ifdef KEYSYM_RESOURCE |
| 844 | XrmDatabase database = XrmGetDatabase (display->display); |
832 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 845 | XrmName name_prefix[3]; |
833 | XrmName name_prefix[3]; |
| 846 | XrmClass class_prefix[3]; |
834 | XrmClass class_prefix[3]; |
| 847 | |
835 | |
| 848 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
836 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 849 | name_prefix[1] = XrmStringToName ("keysym"); |
837 | name_prefix[1] = XrmStringToName ("keysym"); |
