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.85 by root, Wed Jan 25 21:03:04 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
… …
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 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"),
213#if ENABLE_XEMBED 213#if ENABLE_XEMBED
214 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"),
215#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
216#if ENABLE_FRILLS 219#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 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"),
219 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"),
220 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"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
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),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
320#if TINTING 322#if TINTING
321 "tint," 323 "tint,"
322#endif 324#endif
323#if defined(USE_XIM) 325#if defined(USE_XIM)
324 "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,"
325#endif 360#endif
326 "scrollbars=" 361 "scrollbars="
327#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
328 "NONE" 363 "NONE"
329#else 364#else
… …
347# endif 382# endif
348# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
349 "xterm" 384 "xterm"
350# endif 385# endif
351#endif 386#endif
352 ","
353#if defined(NO_BACKSPACE_KEY)
354 "no_backspace,"
355#endif
356#if defined(NO_DELETE_KEY)
357 "no_delete,"
358#endif
359#if EIGHT_BIT_CONTROLS
360 "8bitctrls,"
361#endif
362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
382#endif
383#if defined(NO_RESOURCES)
384 "NoResources"
385#endif
386 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
387 388
388#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";
389 394
390/*{{{ usage: */ 395/*{{{ usage: */
391/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
392static void 397static void
393rxvt_usage (int type) 398rxvt_usage (int type)
… …
402 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
403 408
404 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < optList_size; i++)
405 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
406 { 411 {
407 int len = 0; 412 int len = 0;
408 413
409 if (!optList_isBool (i)) 414 if (!optList_isBool (i))
410 { 415 {
411 len = optList_strlen (i); 416 len = optList_strlen (i);
412 if (len > 0) 417 if (len > 0)
… …
480/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
481void 486void
482rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
483{ 488{
484 int i, bad_option = 0; 489 int i, bad_option = 0;
485 static const char On[3] = "ON", Off[4] = "OFF";
486 490
487 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
488 { 492 {
489 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
490 const char *flag, *opt; 494 const char *flag, *opt;
491 495
492 opt = argv[i]; 496 opt = argv[i];
493 497
494 if (*opt == '-') 498 if (*opt == '-')
495 { 499 {
496 flag = On; 500 flag = resval_on;
501
497 if (*++opt == '-') 502 if (*++opt == '-')
498 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
499 } 504 }
500 else if (*opt == '+') 505 else if (*opt == '+')
501 { 506 {
502 flag = Off; 507 flag = resval_off;
508
503 if (*++opt == '+') 509 if (*++opt == '+')
504 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
505 } 511 }
506 else 512 else
507 { 513 {
… …
510 continue; 516 continue;
511 } 517 }
512 518
513 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
514 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
515 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 523 rxvt_usage (0);
517 524
518 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
523 break; 530 break;
524 531
525 if (entry < optList_size) 532 if (entry < optList_size)
526 { 533 {
527 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
529 536
530 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
531 { 538 {
532 /* 539 /*
533 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
534 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
535 * default values 542 * default values
536 */ 543 */
537 544
538 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
539 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
540 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
541 } 548 }
542 else 549 else
543 { /* boolean value */ 550 { /* boolean value */
544 set_option (optList[entry].flag & Optflag_mask, flag == On); 551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
545 552
546 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
548 } 555 }
549 } 556 }
… …
764} 771}
765 772
766const char * 773const char *
767rxvt_term::x_resource (const char *name) 774rxvt_term::x_resource (const char *name)
768{ 775{
769 XrmDatabase database = XrmGetDatabase (display->display); 776 XrmDatabase database = XrmGetDatabase (xdisp);
770 777
771 const char *p = get_res (database, rs[Rs_name], name); 778 const char *p = get_res (database, rs[Rs_name], name);
772 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 779 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
773 780
774 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 781 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
826 833
827 /* 834 /*
828 * [R5 or later]: enumerate the resource database 835 * [R5 or later]: enumerate the resource database
829 */ 836 */
830# ifdef KEYSYM_RESOURCE 837# ifdef KEYSYM_RESOURCE
831 XrmDatabase database = XrmGetDatabase (display->display); 838 XrmDatabase database = XrmGetDatabase (xdisp);
832 XrmName name_prefix[3]; 839 XrmName name_prefix[3];
833 XrmClass class_prefix[3]; 840 XrmClass class_prefix[3];
834 841
835 name_prefix[0] = XrmStringToName (rs[Rs_name]); 842 name_prefix[0] = XrmStringToName (rs[Rs_name]);
836 name_prefix[1] = XrmStringToName ("keysym"); 843 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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