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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC vs.
Revision 1.317 by root, Tue May 12 08:21:56 2009 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
231 if (display) 239 if (display)
232 { 240 {
233 selection_clear (); 241 selection_clear ();
234 242
235#ifdef USE_XIM 243#ifdef USE_XIM
236 im_destroy (); 244 im_destroy ();
237#endif 245#endif
238#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 247 if (gc) XFreeGC (dpy, gc);
263 248
264 delete drawable; 249 delete drawable;
265 // destroy all windows 250 // destroy all windows
266 if (parent[0]) 251 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
275#endif 260#endif
276 } 261 }
277 262
278 clear (); 263 clear ();
279 }
280 264
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 265 display->flush (); /* ideally .put should do this */
285 displays.put (display); 266 displays.put (display);
267 }
286 268
287 scr_release (); 269 scr_release ();
288 270
289 /* clear all resources */ 271 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
336 if (display) 318 if (display)
337 { 319 {
338#if USE_XIM 320#if USE_XIM
339 im_ev.stop (display); 321 im_ev.stop (display);
340#endif 322#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
346#endif 326#endif
347 incr_ev.stop (); 327 incr_ev.stop ();
348 termwin_ev.stop (display); 328 termwin_ev.stop (display);
… …
467 DisplayString (display)); 447 DisplayString (display));
468 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
470} 450}
471 451
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
517
518#ifdef ENABLE_TRANSPARENCY
519 if (option (Opt_transparent))
520 {
521 bgPixmap.set_transparent ();
522
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap])
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != 0)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 refresh_check ();
589}
590
591static struct sig_handlers 452static struct sig_handlers
592{ 453{
593 ev::sig sw_term, sw_int; 454 ev::sig sw_term, sw_int;
594 455
595 /* 456 /*
… …
647 */ 508 */
648void 509void
649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650{ 511{
651 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
652 int x, y, sb_w, flags; 513 int x, y, flags;
653 unsigned int w, h; 514 unsigned int w, h;
654 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
655 516
656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
657 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
667 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669 530
670 if (flags & WidthValue) 531 if (flags & WidthValue)
671 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
672 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 537 szHint.flags |= USSize;
674 } 538 }
675 539
676 if (flags & HeightValue) 540 if (flags & HeightValue)
677 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
678 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679 szHint.flags |= USSize; 546 szHint.flags |= USSize;
680 } 547 }
681 548
682 if (flags & XValue) 549 if (flags & XValue)
683 { 550 {
… …
714 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
715 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
716 583
717 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
718 585
719 sb_w = 0;
720 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
721 587
722 if (scrollBar.state) 588 if (scrollBar.state)
723 { 589 {
724 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
725 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
726 592
727 if (!option (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 594 window_vt_x += sb_w;
729 } 595 }
… …
753 { 619 {
754 min_it (height, max_height); 620 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
756 } 622 }
757 623
758 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 624 if (recalc_x)
762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763 626
764 if (recalc_y) 627 if (recalc_y)
765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766 629
767 ncol = width / fwidth; 630 ncol = width / fwidth;
768 nrow = height / fheight; 631 nrow = height / fheight;
769} 632}
770 633
771/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
772/* 635/*
… …
783 646
784 ws.ws_col = ncol; 647 ws.ws_col = ncol;
785 ws.ws_row = nrow; 648 ws.ws_row = nrow;
786 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
787 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
789 652
790#if 0 653#if 0
791 // TIOCSWINSZ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
793 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
… …
923void 786void
924rxvt_term::set_window_color (int idx, const char *color) 787rxvt_term::set_window_color (int idx, const char *color)
925{ 788{
926#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
927 rxvt_color xcol; 790 rxvt_color xcol;
928 int i;
929 791
930 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
931 return; 793 return;
932 794
933 color = strdup (color); 795 color = strdup (color);
… …
935 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
936 798
937 /* handle color aliases */ 799 /* handle color aliases */
938 if (isdigit (*color)) 800 if (isdigit (*color))
939 { 801 {
940 i = atoi (color); 802 int i = atoi (color);
941 803
942 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
943 { 805 {
944 /* bright colors */ 806 /* bright colors */
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1049 int old_width = szHint.width; 911 int old_width = szHint.width;
1050 int old_height = szHint.height; 912 int old_height = szHint.height;
1051 913
1052 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
1053 915
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1055 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1056 925
1057 if (!ignoreparent) 926 if (!ignoreparent)
1058 { 927 {
1059#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1060 /* 929 /*
… …
1100#else 969#else
1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1102#endif 971#endif
1103 } 972 }
1104 973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
976
1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 978
1107 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 980 {
1109 if (scrollBar.state) 981 if (scrollBar.state)
1110 { 982 scrollBar.resize ();
1111 XMoveResizeWindow (dpy, scrollBar.win,
1112 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar ();
1115 }
1116 983
1117 XMoveResizeWindow (dpy, vt, 984 XMoveResizeWindow (dpy, vt,
1118 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1119 width, height); 986 width, height);
1120 987
1121#ifdef HAVE_BG_PIXMAP 988#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ()) 989 if (bgPixmap.window_size_sensitive ())
1123 update_background (); 990 update_background ();
1124#endif 991#endif
1125
1126 scr_clear ();
1127 } 992 }
1128 993
1129 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1130 scr_reset (); 995 scr_reset ();
1131 996
… …
1210 1075
1211/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1212bool 1077bool
1213rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1214{ 1079{
1215 char *p;
1216 Atom atom; 1080 Atom atom;
1217 Window win; 1081 Window win;
1218 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1219 1083
1220 /* get current locale modifier */ 1084 /* get current locale modifier */
1221 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1222 { 1086 {
1223 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225 1089
1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1227 *p = '\0'; 1091 *p = '\0';
1228 1092
1229 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1230 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1231 1095

Diff Legend

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