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.216 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC

… …
198void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
199{ 199{
200 if (cmd_pid) 200 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
202 202
203 pty_ev.stop ();
203 delete pty; pty = 0; 204 delete pty; pty = 0;
204} 205}
205 206
206rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
207{ 208{
… …
222 223
223#ifdef USE_XIM 224#ifdef USE_XIM
224 im_destroy (); 225 im_destroy ();
225#endif 226#endif
226#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 230#endif
230#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 233#endif
233#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 245#endif
245#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 250#endif
250 if (gc) XFreeGC (xdisp, gc); 251 if (gc) XFreeGC (dpy, gc);
251 252
252 delete drawable; 253 delete drawable;
253 // destroy all windows 254 // destroy all windows
254 if (parent[0]) 255 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
256 257
257 for (int i = 0; i < TOTAL_COLORS; i++) 258 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 259 if (ISSET_PIXCOLOR (i))
259 { 260 {
260 pix_colors_focused [i].free (this); 261 pix_colors_focused [i].free (this);
… …
488 init_xlocale (); 489 init_xlocale ();
489 490
490 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
491 492
492#if 0 493#if 0
493 XSynchronize (xdisp, True); 494 XSynchronize (dpy, True);
494#endif 495#endif
495 496
496#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
499#endif 500#endif
500#ifdef TRANSPARENT 501#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
502 { 503 {
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 505 check_our_parents ();
505 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
506 } 507 }
507#endif 508#endif
508 509
… …
522#if ENABLE_XEMBED 523#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 524 if (rs[Rs_embed])
524 { 525 {
525 long info[2] = { 0, XEMBED_MAPPED }; 526 long info[2] = { 0, XEMBED_MAPPED };
526 527
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2); 529 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 530 }
530#endif 531#endif
531 532
532 XMapWindow (xdisp, vt); 533 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 534 XMapWindow (dpy, parent[0]);
534 535
535 return true; 536 return true;
536} 537}
537 538
538static struct sig_handlers 539static struct sig_handlers
… …
704 705
705 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
706 window_vt_x += sb_w; 707 window_vt_x += sb_w;
707 } 708 }
708 709
709 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
713 714
714 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 716 {
716 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
735 736
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
738 739
739 if (recalc_x) 740 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 742
742 if (recalc_y) 743 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 745
745 ncol = width / fwidth; 746 ncol = width / fwidth;
746 nrow = height / fheight; 747 nrow = height / fheight;
747} 748}
748 749
… …
851 return true; 852 return true;
852} 853}
853 854
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 856{
856 XChangeProperty (xdisp, parent[0], 857 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 860}
860 861
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 863{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
865 866
866 XChangeProperty (xdisp, parent[0], 867 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
869 870
870 free (s); 871 free (s);
871 free (ws); 872 free (ws);
… …
968 969
969 (ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 972 : pix_colors_focused[Color_bg]).get (bg);
972 973
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 975}
975 976
976/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
977/* 978/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1033 int fix_screen; 1034 int fix_screen;
1034 int old_width = szHint.width; 1035 int old_width = szHint.width;
1035 int old_height = szHint.height; 1036 int old_height = szHint.height;
1036 1037
1037 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1042
1040 if (!ignoreparent) 1043 if (!ignoreparent)
1041 { 1044 {
1042#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1043 /* 1046 /*
… …
1047 int x, y, x1, y1; 1050 int x, y, x1, y1;
1048 int dx, dy; 1051 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1053 Window unused_cr;
1051 1054
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1059 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1059 */ 1062 */
… …
1061 { 1064 {
1062 x -= x1; 1065 x -= x1;
1063 y -= y1; 1066 y -= y1;
1064 } 1067 }
1065 1068
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1070 1073
1071 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1077 dy = 0; 1080 dy = 0;
1078 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1079 dy /= 2; 1082 dy /= 2;
1080 1083
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1083#else 1086#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1088#endif
1086 } 1089 }
1087 1090
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1092
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1094 {
1092 if (scrollBar.state) 1095 if (scrollBar.state)
1093 { 1096 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1098 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1100 resize_scrollbar ();
1098 } 1101 }
1099 1102
1100 XMoveResizeWindow (xdisp, vt, 1103 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1102 width, height); 1105 width, height);
1103 1106
1104 scr_clear (); 1107 scr_clear ();
1105#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
… …
1108 } 1111 }
1109 1112
1110 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1111 scr_reset (); 1114 scr_reset ();
1112 1115
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false);
1118
1113#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1114 if (pixmap) 1120 if (pixmap)
1115 scr_touch (false); 1121 scr_touch (false);
1116#endif 1122#endif
1117 1123
1118#ifdef USE_XIM 1124#ifdef USE_XIM
1119 IMSetStatusPosition (); 1125 IMSetPosition ();
1120#endif 1126#endif
1121} 1127}
1122 1128
1123/* 1129/*
1124 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1129{ 1135{
1130 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1131 1137
1132 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1133 { 1139 {
1134 XGetWindowAttributes (xdisp, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1135 1141
1136 if (newwidth == 0) 1142 if (newwidth == 0)
1137 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1138 if (newheight == 0) 1144 if (newheight == 0)
1139 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1202 1208
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1204 *p = '\0'; 1210 *p = '\0';
1205 1211
1206 atom = XInternAtom (xdisp, server, False); 1212 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (xdisp, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1208 1214
1209 if (win != None) 1215 if (win != None)
1210 return True; 1216 return True;
1211 } 1217 }
1212 1218
… …
1436 "*", 1442 "*",
1437 fheight, 1443 fheight,
1438 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1439 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1440 1446
1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1442 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1443 1449
1444 if (missing_charset_list) 1450 if (missing_charset_list)
1445 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1446 1452
… …
1521 preedit_attr, 1527 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1529 status_attr, NULL);
1524 1530
1525 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (xdisp, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1528 1534
1529 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1530 { 1536 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1538 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1543 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1545 vt_select_input ();
1540#endif 1546#endif
1541 1547
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1548 IMSetPosition ();
1544 1549
1545 return true; 1550 return true;
1546} 1551}
1547 1552
1548void 1553void
… …
1606 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1607#endif 1612#endif
1608} 1613}
1609 1614
1610void 1615void
1611rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1612{ 1617{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1615 1620
1616 if (!Input_Context 1621 if (!Input_Context
1617 || !focus 1622 || !focus
1618 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1624 || !IMisRunning ())
1620 return; 1625 return;
1621 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1622 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1640 XFree (status_attr);
1626 1641
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1643 XFree (needed_rect);
1629 1644
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1647
1633 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1636 1652
1653 XFree (status_attr);
1654 }
1655
1637 XFree (preedit_attr); 1656 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1657}
1640#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1641 1659
1642/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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