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

Diff Legend

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