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.190 by sasha, Thu Jul 12 22:33:16 2007 UTC vs.
Revision 1.212 by sasha, Wed Sep 12 21:06:08 2007 UTC

… …
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 ::dpy = NULL ; /* init global var from libAfter... */
323 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);
324#endif 313#endif
325 free (r_argv); 314 free (r_argv);
326 315
327 for (int i = NUM_RESOURCES; i--; ) 316 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef) 317 if (rs [i] == resval_undef)
… …
345 * set any defaults not already set 334 * set any defaults not already set
346 */ 335 */
347 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
348 { 337 {
349 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
350 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
351 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
352 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
353 } 342 }
354 else 343 else
355 { 344 {
… …
393 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
394 383
395#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
396 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
397# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
398 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
399# else 388# else
400 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
401# endif 390# endif
402 else
403 {
404 val = strdup (rs[Rs_backspace_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_backspace = val;
408 }
409#endif 391#endif
410 392
411#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 397# else
416 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
417# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_delete = val;
424 }
425#endif 399# endif
426 if (rs[Rs_answerbackstring]) 400#endif
427 {
428 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
429 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
430 }
431 401
432#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
433 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]);
434#endif 404#endif
435 405
… …
480/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
481void 451void
482rxvt_term::init_env () 452rxvt_term::init_env ()
483{ 453{
484 int i; 454 int i;
485 unsigned int u;
486 char *val; 455 char *val;
487 456
488#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
489 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
490 * 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
… …
505 474
506 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
507 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
508 477
509 i = strlen (val); 478 i = strlen (val);
510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
511 480
512 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
513 482
514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
515 484
… …
536 else 505 else
537 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
538 507
539 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
540 { 509 {
541 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);
542 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
543 putenv (env_term); 512 putenv (env_term);
544 } 513 }
545 else 514 else
546 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
646 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
647 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
648 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
649 618
650#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
651 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
652 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
653#endif 622#endif
654 623
655 /* add value for scrollBar */ 624 /* add value for scrollBar */
656 if (scrollBar.state) 625 if (scrollBar.state)
… …
883rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
884{ 853{
885 XClassHint classHint; 854 XClassHint classHint;
886 XWMHints wmHint; 855 XWMHints wmHint;
887#if ENABLE_FRILLS 856#if ENABLE_FRILLS
888 MWMHints mwmhints; 857 MWMHints mwmhints = { };
889#endif 858#endif
890 XGCValues gcvalue; 859 XGCValues gcvalue;
891 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
892 Window top, parent; 861 Window top, parent;
893 862
… …
906#if ENABLE_FRILLS 875#if ENABLE_FRILLS
907 if (option (Opt_borderLess)) 876 if (option (Opt_borderLess))
908 { 877 {
909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
910 { 879 {
911 /* 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");
912 attributes.override_redirect = true; 881 attributes.override_redirect = true;
913 mwmhints.flags = 0;
914 } 882 }
915 else 883 else
916 { 884 {
917 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
918 mwmhints.decorations = 0;
919 } 886 }
920 } 887 }
921 else
922 mwmhints.flags = 0;
923#endif 888#endif
924 889
925#if ENABLE_XEMBED 890#if ENABLE_XEMBED
926 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
927 { 892 {
… …
1037 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1038 1003
1039 vt_select_input (); 1004 vt_select_input ();
1040 1005
1041 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1042
1043#ifdef XPM_BACKGROUND
1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1046 && !option (Opt_transparent)
1047#endif
1048 )
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 scale_pixmap (p);
1056 }
1057
1058 set_bgPixmap (rs[Rs_backgroundPixmap]);
1059 scr_touch (true);
1060 }
1061#endif
1062 1007
1063 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1064 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1065 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1066 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1284 1229
1285 int er; 1230 int er;
1286 1231
1287#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1288 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1289 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1290 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1291 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1292 else 1237 else
1293#endif 1238#endif
1294 er = -1; 1239 er = -1;
1295 1240
… …
1418 const char *argv0, *shell; 1363 const char *argv0, *shell;
1419 1364
1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1421 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1422 1367
1423 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1424 1369
1425 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1426 { 1371 {
1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1428 1373
1429 login[0] = '-'; 1374 login[0] = '-';
1430 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1431 argv0 = login; 1376 argv0 = login;
1432 } 1377 }

Diff Legend

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