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.193 by root, Tue Jul 24 14:40:41 2007 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 2007 UTC

1 /*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 want_refresh = 1; 191 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
… …
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
205 202
206 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1; 204 last_bot = last_state = -1;
214 205
215 set_option (Opt_scrollBar); 206 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 207 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 208 set_option (Opt_jumpScroll);
… …
262/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
263const char ** 254const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
265{ 256{
266 int i, r_argc; 257 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
269 259
270 /* 260 /*
271 * 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
272 */ 262 */
… …
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292 282
293 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
294 } 284 }
295 285
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
297 287
298 /* 288 /*
299 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
300 */ 290 */
301 291
… …
317 if (rs[Rs_depth]) 307 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 308 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 309#endif
320 310
321#ifdef HAVE_AFTERIMAGE 311#ifdef HAVE_AFTERIMAGE
322 //TODO: why set it to 0 and then to dpy?
323 ::dpy = NULL; /* init global var from libAfter... */
324 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL)); 312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif 313#endif
326 free (r_argv); 314 free (r_argv);
327 315
328 for (int i = NUM_RESOURCES; i--; ) 316 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 317 if (rs [i] == resval_undef)
… …
346 * set any defaults not already set 334 * set any defaults not already set
347 */ 335 */
348 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
349 { 337 {
350 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
352 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
354 } 342 }
355 else 343 else
356 { 344 {
… …
394 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
395 383
396#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 388# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 390# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 391#endif
411 392
412#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 397# else
417 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
418# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 399# endif
427 if (rs[Rs_answerbackstring]) 400#endif
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 401
433#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
434 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]);
435#endif 404#endif
436 405
… …
481/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
482void 451void
483rxvt_term::init_env () 452rxvt_term::init_env ()
484{ 453{
485 int i; 454 int i;
486 unsigned int u;
487 char *val; 455 char *val;
488 456
489#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
491 * 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
… …
506 474
507 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
509 477
510 i = strlen (val); 478 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
512 480
513 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
514 482
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 484
… …
537 else 505 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
539 507
540 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
541 { 509 {
542 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);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 512 putenv (env_term);
545 } 513 }
546 else 514 else
547 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
647 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
650 618
651#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
654#endif 622#endif
655 623
656 /* add value for scrollBar */ 624 /* add value for scrollBar */
657 if (scrollBar.state) 625 if (scrollBar.state)
… …
884rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
885{ 853{
886 XClassHint classHint; 854 XClassHint classHint;
887 XWMHints wmHint; 855 XWMHints wmHint;
888#if ENABLE_FRILLS 856#if ENABLE_FRILLS
889 MWMHints mwmhints; 857 MWMHints mwmhints = { };
890#endif 858#endif
891 XGCValues gcvalue; 859 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
893 Window top, parent; 861 Window top, parent;
894 862
… …
907#if ENABLE_FRILLS 875#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 876 if (option (Opt_borderLess))
909 { 877 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 879 {
912 /* 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");
913 attributes.override_redirect = true; 881 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 882 }
916 else 883 else
917 { 884 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 886 }
921 } 887 }
922 else
923 mwmhints.flags = 0;
924#endif 888#endif
925 889
926#if ENABLE_XEMBED 890#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
928 { 892 {
… …
1038 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1039 1003
1040 vt_select_input (); 1004 vt_select_input ();
1041 1005
1042 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1043
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL
1046#ifndef HAVE_AFTERIMAGE
1047 && !option (Opt_transparent)
1048#endif
1049 )
1050 {
1051 const char *p = rs[Rs_backgroundPixmap];
1052
1053 if ((p = strchr (p, ';')) != NULL)
1054 {
1055 p++;
1056 scale_pixmap (p);
1057 }
1058
1059 set_bgPixmap (rs[Rs_backgroundPixmap]);
1060 scr_touch (true);
1061 }
1062#endif
1063 1007
1064 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1065 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1066 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1067 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1284 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1285 1229
1286 int er; 1230 int er;
1287 1231
1288#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1289 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1290 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1291 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1292 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1293 else 1237 else
1294#endif 1238#endif
1295 er = -1; 1239 er = -1;
1296 1240
… …
1400 sigset_t ss; 1344 sigset_t ss;
1401 sigemptyset (&ss); 1345 sigemptyset (&ss);
1402 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1403 1347
1404 /* command interpreter path */ 1348 /* command interpreter path */
1405 if (argv != NULL) 1349 if (argv)
1406 { 1350 {
1407# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1408 int i; 1352 int i;
1409 1353
1410 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1419 const char *argv0, *shell; 1363 const char *argv0, *shell;
1420 1364
1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1422 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1423 1367
1424 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1425 1369
1426 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1427 { 1371 {
1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429 1373
1430 login[0] = '-'; 1374 login[0] = '-';
1431 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1432 argv0 = login; 1376 argv0 = login;
1433 } 1377 }
1434 1378
1435 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1436 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1437 } 1381 }
1438 1382
1439 return -1; 1383 return -1;
1440} 1384}

Diff Legend

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