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.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC vs.
Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 2011 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-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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.
… …
105 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
107 } 107 }
108 108
109 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 113
114 // allocate a new combination 114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
187#endif 187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 194
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 196
198 termlist.push_back (this); 197 termlist.push_back (this);
199 198
200#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
201 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
202#endif 201#endif
202
203 // this->envv = 0;
203} 204}
204 205
205// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
206// for use before an emergency exit 207// for use before an emergency exit
207void 208void
… …
242 scrollBar.destroy (); 243 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
244 245
245 delete drawable; 246 delete drawable;
246 // destroy all windows 247 // destroy all windows
247 if (parent[0]) 248 if (parent)
248 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
249 250
250 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
252 { 253 {
253 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
… …
273 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
274 free (env_display); 275 free (env_display);
275 free (env_term); 276 free (env_term);
276 free (locale); 277 free (locale);
277 free (v_buffer); 278 free (v_buffer);
278 free (incr_buf); 279
280 delete selection_req;
279 281
280 delete envv; 282 delete envv;
281 delete argv; 283 delete argv;
282 284
283#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
… …
319#endif 321#endif
320 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
323#endif 325#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 326 termwin_ev.stop (display);
326 vt_ev.stop (display); 327 vt_ev.stop (display);
327 } 328 }
328 329
329 flush_ev.stop (); 330 flush_ev.stop ();
… …
707 if (recalc_y) 708 if (recalc_y)
708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
709 710
710 ncol = width / fwidth; 711 ncol = width / fwidth;
711 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 width = ncol * fwidth;
721 height = nrow * fheight;
712} 722}
713 723
714/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
715/* 725/*
716 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
736 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
737#endif 747#endif
738} 748}
739 749
740/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
742 *
743 * init = 1 - initialize
744 *
745 * fontname == FONT_UP - switch to bigger font
746 * fontname == FONT_DN - switch to smaller font
747 */
748bool 752bool
749rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
750{ 754{
751 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
809#else 813#else
810 fontset[style] = fontset[0]; 814 fontset[style] = fontset[0];
811#endif 815#endif
812 } 816 }
813 817
814 if (parent[0]) 818 if (parent)
815 { 819 {
816 resize_all_windows (0, 0, 0); 820 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 821 scr_remap_chars ();
818 scr_touch (true); 822 scr_touch (true);
819 } 823 }
… …
822} 826}
823 827
824void 828void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 829rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 830{
827 XChangeProperty (dpy, parent[0], 831 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 832 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 833 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 834}
831 835
832void 836void
… …
834{ 838{
835 XTextProperty ct; 839 XTextProperty ct;
836 840
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 841 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 842 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 843 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 844 XFree (ct.value);
841 } 845 }
842} 846}
843 847
844void 848void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 849rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 850{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 851 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 852 char *s = rxvt_wcstoutf8 (ws);
849 853
850 XChangeProperty (dpy, parent[0], 854 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 855 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 856 (const unsigned char *)s, strlen (s));
853 857
854 free (s); 858 free (s);
855 free (ws); 859 free (ws);
… …
1009 1013
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1014 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint) 1015 if (set_hint)
1012 { 1016 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1017 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1018 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1019 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1020 }
1017 1021
1018 if (!ignoreparent) 1022 if (!ignoreparent)
1019 { 1023 {
… …
1025 int x, y, x1, y1; 1029 int x, y, x1, y1;
1026 int dx, dy; 1030 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1031 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1032 Window unused_cr;
1029 1033
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1034 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1035 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1036 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1037 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1038 /*
1035 * if display->root isn't the parent window, a WM will probably have offset 1039 * if display->root isn't the parent window, a WM will probably have offset
1036 * our position for handles and decorations. Counter it 1040 * our position for handles and decorations. Counter it
1037 */ 1041 */
… …
1054 if (y < y1) /* top half */ 1058 if (y < y1) /* top half */
1055 dy = 0; 1059 dy = 0;
1056 else if (y == y1) /* exact center */ 1060 else if (y == y1) /* exact center */
1057 dy /= 2; 1061 dy /= 2;
1058 1062
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1063 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1064 szHint.width, szHint.height);
1061#else 1065#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1066 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1067#endif
1064 } 1068 }
1065 1069
1066 if (set_hint) 1070 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1071 XSetWMNormalHints (dpy, parent, &szHint);
1068 1072
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1074
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1075 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1076 {
… …
1085 1089
1086 if (fix_screen || old_height == 0) 1090 if (fix_screen || old_height == 0)
1087 scr_reset (); 1091 scr_reset ();
1088 1092
1089#ifdef USE_XIM 1093#ifdef USE_XIM
1090 IMSetPosition (); 1094 im_set_position ();
1091#endif 1095#endif
1092} 1096}
1093 1097
1094/* 1098/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1099 * Set the width/height of the vt window in characters. Units are pixels.
… …
1156 status_rect.height = fheight; 1160 status_rect.height = fheight;
1157} 1161}
1158 1162
1159/* Checking whether input method is running. */ 1163/* Checking whether input method is running. */
1160bool 1164bool
1161rxvt_term::IMisRunning () 1165rxvt_term::im_is_running ()
1162{ 1166{
1163 Atom atom; 1167 Atom atom;
1164 Window win; 1168 Window win;
1165 char server[IMBUFSIZ]; 1169 char server[IMBUFSIZ];
1166 1170
… …
1175 1179
1176 atom = XInternAtom (dpy, server, False); 1180 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1181 win = XGetSelectionOwner (dpy, atom);
1178 1182
1179 if (win != None) 1183 if (win != None)
1180 return True; 1184 return true;
1181 } 1185 }
1182 1186
1183 return False; 1187 return false;
1184} 1188}
1185 1189
1186void 1190void
1187rxvt_term::IMSendSpot () 1191rxvt_term::im_send_spot ()
1188{ 1192{
1189 XPoint nspot; 1193 XPoint nspot;
1190 XVaNestedList preedit_attr; 1194 XVaNestedList preedit_attr;
1191 1195
1192 if (!Input_Context 1196 if (!Input_Context
… …
1298/* 1302/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1303 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1304 * open a suitable preedit type
1301 */ 1305 */
1302bool 1306bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1307rxvt_term::im_get_ic (const char *modifiers)
1304{ 1308{
1305 int i, j, found; 1309 int i, j, found;
1306 XIM xim; 1310 XIM xim;
1307 XPoint spot; 1311 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1312 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1313 unsigned long fg, bg;
1310 const char *p; 1314 const char *p;
1311 char **s; 1315 char **s;
1312 XIMStyles *xim_styles; 1316 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1317
1317 set_environ (envv); 1318 set_environ (envv);
1318 1319
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1320 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1321 return false;
… …
1460 NULL); 1461 NULL);
1461 } 1462 }
1462#if ENABLE_XIM_ONTHESPOT 1463#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1464 else if (input_style & XIMPreeditCallbacks)
1464 { 1465 {
1466 XIMCallback xcb[4];
1467
1465 im_set_position (spot); 1468 im_set_position (spot);
1466 1469
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1470 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1468 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1471 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1469 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1472 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1487#endif
1485 1488
1486 Input_Context = XCreateIC (xim, 1489 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1490 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1491 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1492 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1493 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1494 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1495 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1496 status_attr, NULL);
1494 1497
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1510 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1512 vt_select_input ();
1510#endif 1513#endif
1511 1514
1512 IMSetPosition (); 1515 im_set_position ();
1513 1516
1514 return true; 1517 return true;
1515} 1518}
1516 1519
1517void 1520void
… …
1545 { 1548 {
1546 if (*s[i]) 1549 if (*s[i])
1547 { 1550 {
1548 strcpy (buf, "@im="); 1551 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1552 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1553 if (im_get_ic (buf))
1551 { 1554 {
1552 found = true; 1555 found = true;
1553 break; 1556 break;
1554 } 1557 }
1555 } 1558 }
… …
1560 if (found) 1563 if (found)
1561 goto done; 1564 goto done;
1562 } 1565 }
1563 1566
1564 /* try with XMODIFIERS env. var. */ 1567 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1568 if (im_get_ic (""))
1566 goto done; 1569 goto done;
1567 1570
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1571 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1572 if (im_get_ic ("@im=none"))
1570 goto done; 1573 goto done;
1571 1574
1572done: 1575done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1576#endif 1579#endif
1577} 1580}
1578 1581
1579void 1582void
1580rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1581{ 1584{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1584 1587
1585 if (!Input_Context 1588 if (!Input_Context
1586 || !focus 1589 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1591 || !im_is_running ())
1589 return; 1592 return;
1590 1593
1591 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1592 { 1595 {
1593 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1623 1626
1624void 1627void
1625rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1626{ 1629{
1627 Window cr; 1630 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629} 1632}
1630 1633
1631Pixmap 1634Pixmap
1632rxvt_term::get_pixmap_property (Atom property) 1635rxvt_term::get_pixmap_property (Atom property)
1633{ 1636{
… …
1658 if (update_background_ev.is_active ()) 1661 if (update_background_ev.is_active ())
1659 return; 1662 return;
1660 1663
1661 bg_invalidate (); 1664 bg_invalidate ();
1662 1665
1666 if (!mapped)
1667 return;
1668
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1669 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664 1670
1665 if (to_wait <= 0.) 1671 if (to_wait <= 0.)
1666 bg_render (); 1672 bg_render ();
1667 else 1673 else

Diff Legend

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