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.92 by root, Tue Jan 31 19:55:05 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
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
… …
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"),
… …
319 "transparent," 320 "transparent,"
320#endif 321#endif
321#if TINTING 322#if TINTING
322 "tint," 323 "tint,"
323#endif 324#endif
324#if defined(UTMP_SUPPORT)
325 "utmp,"
326#endif
327#if defined(USE_XIM) 325#if defined(USE_XIM)
328 "XIM," 326 "XIM,"
327#endif
328#if defined(NO_BACKSPACE_KEY)
329 "no_backspace,"
330#endif
331#if defined(NO_DELETE_KEY)
332 "no_delete,"
333#endif
334#if EIGHT_BIT_CONTROLS
335 "8bitctrls,"
336#endif
337#if defined(ENABLE_FRILLS)
338 "frills,"
339#endif
340#if defined(SELECTION_SCROLLING)
341 "selectionscrolling,"
342#endif
343#if MOUSE_WHEEL
344 "wheel,"
345#endif
346#if MOUSE_SLIP_WHEELING
347 "slipwheel,"
348#endif
349#if defined(SMART_RESIZE)
350 "smart-resize,"
351#endif
352#if defined(CURSOR_BLINK)
353 "cursorBlink,"
354#endif
355#if defined(POINTER_BLANK)
356 "pointerBlank,"
357#endif
358#if defined(NO_RESOURCES)
359 "NoResources,"
329#endif 360#endif
330 "scrollbars=" 361 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
332 "NONE" 363 "NONE"
333#else 364#else
… …
351# endif 382# endif
352# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
353 "xterm" 384 "xterm"
354# endif 385# endif
355#endif 386#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 */ 387 "\nUsage: "; /* Usage */
394 388
395#define INDENT 18 389#define INDENT 18
390
391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off";
396 394
397/*{{{ usage: */ 395/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
399static void 397static void
400rxvt_usage (int type) 398rxvt_usage (int type)
… …
409 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
410 408
411 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
413 { 411 {
414 int len = 0; 412 int len = 0;
415 413
416 if (!optList_isBool (i)) 414 if (!optList_isBool (i))
417 { 415 {
418 len = optList_strlen (i); 416 len = optList_strlen (i);
419 if (len > 0) 417 if (len > 0)
… …
487/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
488void 486void
489rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
490{ 488{
491 int i, bad_option = 0; 489 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF";
493 490
494 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
495 { 492 {
496 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 494 const char *flag, *opt;
498 495
499 opt = argv[i]; 496 opt = argv[i];
500#ifdef DEBUG_RESOURCES 497
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 498 if (*opt == '-')
504 { 499 {
505 flag = On; 500 flag = resval_on;
501
506 if (*++opt == '-') 502 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
508 } 504 }
509 else if (*opt == '+') 505 else if (*opt == '+')
510 { 506 {
511 flag = Off; 507 flag = resval_off;
508
512 if (*++opt == '+') 509 if (*++opt == '+')
513 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
514 } 511 }
515 else 512 else
516 { 513 {
… …
519 continue; 516 continue;
520 } 517 }
521 518
522 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
523 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
524 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 523 rxvt_usage (0);
526 524
527 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
532 break; 530 break;
533 531
534 if (entry < optList_size) 532 if (entry < optList_size)
535 { 533 {
536 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
538 536
539 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
540 { 538 {
541 /* 539 /*
542 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
544 * default values 542 * default values
545 */ 543 */
546 544
547 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
549 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
550 } 548 }
551 else 549 else
552 { /* boolean value */ 550 { /* 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); 551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
558 552
559 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
561 } 555 }
562 } 556 }
… …
594 * "rxvt" "keysym" "0xFF01" 588 * "rxvt" "keysym" "0xFF01"
595 * value will be a string 589 * value will be a string
596 */ 590 */
597/* ARGSUSED */ 591/* ARGSUSED */
598int 592int
599rxvt_define_key (XrmDatabase *database __attribute__((unused)), 593rxvt_define_key (XrmDatabase *database UNUSED,
600 XrmBindingList bindings __attribute__((unused)), 594 XrmBindingList bindings UNUSED,
601 XrmQuarkList quarks, 595 XrmQuarkList quarks,
602 XrmRepresentation *type __attribute__((unused)), 596 XrmRepresentation *type UNUSED,
603 XrmValue *value, 597 XrmValue *value,
604 XPointer closure __attribute__((unused))) 598 XPointer closure UNUSED)
605{ 599{
606 int last; 600 int last;
607 601
608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
609 ; 603 ;
… …
777} 771}
778 772
779const char * 773const char *
780rxvt_term::x_resource (const char *name) 774rxvt_term::x_resource (const char *name)
781{ 775{
782 XrmDatabase database = XrmGetDatabase (display->display); 776 XrmDatabase database = XrmGetDatabase (xdisp);
783 777
784 const char *p = get_res (database, rs[Rs_name], name); 778 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 779 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 780
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 781 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
839 833
840 /* 834 /*
841 * [R5 or later]: enumerate the resource database 835 * [R5 or later]: enumerate the resource database
842 */ 836 */
843# ifdef KEYSYM_RESOURCE 837# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display); 838 XrmDatabase database = XrmGetDatabase (xdisp);
845 XrmName name_prefix[3]; 839 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 840 XrmClass class_prefix[3];
847 841
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 842 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 843 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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