ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.201 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.212 by sasha, Wed Sep 12 21:06:08 2007 UTC

… …
199 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
200 200
201 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
202 202
203 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216
217 last_bot = last_state = -1; 204 last_bot = last_state = -1;
218 205
219 set_option (Opt_scrollBar); 206 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput); 207 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll); 208 set_option (Opt_jumpScroll);
… …
266/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
267const char ** 254const char **
268rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
269{ 256{
270 int i, r_argc; 257 int i, r_argc;
271 char *val;
272 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
273 259
274 /* 260 /*
275 * Look for -e option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
276 */ 262 */
… …
295 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296 282
297 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
298 } 284 }
299 285
300 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
301 287
302 /* 288 /*
303 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
304 */ 290 */
305 291
… …
348 * set any defaults not already set 334 * set any defaults not already set
349 */ 335 */
350 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
351 { 337 {
352 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
353 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
354 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
356 } 342 }
357 else 343 else
358 { 344 {
… …
396 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
397 383
398#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 388# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 390# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 391#endif
413 392
414#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 397# else
419 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
420# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 399# endif
429 if (rs[Rs_answerbackstring]) 400#endif
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 401
435#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif 404#endif
438 405
… …
483/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
484void 451void
485rxvt_term::init_env () 452rxvt_term::init_env ()
486{ 453{
487 int i; 454 int i;
488 unsigned int u;
489 char *val; 455 char *val;
490 456
491#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
493 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
508 474
509 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
511 477
512 i = strlen (val); 478 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
514 480
515 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
516 482
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
518 484
… …
539 else 505 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
541 507
542 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
543 { 509 {
544 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 512 putenv (env_term);
547 } 513 }
548 else 514 else
549 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
649 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
650 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
651 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
652 618
653#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
654 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
656#endif 622#endif
657 623
658 /* add value for scrollBar */ 624 /* add value for scrollBar */
659 if (scrollBar.state) 625 if (scrollBar.state)
… …
909#if ENABLE_FRILLS 875#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 876 if (option (Opt_borderLess))
911 { 877 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 879 {
914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915 attributes.override_redirect = true; 881 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 882 }
918 else 883 else
919 { 884 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 886 }
923 } 887 }
924 else
925 mwmhints.flags = 0;
926#endif 888#endif
927 889
928#if ENABLE_XEMBED 890#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
930 { 892 {
… …
1040 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1041 1003
1042 vt_select_input (); 1004 vt_select_input ();
1043 1005
1044 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1045
1046#ifdef XPM_BACKGROUND
1047 if (rs[Rs_backgroundPixmap] != NULL)
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 bgPixmap.handle_geometry (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061 1007
1062 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1229
1284 int er; 1230 int er;
1285 1231
1286#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1291 else 1237 else
1292#endif 1238#endif
1293 er = -1; 1239 er = -1;
1294 1240
… …
1417 const char *argv0, *shell; 1363 const char *argv0, *shell;
1418 1364
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1421 1367
1422 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1423 1369
1424 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1425 { 1371 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1373
1428 login[0] = '-'; 1374 login[0] = '-';
1429 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1430 argv0 = login; 1376 argv0 = login;
1431 } 1377 }

Diff Legend

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