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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC

… …
216#endif 216#endif
217 delete fontset[0]; 217 delete fontset[0];
218 218
219 if (display) 219 if (display)
220 { 220 {
221 dDisp;
222
223 selection_clear (); 221 selection_clear ();
224 222
225#ifdef USE_XIM 223#ifdef USE_XIM
226 im_destroy (); 224 im_destroy ();
227#endif 225#endif
228#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
253 251
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
475 475
476 pty = ptytty::create (); 476 pty = ptytty::create ();
477 477
478 create_windows (argc, argv); 478 create_windows (argc, argv);
479 479
480 dDisp;
481
482 init_xlocale (); 480 init_xlocale ();
483 481
484 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
485 483
486#if 0 484#if 0
487 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
488#endif 486#endif
489 487
490#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
493#endif 491#endif
494#ifdef TRANSPARENT 492#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
496 { 494 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
498 check_our_parents (); 496 check_our_parents ();
499 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
500 } 498 }
501#endif 499#endif
502 500
… …
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 519 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 520 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 521 }
524#endif 522#endif
525 523
526 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
527 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
528 526
529 return true; 527 return true;
530} 528}
531 529
532static struct sig_handlers 530static struct sig_handlers
… …
622{ 620{
623 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
625 unsigned int w, h; 623 unsigned int w, h;
626 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
627 dDisp;
628 625
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 629
… …
729 726
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
732 729
733 if (recalc_x) 730 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
735 if (recalc_y) 733 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
737 735
738 ncol = width / fwidth; 736 ncol = width / fwidth;
739 nrow = height / fheight; 737 nrow = height / fheight;
740} 738}
741 739
… …
944 /* Cursor cursor; */ 942 /* Cursor cursor; */
945done: 943done:
946 944
947#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
948 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif 948#endif
951 949
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
953 951
954 recolour_cursor (); 952 recolour_cursor ();
… …
969 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
973 971
974 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 974}
977 975
978/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
979/* 977/*
… …
1011/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1012 1010
1013int 1011int
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1015{ 1013{
1016 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1017 { 1015 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false; 1017 return false;
1020 } 1018 }
1021 1019
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1027rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1028{
1031 int fix_screen; 1029 int fix_screen;
1032 int old_width = szHint.width; 1030 int old_width = szHint.width;
1033 int old_height = szHint.height; 1031 int old_height = szHint.height;
1034 dDisp;
1035 1032
1036 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1038 1035
1039 if (!ignoreparent) 1036 if (!ignoreparent)
1040 { 1037 {
1041#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1042 /* 1039 /*
… …
1046 int x, y, x1, y1; 1043 int x, y, x1, y1;
1047 int dx, dy; 1044 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1046 Window unused_cr;
1050 1047
1051 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1052 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1053 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1058 */ 1055 */
… …
1060 { 1057 {
1061 x -= x1; 1058 x -= x1;
1062 y -= y1; 1059 y -= y1;
1063 } 1060 }
1064 1061
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1069 1066
1070 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1076 dy = 0; 1073 dy = 0;
1077 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1078 dy /= 2; 1075 dy /= 2;
1079 1076
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1082#else 1079#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1084#endif 1081#endif
1085 } 1082 }
1086 1083
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1085
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1087 {
1091 if (scrollBar.state) 1088 if (scrollBar.state)
1092 { 1089 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1094 window_sb_x, 0, 1091 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1093 resize_scrollbar ();
1097 } 1094 }
1098 1095
1099 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1100 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1101 width, height); 1098 width, height);
1102 1099
1103 scr_clear (); 1100 scr_clear ();
1104#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND

Diff Legend

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