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.192 by root, Tue Jul 24 14:38:59 2007 UTC vs.
Revision 1.210 by ayin, Sat Sep 8 21:25:56 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;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
207#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
210 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
211#endif 215#endif
212
213 last_bot = last_state = -1; 216 last_bot = last_state = -1;
214 217
215 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
… …
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292 295
293 cmd_argv[i] = NULL; 296 cmd_argv[i] = NULL;
294 } 297 }
295 298
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_basename (argv[0]);
297 300
298 /* 301 /*
299 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
300 */ 303 */
301 304
… …
317 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 322#endif
320 323
321#ifdef HAVE_AFTERIMAGE 324#ifdef HAVE_AFTERIMAGE
322 //TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
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)); 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif 326#endif
326 free (r_argv); 327 free (r_argv);
327 328
328 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
… …
346 * set any defaults not already set 347 * set any defaults not already set
347 */ 348 */
348 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
349 { 350 {
350 if (!rs[Rs_title]) 351 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 352 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
352 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 354 rs[Rs_iconName] = rs[Rs_title];
354 } 355 }
355 else 356 else
356 { 357 {
… …
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
402# endif 403# endif
403 else 404 else
404 { 405 {
405 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val; 407 key_backspace = val;
409 } 408 }
410#endif 409#endif
411 410
412#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
417 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
418# endif 417# endif
419 else 418 else
420 { 419 {
421 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val; 421 key_delete = val;
425 } 422 }
426#endif 423#endif
427 if (rs[Rs_answerbackstring])
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 424
433#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif 427#endif
436 428
… …
481/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
482void 474void
483rxvt_term::init_env () 475rxvt_term::init_env ()
484{ 476{
485 int i; 477 int i;
486 unsigned int u;
487 char *val; 478 char *val;
488 479
489#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 481 /* 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 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
506 497
507 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
509 500
510 i = strlen (val); 501 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
512 503
513 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
514 505
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 507
… …
537 else 528 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
539 530
540 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
541 { 532 {
542 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 535 putenv (env_term);
545 } 536 }
546 else 537 else
547 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
884rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
885{ 876{
886 XClassHint classHint; 877 XClassHint classHint;
887 XWMHints wmHint; 878 XWMHints wmHint;
888#if ENABLE_FRILLS 879#if ENABLE_FRILLS
889 MWMHints mwmhints; 880 MWMHints mwmhints = { };
890#endif 881#endif
891 XGCValues gcvalue; 882 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
893 Window top, parent; 884 Window top, parent;
894 885
… …
907#if ENABLE_FRILLS 898#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 899 if (option (Opt_borderLess))
909 { 900 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 902 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 904 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 905 }
916 else 906 else
917 { 907 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 909 }
921 } 910 }
922 else
923 mwmhints.flags = 0;
924#endif 911#endif
925 912
926#if ENABLE_XEMBED 913#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
928 { 915 {
… …
1038 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1039 1026
1040 vt_select_input (); 1027 vt_select_input ();
1041 1028
1042 vt_ev.start (display, vt); 1029 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 1030
1064 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1065 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1066 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1067 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1419 const char *argv0, *shell; 1386 const char *argv0, *shell;
1420 1387
1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1422 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1423 1390
1424 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_basename (shell);
1425 1392
1426 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1427 { 1394 {
1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429 1396
1430 login[0] = '-'; 1397 login[0] = '-';
1431 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1432 argv0 = login; 1399 argv0 = login;
1433 } 1400 }

Diff Legend

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