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.81 by root, Wed Jan 18 19:43:51 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 */
… …
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 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"),
215#if ENABLE_XEMBED 213#if ENABLE_XEMBED
216 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"),
217#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
218#if ENABLE_FRILLS 219#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 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"), 221 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"), 222 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"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
… …
265#undef INFO 266#undef INFO
266#undef STRG 267#undef STRG
267#undef RSTRG 268#undef RSTRG
268#undef SWCH 269#undef SWCH
269#undef BOOL 270#undef BOOL
270/*}}} */
271 271
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL 274#if ENABLE_PERL
275 "perl," 275 "perl,"
… …
319 "transparent," 319 "transparent,"
320#endif 320#endif
321#if TINTING 321#if TINTING
322 "tint," 322 "tint,"
323#endif 323#endif
324#if defined(UTMP_SUPPORT)
325 "utmp,"
326#endif
327#if defined(USE_XIM) 324#if defined(USE_XIM)
328 "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,"
329#endif 359#endif
330 "scrollbars=" 360 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 361#if !defined(HAVE_SCROLLBARS)
332 "NONE" 362 "NONE"
333#else 363#else
… …
351# endif 381# endif
352# if defined(XTERM_SCROLLBAR) 382# if defined(XTERM_SCROLLBAR)
353 "xterm" 383 "xterm"
354# endif 384# endif
355#endif 385#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if defined(ENABLE_FRILLS)
367 "frills,"
368#endif
369#if defined(PREFER_24BIT)
370 "24bit,"
371#endif
372#if defined(SELECTION_SCROLLING)
373 "selectionscrolling,"
374#endif
375#if MOUSE_WHEEL
376 "wheel,"
377#endif
378#if MOUSE_SLIP_WHEELING
379 "slipwheel,"
380#endif
381#if defined(SMART_RESIZE)
382 "smart-resize,"
383#endif
384#if defined(CURSOR_BLINK)
385 "cursorBlink,"
386#endif
387#if defined(POINTER_BLANK)
388 "pointerBlank,"
389#endif
390#if defined(NO_RESOURCES)
391 "NoResources"
392#endif
393 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
394 387
395#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";
396 393
397/*{{{ usage: */ 394/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
399static void 396static void
400rxvt_usage (int type) 397rxvt_usage (int type)
… …
409 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
410 407
411 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
413 { 410 {
414 int len = 0; 411 int len = 0;
415 412
416 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
417 { 414 {
418 len = optList_strlen (i); 415 len = optList_strlen (i);
419 if (len > 0) 416 if (len > 0)
… …
486 483
487/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
488void 485void
489rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
490{ 487{
491 int i, bad_option = 0; 488 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF";
493 489
494 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
495 { 491 {
496 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 493 const char *flag, *opt;
498 494
499 opt = argv[i]; 495 opt = argv[i];
500#ifdef DEBUG_RESOURCES 496
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 497 if (*opt == '-')
504 { 498 {
505 flag = On; 499 flag = resval_on;
500
506 if (*++opt == '-') 501 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
508 } 503 }
509 else if (*opt == '+') 504 else if (*opt == '+')
510 { 505 {
511 flag = Off; 506 flag = resval_off;
507
512 if (*++opt == '+') 508 if (*++opt == '+')
513 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
514 } 510 }
515 else 511 else
516 { 512 {
… …
519 continue; 515 continue;
520 } 516 }
521 517
522 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
523 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
524 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 522 rxvt_usage (0);
526 523
527 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
532 break; 529 break;
533 530
534 if (entry < optList_size) 531 if (entry < optList_size)
535 { 532 {
536 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
538 535
539 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
540 { 537 {
541 /* 538 /*
542 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
544 * default values 541 * default values
545 */ 542 */
546 543
547 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
548 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
549 ? argv[++i] : 0; 550 }
550 } 551 }
551 else 552 else
552 { /* boolean value */ 553 { /* 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); 554 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
558 555
559 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
561 } 558 }
562 } 559 }
… …
594 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
595 * value will be a string 592 * value will be a string
596 */ 593 */
597/* ARGSUSED */ 594/* ARGSUSED */
598int 595int
599rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
600 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
601 XrmQuarkList quarks, 598 XrmQuarkList quarks,
602 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
603 XrmValue *value, 600 XrmValue *value,
604 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
605{ 602{
606 int last; 603 int last;
607 604
608 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 */
609 ; 606 ;
… …
777} 774}
778 775
779const char * 776const char *
780rxvt_term::x_resource (const char *name) 777rxvt_term::x_resource (const char *name)
781{ 778{
782 XrmDatabase database = XrmGetDatabase (display->display); 779 XrmDatabase database = XrmGetDatabase (xdisp);
783 780
784 const char *p = get_res (database, rs[Rs_name], name); 781 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 783
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
839 836
840 /* 837 /*
841 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
842 */ 839 */
843# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display); 841 XrmDatabase database = XrmGetDatabase (xdisp);
845 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
847 844
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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