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.201 by root, Wed Jan 25 00:57:57 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
… …
271 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 272 free (allocated [i]);
273 273
274 free (selection.text); 274 free (selection.text);
275 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 276 free (env_display);
278 free (env_term); 277 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 278 free (locale);
281 free (v_buffer); 279 free (v_buffer);
282 free (incr_buf); 280 free (incr_buf);
283 281
284 delete envv; 282 delete envv;
… …
477 475
478 pty = ptytty::create (); 476 pty = ptytty::create ();
479 477
480 create_windows (argc, argv); 478 create_windows (argc, argv);
481 479
482 dDisp;
483
484 init_xlocale (); 480 init_xlocale ();
485 481
486 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
487 483
488#if 0 484#if 0
489 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
490#endif 486#endif
491 487
492#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
495#endif 491#endif
496#ifdef TRANSPARENT 492#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
498 { 494 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
500 check_our_parents (); 496 check_our_parents ();
501 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
502 } 498 }
503#endif 499#endif
504 500
… …
513 509
514 check_ev.start (); 510 check_ev.start ();
515 511
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
518 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
519 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
520 526
521 return true; 527 return true;
522} 528}
523 529
524static struct sig_handlers 530static struct sig_handlers
… …
614{ 620{
615 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
617 unsigned int w, h; 623 unsigned int w, h;
618 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
619 dDisp;
620 625
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 629
… …
721 726
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
724 729
725 if (recalc_x) 730 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
727 if (recalc_y) 733 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
729 735
730 ncol = width / fwidth; 736 ncol = width / fwidth;
731 nrow = height / fheight; 737 nrow = height / fheight;
732} 738}
733 739
… …
936 /* Cursor cursor; */ 942 /* Cursor cursor; */
937done: 943done:
938 944
939#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
940 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
941 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]);
942#endif 948#endif
943 949
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
945 951
946 recolour_cursor (); 952 recolour_cursor ();
… …
961 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
965 971
966 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 974}
969 975
970/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
971/* 977/*
… …
976{ 982{
977 unsigned int i; 983 unsigned int i;
978 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 986
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
986 { 991 {
… …
1004/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1005 1010
1006int 1011int
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1008{ 1013{
1009 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1010 { 1015 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false; 1017 return false;
1013 } 1018 }
1014 1019
… …
1022rxvt_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)
1023{ 1028{
1024 int fix_screen; 1029 int fix_screen;
1025 int old_width = szHint.width; 1030 int old_width = szHint.width;
1026 int old_height = szHint.height; 1031 int old_height = szHint.height;
1027 dDisp;
1028 1032
1029 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1031 1035
1032 if (!ignoreparent) 1036 if (!ignoreparent)
1033 { 1037 {
1034#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1035 /* 1039 /*
… …
1039 int x, y, x1, y1; 1043 int x, y, x1, y1;
1040 int dx, dy; 1044 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1046 Window unused_cr;
1043 1047
1044 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1052 /*
1049 * 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
1050 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1051 */ 1055 */
… …
1053 { 1057 {
1054 x -= x1; 1058 x -= x1;
1055 y -= y1; 1059 y -= y1;
1056 } 1060 }
1057 1061
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1062 1066
1063 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1069 dy = 0; 1073 dy = 0;
1070 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1071 dy /= 2; 1075 dy /= 2;
1072 1076
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1075#else 1079#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1077#endif 1081#endif
1078 } 1082 }
1079 1083
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1085
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1087 {
1084 if (scrollBar.state) 1088 if (scrollBar.state)
1085 { 1089 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1087 window_sb_x, 0, 1091 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1093 resize_scrollbar ();
1090 } 1094 }
1091 1095
1092 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1093 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1094 width, height); 1098 width, height);
1095 1099
1096 scr_clear (); 1100 scr_clear ();
1097#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
… …
1211 XPoint nspot; 1215 XPoint nspot;
1212 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1213 1217
1214 if (!Input_Context 1218 if (!Input_Context
1215 || !focus 1219 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1221 return;
1218 1222
1219 im_set_position (nspot); 1223 im_set_position (nspot);
1220 1224
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1479 XNBackground, bg, 1483 XNBackground, bg,
1480 XNArea, &status_rect, 1484 XNArea, &status_rect,
1481 XNFontSet, fs, 1485 XNFontSet, fs,
1482 NULL); 1486 NULL);
1483 } 1487 }
1488#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1489 else if (input_style & XIMPreeditCallbacks)
1485 { 1490 {
1491 im_set_position (spot);
1492
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1493 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1494 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1495 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0 1496# if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1497 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif 1498# endif
1492 1499
1493 preedit_attr = XVaCreateNestedList (0, 1500 preedit_attr = XVaCreateNestedList (0,
1501 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1502 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1503 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1504 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1505# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1506 XNPreeditCaretCallback, &xcb[3],
1499#endif 1507# endif
1500 NULL); 1508 NULL);
1501 } 1509 }
1510#endif
1502 1511
1503 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1514 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],

Diff Legend

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