ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.19 by pcg, Mon Mar 22 15:15:04 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.11 2004/02/13 12:16:21 pcg Exp $ 4 * $Id: xdefaults.C,v 1.19 2004/03/22 15:15:04 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 8 * - original version
9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
… …
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 131#endif
132#ifdef MOUSE_WHEEL 132#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,
134 NULL), 134 NULL),
135#endif
136#ifdef MULTICHAR_SET
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif 135#endif
140#ifndef NO_FRILLS 136#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,
142 "triple click word selection"), 138 "triple click word selection"),
143#endif 139#endif
… …
197 "input style: style = OverTheSpot|OffTheSpot|Root"), 193 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 196#endif
201#endif /* USE_XIM */ 197#endif /* USE_XIM */
202#ifdef GREEK_SUPPORT
203 STRG (Rs_greek_keyboard, "greek_keyboard", "grk", "mode",
204 "greek keyboard mapping; mode = iso | ibm"),
205 RSTRG (Rs_greektoggle_key, "greektoggle_key", "keysym"),
206#endif
207 STRG (Rs_name, NULL, "name", "string", 198 STRG (Rs_name, NULL, "name", "string",
208 "client instance, icon, and title strings"), 199 "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 200 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
… …
249 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
250#endif 241#endif
251#ifdef PRINTPIPE 242#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 243 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 244#endif
254#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
255 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
256 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
257#endif
258 STRG (Rs_modifier, "modifier", "mod", "modifier", 245 STRG (Rs_modifier, "modifier", "mod", "modifier",
259 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
260 INFO ("xrm", "string", "X resource"), 247 INFO ("xrm", "string", "X resource"),
261#ifdef CUTCHAR_RESOURCE 248#ifdef CUTCHAR_RESOURCE
262 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
263#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
264#ifdef ACS_ASCII
265 RSTRG (Rs_acs_chars, "acsChars", "string"),
266#endif /* ACS_ASCII */
267 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
268 INFO ("e", "command arg ...", "command to execute") 252 INFO ("e", "command arg ...", "command to execute")
269 }; 253 };
270 254
271#undef INFO 255#undef INFO
… …
299 "24bit," 283 "24bit,"
300#endif 284#endif
301#if defined(USE_XIM) 285#if defined(USE_XIM)
302 "XIM," 286 "XIM,"
303#endif 287#endif
304#if defined(MULTICHAR_SET)
305 "multichar_languages,"
306#endif
307 "scrollbars=" 288 "scrollbars="
308#if !defined(HAVE_SCROLLBARS) 289#if !defined(HAVE_SCROLLBARS)
309 "NONE" 290 "NONE"
310#else 291#else
292# if defined(PLAIN_SCROLLBAR)
293 "plain"
294# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
295 "+"
296# endif
297# endif
311# if defined(RXVT_SCROLLBAR) 298# if defined(RXVT_SCROLLBAR)
312 "rxvt" 299 "rxvt"
313# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 300# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
314 "+" 301 "+"
315# endif 302# endif
… …
323# if defined(XTERM_SCROLLBAR) 310# if defined(XTERM_SCROLLBAR)
324 "xterm" 311 "xterm"
325# endif 312# endif
326#endif 313#endif
327 "," 314 ","
328#if defined(GREEK_SUPPORT)
329 "Greek,"
330#endif
331#if defined(RXVT_GRAPHICS)
332 "graphics,"
333#endif
334#if defined(NO_BACKSPACE_KEY) 315#if defined(NO_BACKSPACE_KEY)
335 "no_backspace," 316 "no_backspace,"
336#endif 317#endif
337#if defined(NO_DELETE_KEY) 318#if defined(NO_DELETE_KEY)
338 "no_delete," 319 "no_delete,"
… …
359/*{{{ usage: */ 340/*{{{ usage: */
360/*----------------------------------------------------------------------*/ 341/*----------------------------------------------------------------------*/
361static void 342static void
362rxvt_usage (int type) 343rxvt_usage (int type)
363{ 344{
364 unsigned int i, col; 345 unsigned int i, col;
365 346
366 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 347 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
367 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
368 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
369 348
370 switch (type) 349 switch (type)
371 { 350 {
372 case 0: /* brief listing */ 351 case 0: /* brief listing */
373 fprintf (stderr, " [-help] [--help]\n"); 352 rxvt_log (" [-help] [--help]\n");
353
374 for (col = 1, i = 0; i < optList_size (); i++) 354 for (col = 1, i = 0; i < optList_size (); i++)
375 if (optList[i].desc != NULL) 355 if (optList[i].desc != NULL)
376 { 356 {
377 int len = 0; 357 int len = 0;
378 358
… …
387#endif 367#endif
388 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 368 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
389 col += len; 369 col += len;
390 if (col > 79) 370 if (col > 79)
391 { /* assume regular width */ 371 { /* assume regular width */
392 putc ('\n', stderr); 372 rxvt_log ("\n");
393 col = 1 + len; 373 col = 1 + len;
394 } 374 }
375
395 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 376 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
396 optList[i].opt);
397 if (optList_strlen (i)) 377 if (optList_strlen (i))
398 fprintf (stderr, " %s]", optList[i].arg); 378 rxvt_log (" %s]", optList[i].arg);
399 else 379 else
400 fprintf (stderr, "]"); 380 rxvt_log ("]");
401 } 381 }
402 break; 382 break;
403 383
404 case 1: /* full command-line listing */ 384 case 1: /* full command-line listing */
405 fprintf (stderr, " [options] [-e command args]\n\n" 385 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
406 "where options include:\n"); 386
407 for (i = 0; i < optList_size (); i++) 387 for (i = 0; i < optList_size (); i++)
408 if (optList[i].desc != NULL) 388 if (optList[i].desc != NULL)
409 { 389 {
410#ifdef DEBUG_STRICT 390#ifdef DEBUG_STRICT
411 assert (optList[i].opt != NULL); 391 assert (optList[i].opt != NULL);
412#endif 392#endif
413 fprintf (stderr, " %s%s %-*s%s%s\n", 393 rxvt_log (" %s%s %-*s%s%s\n",
414 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 394 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
415 (INDENT - STRLEN (optList[i].opt) 395 (INDENT - STRLEN (optList[i].opt)
416 + (optList_isBool (i) ? 0 : 2)), 396 + (optList_isBool (i) ? 0 : 2)),
417 (optList[i].arg ? optList[i].arg : ""), 397 (optList[i].arg ? optList[i].arg : ""),
418 (optList_isBool (i) ? "turn on/off " : ""), 398 (optList_isBool (i) ? "turn on/off " : ""),
419 optList[i].desc); 399 optList[i].desc);
420 } 400 }
421 fprintf (stderr, "\n --help to list long-options"); 401 rxvt_log ("\n --help to list long-options");
422 break; 402 break;
423 403
424 case 2: /* full resource listing */ 404 case 2: /* full resource listing */
425 fprintf (stderr,
426 " [options] [-e command args]\n\n" 405 rxvt_log (" [options] [-e command args]\n\n"
427 "where resources (long-options) include:\n"); 406 "where resources (long-options) include:\n");
428 407
429 for (i = 0; i < optList_size (); i++) 408 for (i = 0; i < optList_size (); i++)
430 if (optList[i].kw != NULL) 409 if (optList[i].kw != NULL)
431 fprintf (stderr, " %s: %*s%s\n", 410 rxvt_log (" %s: %*s%s\n",
432 optList[i].kw, 411 optList[i].kw,
433 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 412 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
434 (optList_isBool (i) ? "boolean" : optList[i].arg)); 413 (optList_isBool (i) ? "boolean" : optList[i].arg));
435#ifdef KEYSYM_RESOURCE 414#ifdef KEYSYM_RESOURCE
436 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 415 rxvt_log (" " "keysym.sym" ": %*s%s\n",
437 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 416 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
438 "keysym"); 417 "keysym");
439#endif 418#endif
440 fprintf (stderr, "\n -help to list options"); 419 rxvt_log ("\n -help to list options");
441 break; 420 break;
442 } 421 }
443 fprintf (stderr, "\n\n"); 422
444 exit (EXIT_FAILURE); 423 rxvt_log ("\n\n");
424 rxvt_exit_failure ();
445 /* NOTREACHED */ 425 /* NOTREACHED */
446} 426}
447 427
448/*}}} */ 428/*}}} */
449 429
… …
476 longopt = *opt++; /* long option */ 456 longopt = *opt++; /* long option */
477 } 457 }
478 else 458 else
479 { 459 {
480 bad_option = 1; 460 bad_option = 1;
481 rxvt_print_error ("bad option \"%s\"", opt); 461 rxvt_warn ("\"%s\": malformed option.\n", opt);
482 continue; 462 continue;
483 } 463 }
484 464
485 if (!STRCMP (opt, "help")) 465 if (!STRCMP (opt, "help"))
486 rxvt_usage (longopt ? 2 : 1); 466 rxvt_usage (longopt ? 2 : 1);
… …
543 else 523 else
544#ifdef KEYSYM_RESOURCE 524#ifdef KEYSYM_RESOURCE
545 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 525 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
546 if (rxvt_Str_match (opt, "keysym.")) 526 if (rxvt_Str_match (opt, "keysym."))
547 { 527 {
548 const char *str = argv[++i]; 528 const char *str = argv[++i];
549 529
550 if (str != NULL) 530 if (str != NULL)
551 parse_keysym (opt + sizeof ("keysym.") - 1, str); 531 parse_keysym (opt + sizeof ("keysym.") - 1, str);
552 } 532 }
553 else 533 else
554#endif 534#endif
535 {
555 bad_option = 1; 536 bad_option = 1;
537 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
538 }
556 } 539 }
557 540
558 if (bad_option) 541 if (bad_option)
559 rxvt_usage (0); 542 rxvt_usage (0);
560} 543}
… …
570 * quarks will be something like 553 * quarks will be something like
571 * "rxvt" "keysym" "0xFF01" 554 * "rxvt" "keysym" "0xFF01"
572 * value will be a string 555 * value will be a string
573 */ 556 */
574/* ARGSUSED */ 557/* ARGSUSED */
575bool 558int
576rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 559rxvt_define_key (XrmDatabase *database __attribute__((unused)),
560 XrmBindingList bindings __attribute__((unused)),
561 XrmQuarkList quarks,
562 XrmRepresentation *type __attribute__((unused)),
563 XrmValue *value,
564 XPointer closure __attribute__((unused)))
577{ 565{
578 int last; 566 int last;
579 567
580 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 568 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
581 ; 569 ;
… …
677 * the matching algorithm used for memory-save fake resources 665 * the matching algorithm used for memory-save fake resources
678 */ 666 */
679void 667void
680rxvt_term::get_xdefaults (FILE *stream, const char *name) 668rxvt_term::get_xdefaults (FILE *stream, const char *name)
681{ 669{
682 unsigned int len; 670 unsigned int len;
683 char *str, buffer[256]; 671 char *str, buffer[256];
684 672
685 if (stream == NULL) 673 if (stream == NULL)
686 return; 674 return;
675
687 len = STRLEN (name); 676 len = STRLEN (name);
688 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
689 { 678 {
690 unsigned int entry, n; 679 unsigned int entry, n;
691 680
… …
700# ifdef KEYSYM_RESOURCE 689# ifdef KEYSYM_RESOURCE
701 if (!parse_keysym (str, NULL)) 690 if (!parse_keysym (str, NULL))
702# endif /* KEYSYM_RESOURCE */ 691# endif /* KEYSYM_RESOURCE */
703 for (entry = 0; entry < optList_size (); entry++) 692 for (entry = 0; entry < optList_size (); entry++)
704 { 693 {
705 const char *kw = optList[entry].kw; 694 const char *kw = optList[entry].kw;
706 695
707 if (kw == NULL) 696 if (kw == NULL)
708 continue; 697 continue;
698
709 n = STRLEN (kw); 699 n = STRLEN (kw);
710 if (str[n] == ':' && rxvt_Str_match (str, kw)) 700 if (str[n] == ':' && rxvt_Str_match (str, kw))
711 { 701 {
712 /* skip `keyword:' */ 702 /* skip `keyword:' */
713 str += (n + 1); 703 str += n + 1;
714 rxvt_Str_trim (str); 704 rxvt_Str_trim (str);
715 n = STRLEN (str); 705 n = STRLEN (str);
716 if (n && rs[optList[entry].doff] == NULL) 706 if (n && rs[optList[entry].doff] == NULL)
717 { 707 {
718 /* not already set */ 708 /* not already set */
719 int s; 709 int s;
720 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 710 char *p = 0;
721 711
712 for (int o = 0;;)
713 {
714 p = (char *)rxvt_realloc (p, o + n + 1);
722 STRCPY (p, str); 715 MEMCPY (p + o, str, n);
716 o += n;
717 p[o] = 0;
718
719 if (o == 0 || p[o - 1] != '\\') // continuation line
720 break;
721
722 o--; // eat "\"
723
724 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
725 break;
726
727 rxvt_Str_trim (str);
728 n = STRLEN (str);
729 }
730
723 rs[optList[entry].doff] = p; 731 rs[optList[entry].doff] = p;
732 allocated.push_back (p);
733
724 if (optList_isBool (entry)) 734 if (optList_isBool (entry))
725 { 735 {
726 s = STRCASECMP (str, "TRUE") == 0 736 s = STRCASECMP (str, "TRUE") == 0
727 || STRCASECMP (str, "YES") == 0 737 || STRCASECMP (str, "YES") == 0
728 || STRCASECMP (str, "ON") == 0 738 || STRCASECMP (str, "ON") == 0
729 || STRCASECMP (str, "1") == 0; 739 || STRCASECMP (str, "1") == 0;
740
730 if (optList_isReverse (entry)) 741 if (optList_isReverse (entry))
731 s = !s; 742 s = !s;
743
732 if (s) 744 if (s)
733 Options |= (optList[entry].flag); 745 Options |= optList[entry].flag;
734 else 746 else
735 Options &= ~ (optList[entry].flag); 747 Options &= ~optList[entry].flag;
736 } 748 }
737 } 749 }
750
738 break; 751 break;
739 } 752 }
740 } 753 }
741 } 754 }
755
742 rewind (stream); 756 rewind (stream);
743} 757}
744 758
745/*}}} */ 759/*}}} */
746# endif /* ! USE_XGETDEFAULT */ 760# endif /* ! USE_XGETDEFAULT */
… …
757#ifndef NO_RESOURCES 771#ifndef NO_RESOURCES
758 772
759# if defined XAPPLOADDIR 773# if defined XAPPLOADDIR
760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 774# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
761 /* Compute the path of the possibly available localized Rxvt file */ 775 /* Compute the path of the possibly available localized Rxvt file */
762 char *localepath = NULL; 776 char *localepath = NULL;
763 777
764 if (locale != NULL) 778 if (locale != NULL)
765 { /* XXX: must limit length of string */ 779 { /* XXX: must limit length of string */
766 localepath = (char *)rxvt_malloc (256); 780 localepath = (char *)rxvt_malloc (256);
767 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 781 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
768 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 782 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 783 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
770 } 784 }
771 785
772 { 786 {
773# endif 787# endif
… …
775 789
776# ifdef USE_XGETDEFAULT 790# ifdef USE_XGETDEFAULT
777 /* 791 /*
778 * get resources using the X library function 792 * get resources using the X library function
779 */ 793 */
780 int entry; 794 int entry;
781 795
782# ifdef XrmEnumOneLevel 796# ifdef XrmEnumOneLevel
783 int i; 797 int i;
784 char *displayResource, *xe; 798 char *displayResource, *xe;
785 XrmName name_prefix[3]; 799 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 800 XrmClass class_prefix[3];
787 XrmDatabase database, rdb1; 801 XrmDatabase database, rdb1;
788 char fname[1024]; 802 char fname[1024];
789 803
790 XrmInitialize (); 804 XrmInitialize ();
791 database = NULL; 805 database = NULL;
792 806
793 /* Get any Xserver defaults */ 807 /* Get any Xserver defaults */
… …
806 820
807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 821 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
808 { 822 {
809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 823 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
810 ptr, xnames[i]); 824 ptr, xnames[i]);
811 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 825 if ((rdb1 = XrmGetFileDatabase (fname)))
812 { 826 {
813 XrmMergeDatabases (rdb1, &database); 827 XrmMergeDatabases (rdb1, &database);
814# ifndef HAVE_BOTH_XRESOURCE_FILES 828# ifndef HAVE_BOTH_XRESOURCE_FILES
815 break; 829 break;
816# endif 830# endif
… …
828 842
829 /* Add in Rxvt file */ 843 /* Add in Rxvt file */
830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 844# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 845 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
832# endif 846# endif
833 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 847 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
848
834 if (rdb1 != NULL) 849 if (rdb1 != NULL)
835 XrmMergeDatabases (rdb1, &database); 850 XrmMergeDatabases (rdb1, &database);
836 851
837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 852 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
838 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 853 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
839 { 854 {
840 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 855 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
841 - sizeof (APL_SUBCLASS) - 2, xe); 856 - sizeof (RESCLASS) - 2, xe);
842 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 857 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
843 XrmMergeDatabases (rdb1, &database); 858 XrmMergeDatabases (rdb1, &database);
844 } 859 }
845 860
846 XrmSetDatabase (display, database); 861 XrmSetDatabase (display, database);
… …
860 875
861 p = XGetDefault (display, name, kw); 876 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 877 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 878 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
864 { 879 {
865 p = XGetDefault (display, APL_SUBCLASS, kw); 880 p = XGetDefault (display, RESCLASS, kw);
881#ifdef RESFALLBACK
866 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 882 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
867 p = XGetDefault (display, APL_CLASS, kw); 883 p = XGetDefault (display, RESFALLBACK, kw);
884#endif
868 } 885 }
886
869 if (p == NULL && p0) 887 if (p == NULL && p0)
870 p = p0; 888 p = p0;
889
871 if (p) 890 if (p)
872 { 891 {
873 rs[optList[entry].doff] = p; 892 rs[optList[entry].doff] = p;
874 893
875 if (optList_isBool (entry)) 894 if (optList_isBool (entry))
… …
894# ifdef XrmEnumOneLevel 913# ifdef XrmEnumOneLevel
895# ifdef KEYSYM_RESOURCE 914# ifdef KEYSYM_RESOURCE
896 name_prefix[0] = XrmStringToName (name); 915 name_prefix[0] = XrmStringToName (name);
897 name_prefix[1] = XrmStringToName ("keysym"); 916 name_prefix[1] = XrmStringToName ("keysym");
898 name_prefix[2] = NULLQUARK; 917 name_prefix[2] = NULLQUARK;
899 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 918 class_prefix[0] = XrmStringToName (RESCLASS);
900 class_prefix[1] = XrmStringToName ("Keysym"); 919 class_prefix[1] = XrmStringToName ("Keysym");
901 class_prefix[2] = NULLQUARK; 920 class_prefix[2] = NULLQUARK;
902 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 921 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
903 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 922 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
904 XrmEnumOneLevel, rxvt_define_key, NULL); 923 XrmEnumOneLevel, rxvt_define_key, NULL);
924# ifdef RESFALLBACK
905 name_prefix[0] = XrmStringToName (APL_CLASS); 925 name_prefix[0] = XrmStringToName (RESFALLBACK);
906 name_prefix[1] = XrmStringToName ("keysym"); 926 name_prefix[1] = XrmStringToName ("keysym");
907 class_prefix[0] = XrmStringToName (APL_CLASS); 927 class_prefix[0] = XrmStringToName (RESFALLBACK);
908 class_prefix[1] = XrmStringToName ("Keysym"); 928 class_prefix[1] = XrmStringToName ("Keysym");
909 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 929 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
910 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 930 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
911 XrmEnumOneLevel, rxvt_define_key, NULL); 931 XrmEnumOneLevel, rxvt_define_key, NULL);
932# endif
912# endif 933# endif
913# endif 934# endif
914 935
915# else /* USE_XGETDEFAULT */ 936# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 937 /* get resources the hard way, but save lots of memory */
… …
954 * Also, use a special sub-class so that we can use either or both of 975 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names. 976 * "XTerm" and "Rxvt" as class names.
956 */ 977 */
957 978
958 get_xdefaults (fd, name); 979 get_xdefaults (fd, name);
959 get_xdefaults (fd, APL_SUBCLASS); 980 get_xdefaults (fd, RESCLASS);
981# ifdef RESFALLBACK
982 get_xdefaults (fd, RESFALLBACK);
983# endif
960 984
961# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 985# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
962
963 { 986 {
964 FILE *ad = NULL; 987 FILE *ad = NULL;
965 988
966# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 989# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
967 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 990 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
968# endif 991# endif
969 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 992 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
970 if (ad != NULL) 993 if (ad != NULL)
971 { 994 {
972 get_xdefaults (ad, APL_SUBCLASS); 995 get_xdefaults (ad, RESCLASS);
973 get_xdefaults (ad, ""); 996 get_xdefaults (ad, "");
974 fclose (ad); 997 fclose (ad);
975 } 998 }
976 } 999 }
977# endif /* XAPPLOADDIR */ 1000# endif /* XAPPLOADDIR */
978 1001
979 get_xdefaults (fd, APL_CLASS);
980 get_xdefaults (fd, ""); /* partial match */ 1002 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL) 1003 if (fd != NULL)
982 fclose (fd); 1004 fclose (fd);
983# endif /* USE_XGETDEFAULT */ 1005# endif /* USE_XGETDEFAULT */
984 1006
… …
991 free (localepath); 1013 free (localepath);
992# endif 1014# endif
993# endif 1015# endif
994 1016
995#endif /* NO_RESOURCES */ 1017#endif /* NO_RESOURCES */
996
997 /*
998 * even without resources, at least do this setup for command-line
999 * options and command-line long options
1000 */
1001#ifdef MULTICHAR_SET
1002 set_multichar_encoding (rs[Rs_multichar_encoding]);
1003#endif
1004#ifdef GREEK_SUPPORT
1005 /* this could be a function in grkelot.c */
1006 /* void set_greek_keyboard (const char * str); */
1007 if (rs[Rs_greek_keyboard])
1008 {
1009 if (!STRCMP (rs[Rs_greek_keyboard], "iso"))
1010 greek_setmode (GREEK_ELOT928); /* former -grk9 */
1011 else if (!STRCMP (rs[Rs_greek_keyboard], "ibm"))
1012 greek_setmode (GREEK_IBM437); /* former -grk4 */
1013 }
1014 {
1015 KeySym sym;
1016
1017 if (rs[Rs_greektoggle_key]
1018 && ((sym = XStringToKeysym (rs[Rs_greektoggle_key])) != 0))
1019 ks_greekmodeswith = sym;
1020 }
1021#endif /* GREEK_SUPPORT */
1022
1023#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1024
1025 {
1026 KeySym sym;
1027
1028 if (rs[Rs_bigfont_key]
1029 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1030 ks_bigfont = sym;
1031 if (rs[Rs_smallfont_key]
1032 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1033 ks_smallfont = sym;
1034 }
1035#endif
1036} 1018}
1037 1019
1038/*}}} */ 1020/*}}} */
1039/*----------------------- end-of-file (C source) -----------------------*/ 1021/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines