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.79 by root, Mon Jan 16 09:28:17 2006 UTC vs.
Revision 1.93 by root, Wed Feb 1 21:15:33 2006 UTC

… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
28#include "version.h" 28#include "version.h"
29 29
30#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 31# include "keyboard.h"
32#endif 32#endif
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 38
39/* #define DEBUG_RESOURCES */
40
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
45 * if there's no desc (ription), it won't appear in rxvt_usage () 43 * if there's no desc (ription), it won't appear in rxvt_usage ()
46 */ 44 */
… …
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef XPM_BACKGROUND
193 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
194#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
195#ifdef XPM_BACKGROUND
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif /* XPM_BACKGROUND */
198#if (MENUBAR_MAX)
199 RSTRG (Rs_menu, "menu", "name[;tag]"),
200#endif 193#endif
201 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 196#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
220#if ENABLE_XEMBED 213#if ENABLE_XEMBED
221 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"),
222#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
223#if ENABLE_FRILLS 219#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
269#undef INFO 266#undef INFO
270#undef STRG 267#undef STRG
271#undef RSTRG 268#undef RSTRG
272#undef SWCH 269#undef SWCH
273#undef BOOL 270#undef BOOL
274/*}}} */
275 271
276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
278#if ENABLE_PERL 274#if ENABLE_PERL
279 "perl," 275 "perl,"
… …
323 "transparent," 319 "transparent,"
324#endif 320#endif
325#if TINTING 321#if TINTING
326 "tint," 322 "tint,"
327#endif 323#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif
334#if defined(USE_XIM) 324#if defined(USE_XIM)
335 "XIM," 325 "XIM,"
326#endif
327#if defined(NO_BACKSPACE_KEY)
328 "no_backspace,"
329#endif
330#if defined(NO_DELETE_KEY)
331 "no_delete,"
332#endif
333#if EIGHT_BIT_CONTROLS
334 "8bitctrls,"
335#endif
336#if defined(ENABLE_FRILLS)
337 "frills,"
338#endif
339#if defined(SELECTION_SCROLLING)
340 "selectionscrolling,"
341#endif
342#if MOUSE_WHEEL
343 "wheel,"
344#endif
345#if MOUSE_SLIP_WHEELING
346 "slipwheel,"
347#endif
348#if defined(SMART_RESIZE)
349 "smart-resize,"
350#endif
351#if defined(CURSOR_BLINK)
352 "cursorBlink,"
353#endif
354#if defined(POINTER_BLANK)
355 "pointerBlank,"
356#endif
357#if defined(NO_RESOURCES)
358 "NoResources,"
336#endif 359#endif
337 "scrollbars=" 360 "scrollbars="
338#if !defined(HAVE_SCROLLBARS) 361#if !defined(HAVE_SCROLLBARS)
339 "NONE" 362 "NONE"
340#else 363#else
… …
358# endif 381# endif
359# if defined(XTERM_SCROLLBAR) 382# if defined(XTERM_SCROLLBAR)
360 "xterm" 383 "xterm"
361# endif 384# endif
362#endif 385#endif
363 ","
364#if defined(NO_BACKSPACE_KEY)
365 "no_backspace,"
366#endif
367#if defined(NO_DELETE_KEY)
368 "no_delete,"
369#endif
370#if EIGHT_BIT_CONTROLS
371 "8bitctrls,"
372#endif
373#if defined(ENABLE_FRILLS)
374 "frills,"
375#endif
376#if defined(PREFER_24BIT)
377 "24bit,"
378#endif
379#if defined(SELECTION_SCROLLING)
380 "selectionscrolling,"
381#endif
382#if MOUSE_WHEEL
383 "wheel,"
384#endif
385#if MOUSE_SLIP_WHEELING
386 "slipwheel,"
387#endif
388#if defined(SMART_RESIZE)
389 "smart-resize,"
390#endif
391#if defined(CURSOR_BLINK)
392 "cursorBlink,"
393#endif
394#if defined(POINTER_BLANK)
395 "pointerBlank,"
396#endif
397#if defined(NO_RESOURCES)
398 "NoResources"
399#endif
400 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
401 387
402#define INDENT 18 388#define INDENT 18
389
390const char rxvt_term::resval_undef [] = "<undef>";
391const char rxvt_term::resval_on [] = "on";
392const char rxvt_term::resval_off [] = "off";
403 393
404/*{{{ usage: */ 394/*{{{ usage: */
405/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
406static void 396static void
407rxvt_usage (int type) 397rxvt_usage (int type)
… …
416 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
417 407
418 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
419 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
420 { 410 {
421 int len = 0; 411 int len = 0;
422 412
423 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
424 { 414 {
425 len = optList_strlen (i); 415 len = optList_strlen (i);
426 if (len > 0) 416 if (len > 0)
… …
493 483
494/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
495void 485void
496rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
497{ 487{
498 int i, bad_option = 0; 488 int i, bad_option = 0;
499 static const char On[3] = "ON", Off[4] = "OFF";
500 489
501 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
502 { 491 {
503 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
504 const char *flag, *opt; 493 const char *flag, *opt;
505 494
506 opt = argv[i]; 495 opt = argv[i];
507#ifdef DEBUG_RESOURCES 496
508 fprintf (stderr, "argv[%d] = %s: ", i, opt);
509#endif
510 if (*opt == '-') 497 if (*opt == '-')
511 { 498 {
512 flag = On; 499 flag = resval_on;
500
513 if (*++opt == '-') 501 if (*++opt == '-')
514 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
515 } 503 }
516 else if (*opt == '+') 504 else if (*opt == '+')
517 { 505 {
518 flag = Off; 506 flag = resval_off;
507
519 if (*++opt == '+') 508 if (*++opt == '+')
520 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
521 } 510 }
522 else 511 else
523 { 512 {
… …
526 continue; 515 continue;
527 } 516 }
528 517
529 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
530 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
531 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
532 rxvt_usage (0); 522 rxvt_usage (0);
533 523
534 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
535 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
539 break; 529 break;
540 530
541 if (entry < optList_size) 531 if (entry < optList_size)
542 { 532 {
543 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
544 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
545 535
546 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
547 { 537 {
548 /* 538 /*
549 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
550 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
551 * default values 541 * default values
552 */ 542 */
553 543
554 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
545 {
546 if (flag == resval_on && !argv [i+1])
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
548
555 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556 ? argv[++i] : 0; 550 }
557 } 551 }
558 else 552 else
559 { /* boolean value */ 553 { /* boolean value */
560#ifdef DEBUG_RESOURCES
561 fprintf (stderr, "boolean (%s,%s) = %s\n",
562 optList[entry].opt, optList[entry].kw, flag);
563#endif
564 set_option (optList[entry].flag & Optflag_mask, flag == On); 554 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
565 555
566 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
567 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
568 } 558 }
569 } 559 }
… …
601 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
602 * value will be a string 592 * value will be a string
603 */ 593 */
604/* ARGSUSED */ 594/* ARGSUSED */
605int 595int
606rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
607 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
608 XrmQuarkList quarks, 598 XrmQuarkList quarks,
609 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
610 XrmValue *value, 600 XrmValue *value,
611 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
612{ 602{
613 int last; 603 int last;
614 604
615 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 605 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
616 ; 606 ;
… …
784} 774}
785 775
786const char * 776const char *
787rxvt_term::x_resource (const char *name) 777rxvt_term::x_resource (const char *name)
788{ 778{
789 XrmDatabase database = XrmGetDatabase (display->display); 779 XrmDatabase database = XrmGetDatabase (xdisp);
790 780
791 const char *p = get_res (database, rs[Rs_name], name); 781 const char *p = get_res (database, rs[Rs_name], name);
792 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
793 783
794 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
846 836
847 /* 837 /*
848 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
849 */ 839 */
850# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
851 XrmDatabase database = XrmGetDatabase (display->display); 841 XrmDatabase database = XrmGetDatabase (xdisp);
852 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
853 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
854 844
855 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
856 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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