… | |
… | |
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) |
… | |
… | |
241 | scrollBar.destroy (); |
241 | scrollBar.destroy (); |
242 | if (gc) XFreeGC (dpy, gc); |
242 | if (gc) XFreeGC (dpy, gc); |
243 | |
243 | |
244 | delete drawable; |
244 | delete drawable; |
245 | // destroy all windows |
245 | // destroy all windows |
246 | if (parent[0]) |
246 | if (parent) |
247 | XDestroyWindow (dpy, parent[0]); |
247 | XDestroyWindow (dpy, parent); |
248 | |
248 | |
249 | for (int i = 0; i < TOTAL_COLORS; i++) |
249 | for (int i = 0; i < TOTAL_COLORS; i++) |
250 | if (ISSET_PIXCOLOR (i)) |
250 | if (ISSET_PIXCOLOR (i)) |
251 | { |
251 | { |
252 | pix_colors_focused [i].free (this); |
252 | pix_colors_focused [i].free (this); |
… | |
… | |
706 | if (recalc_y) |
706 | if (recalc_y) |
707 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
707 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
708 | |
708 | |
709 | ncol = width / fwidth; |
709 | ncol = width / fwidth; |
710 | nrow = height / fheight; |
710 | nrow = height / fheight; |
|
|
711 | |
|
|
712 | // When the size of the vt window is not a multiple of the cell |
|
|
713 | // size, i.e., when the wm does not honour our size hints, there are |
|
|
714 | // extra areas not covered by the terminal screen. Such gaps, when a |
|
|
715 | // bg pixmap is set, would have to be cleared manually to properly |
|
|
716 | // refresh the background. We take the simpler route and shrink the |
|
|
717 | // vt window so as to avoid creating gaps. |
|
|
718 | width = ncol * fwidth; |
|
|
719 | height = nrow * fheight; |
711 | } |
720 | } |
712 | |
721 | |
713 | /*----------------------------------------------------------------------*/ |
722 | /*----------------------------------------------------------------------*/ |
714 | /* |
723 | /* |
715 | * Tell the teletype handler what size the window is. |
724 | * Tell the teletype handler what size the window is. |
… | |
… | |
735 | kill (-cmd_pid, SIGWINCH); |
744 | kill (-cmd_pid, SIGWINCH); |
736 | #endif |
745 | #endif |
737 | } |
746 | } |
738 | |
747 | |
739 | /*----------------------------------------------------------------------*/ |
748 | /*----------------------------------------------------------------------*/ |
740 | /* set_fonts () - load and set the various fonts |
749 | /* load and set the various fonts */ |
741 | * |
|
|
742 | * init = 1 - initialize |
|
|
743 | * |
|
|
744 | * fontname == FONT_UP - switch to bigger font |
|
|
745 | * fontname == FONT_DN - switch to smaller font |
|
|
746 | */ |
|
|
747 | bool |
750 | bool |
748 | rxvt_term::set_fonts () |
751 | rxvt_term::set_fonts () |
749 | { |
752 | { |
750 | rxvt_fontset *fs = new rxvt_fontset (this); |
753 | rxvt_fontset *fs = new rxvt_fontset (this); |
751 | rxvt_fontprop prop; |
754 | rxvt_fontprop prop; |
… | |
… | |
808 | #else |
811 | #else |
809 | fontset[style] = fontset[0]; |
812 | fontset[style] = fontset[0]; |
810 | #endif |
813 | #endif |
811 | } |
814 | } |
812 | |
815 | |
813 | if (parent[0]) |
816 | if (parent) |
814 | { |
817 | { |
815 | resize_all_windows (0, 0, 0); |
818 | resize_all_windows (0, 0, 0); |
816 | scr_remap_chars (); |
819 | scr_remap_chars (); |
817 | scr_touch (true); |
820 | scr_touch (true); |
818 | } |
821 | } |
… | |
… | |
821 | } |
824 | } |
822 | |
825 | |
823 | void |
826 | void |
824 | rxvt_term::set_string_property (Atom prop, const char *str, int len) |
827 | rxvt_term::set_string_property (Atom prop, const char *str, int len) |
825 | { |
828 | { |
826 | XChangeProperty (dpy, parent[0], |
829 | XChangeProperty (dpy, parent, |
827 | prop, XA_STRING, 8, PropModeReplace, |
830 | prop, XA_STRING, 8, PropModeReplace, |
828 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
831 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
829 | } |
832 | } |
830 | |
833 | |
831 | void |
834 | void |
… | |
… | |
833 | { |
836 | { |
834 | XTextProperty ct; |
837 | XTextProperty ct; |
835 | |
838 | |
836 | if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) |
839 | if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) |
837 | { |
840 | { |
838 | XSetTextProperty (dpy, parent[0], &ct, prop); |
841 | XSetTextProperty (dpy, parent, &ct, prop); |
839 | XFree (ct.value); |
842 | XFree (ct.value); |
840 | } |
843 | } |
841 | } |
844 | } |
842 | |
845 | |
843 | void |
846 | void |
844 | rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
847 | rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
845 | { |
848 | { |
846 | wchar_t *ws = rxvt_mbstowcs (str, len); |
849 | wchar_t *ws = rxvt_mbstowcs (str, len); |
847 | char *s = rxvt_wcstoutf8 (ws); |
850 | char *s = rxvt_wcstoutf8 (ws); |
848 | |
851 | |
849 | XChangeProperty (dpy, parent[0], |
852 | XChangeProperty (dpy, parent, |
850 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
853 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
851 | (const unsigned char *)s, strlen (s)); |
854 | (const unsigned char *)s, strlen (s)); |
852 | |
855 | |
853 | free (s); |
856 | free (s); |
854 | free (ws); |
857 | free (ws); |
… | |
… | |
1008 | |
1011 | |
1009 | // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow |
1012 | // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow |
1010 | if (set_hint) |
1013 | if (set_hint) |
1011 | { |
1014 | { |
1012 | szHint.flags &= ~(PBaseSize | PResizeInc); |
1015 | szHint.flags &= ~(PBaseSize | PResizeInc); |
1013 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1016 | XSetWMNormalHints (dpy, parent, &szHint); |
1014 | szHint.flags |= PBaseSize | PResizeInc; |
1017 | szHint.flags |= PBaseSize | PResizeInc; |
1015 | } |
1018 | } |
1016 | |
1019 | |
1017 | if (!ignoreparent) |
1020 | if (!ignoreparent) |
1018 | { |
1021 | { |
… | |
… | |
1024 | int x, y, x1, y1; |
1027 | int x, y, x1, y1; |
1025 | int dx, dy; |
1028 | int dx, dy; |
1026 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1029 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1027 | Window unused_cr; |
1030 | Window unused_cr; |
1028 | |
1031 | |
1029 | XTranslateCoordinates (dpy, parent[0], display->root, |
1032 | XTranslateCoordinates (dpy, parent, display->root, |
1030 | 0, 0, &x, &y, &unused_cr); |
1033 | 0, 0, &x, &y, &unused_cr); |
1031 | XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, |
1034 | XGetGeometry (dpy, parent, &unused_cr, &x1, &y1, |
1032 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1035 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1033 | /* |
1036 | /* |
1034 | * if display->root isn't the parent window, a WM will probably have offset |
1037 | * if display->root isn't the parent window, a WM will probably have offset |
1035 | * our position for handles and decorations. Counter it |
1038 | * our position for handles and decorations. Counter it |
1036 | */ |
1039 | */ |
… | |
… | |
1053 | if (y < y1) /* top half */ |
1056 | if (y < y1) /* top half */ |
1054 | dy = 0; |
1057 | dy = 0; |
1055 | else if (y == y1) /* exact center */ |
1058 | else if (y == y1) /* exact center */ |
1056 | dy /= 2; |
1059 | dy /= 2; |
1057 | |
1060 | |
1058 | XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, |
1061 | XMoveResizeWindow (dpy, parent, x + dx, y + dy, |
1059 | szHint.width, szHint.height); |
1062 | szHint.width, szHint.height); |
1060 | #else |
1063 | #else |
1061 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1064 | XResizeWindow (dpy, parent, szHint.width, szHint.height); |
1062 | #endif |
1065 | #endif |
1063 | } |
1066 | } |
1064 | |
1067 | |
1065 | if (set_hint) |
1068 | if (set_hint) |
1066 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1069 | XSetWMNormalHints (dpy, parent, &szHint); |
1067 | |
1070 | |
1068 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1071 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1069 | |
1072 | |
1070 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1073 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1071 | { |
1074 | { |
… | |
… | |
1084 | |
1087 | |
1085 | if (fix_screen || old_height == 0) |
1088 | if (fix_screen || old_height == 0) |
1086 | scr_reset (); |
1089 | scr_reset (); |
1087 | |
1090 | |
1088 | #ifdef USE_XIM |
1091 | #ifdef USE_XIM |
1089 | IMSetPosition (); |
1092 | im_set_position (); |
1090 | #endif |
1093 | #endif |
1091 | } |
1094 | } |
1092 | |
1095 | |
1093 | /* |
1096 | /* |
1094 | * Set the width/height of the vt window in characters. Units are pixels. |
1097 | * Set the width/height of the vt window in characters. Units are pixels. |
… | |
… | |
1155 | status_rect.height = fheight; |
1158 | status_rect.height = fheight; |
1156 | } |
1159 | } |
1157 | |
1160 | |
1158 | /* Checking whether input method is running. */ |
1161 | /* Checking whether input method is running. */ |
1159 | bool |
1162 | bool |
1160 | rxvt_term::IMisRunning () |
1163 | rxvt_term::im_is_running () |
1161 | { |
1164 | { |
1162 | Atom atom; |
1165 | Atom atom; |
1163 | Window win; |
1166 | Window win; |
1164 | char server[IMBUFSIZ]; |
1167 | char server[IMBUFSIZ]; |
1165 | |
1168 | |
… | |
… | |
1181 | |
1184 | |
1182 | return false; |
1185 | return false; |
1183 | } |
1186 | } |
1184 | |
1187 | |
1185 | void |
1188 | void |
1186 | rxvt_term::IMSendSpot () |
1189 | rxvt_term::im_send_spot () |
1187 | { |
1190 | { |
1188 | XPoint nspot; |
1191 | XPoint nspot; |
1189 | XVaNestedList preedit_attr; |
1192 | XVaNestedList preedit_attr; |
1190 | |
1193 | |
1191 | if (!Input_Context |
1194 | if (!Input_Context |
… | |
… | |
1297 | /* |
1300 | /* |
1298 | * Try to open a XIM with the current modifiers, then see if we can |
1301 | * Try to open a XIM with the current modifiers, then see if we can |
1299 | * open a suitable preedit type |
1302 | * open a suitable preedit type |
1300 | */ |
1303 | */ |
1301 | bool |
1304 | bool |
1302 | rxvt_term::IM_get_IC (const char *modifiers) |
1305 | rxvt_term::im_get_ic (const char *modifiers) |
1303 | { |
1306 | { |
1304 | int i, j, found; |
1307 | int i, j, found; |
1305 | XIM xim; |
1308 | XIM xim; |
1306 | XPoint spot; |
1309 | XPoint spot; |
1307 | XRectangle rect, status_rect, needed_rect; |
1310 | XRectangle rect, status_rect, needed_rect; |
1308 | unsigned long fg, bg; |
1311 | unsigned long fg, bg; |
1309 | const char *p; |
1312 | const char *p; |
1310 | char **s; |
1313 | char **s; |
1311 | XIMStyles *xim_styles; |
1314 | XIMStyles *xim_styles; |
1312 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1313 | XIMCallback xcb[4]; |
|
|
1314 | #endif |
|
|
1315 | |
1315 | |
1316 | set_environ (envv); |
1316 | set_environ (envv); |
1317 | |
1317 | |
1318 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1318 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1319 | return false; |
1319 | return false; |
… | |
… | |
1459 | NULL); |
1459 | NULL); |
1460 | } |
1460 | } |
1461 | #if ENABLE_XIM_ONTHESPOT |
1461 | #if ENABLE_XIM_ONTHESPOT |
1462 | else if (input_style & XIMPreeditCallbacks) |
1462 | else if (input_style & XIMPreeditCallbacks) |
1463 | { |
1463 | { |
|
|
1464 | XIMCallback xcb[4]; |
|
|
1465 | |
1464 | im_set_position (spot); |
1466 | im_set_position (spot); |
1465 | |
1467 | |
1466 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1468 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1467 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1469 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1468 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
1470 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
… | |
… | |
1483 | #endif |
1485 | #endif |
1484 | |
1486 | |
1485 | Input_Context = XCreateIC (xim, |
1487 | Input_Context = XCreateIC (xim, |
1486 | XNInputStyle, input_style, |
1488 | XNInputStyle, input_style, |
1487 | XNClientWindow, vt, |
1489 | XNClientWindow, vt, |
1488 | XNFocusWindow, parent[0], |
1490 | XNFocusWindow, parent, |
1489 | preedit_attr ? XNPreeditAttributes : NULL, |
1491 | preedit_attr ? XNPreeditAttributes : NULL, |
1490 | preedit_attr, |
1492 | preedit_attr, |
1491 | status_attr ? XNStatusAttributes : NULL, |
1493 | status_attr ? XNStatusAttributes : NULL, |
1492 | status_attr, NULL); |
1494 | status_attr, NULL); |
1493 | |
1495 | |
… | |
… | |
1506 | // unfortunately, only the focus window is used by XIM, hard to fix |
1508 | // unfortunately, only the focus window is used by XIM, hard to fix |
1507 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1509 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1508 | vt_select_input (); |
1510 | vt_select_input (); |
1509 | #endif |
1511 | #endif |
1510 | |
1512 | |
1511 | IMSetPosition (); |
1513 | im_set_position (); |
1512 | |
1514 | |
1513 | return true; |
1515 | return true; |
1514 | } |
1516 | } |
1515 | |
1517 | |
1516 | void |
1518 | void |
… | |
… | |
1544 | { |
1546 | { |
1545 | if (*s[i]) |
1547 | if (*s[i]) |
1546 | { |
1548 | { |
1547 | strcpy (buf, "@im="); |
1549 | strcpy (buf, "@im="); |
1548 | strncat (buf, s[i], IMBUFSIZ - 5); |
1550 | strncat (buf, s[i], IMBUFSIZ - 5); |
1549 | if (IM_get_IC (buf)) |
1551 | if (im_get_ic (buf)) |
1550 | { |
1552 | { |
1551 | found = true; |
1553 | found = true; |
1552 | break; |
1554 | break; |
1553 | } |
1555 | } |
1554 | } |
1556 | } |
… | |
… | |
1559 | if (found) |
1561 | if (found) |
1560 | goto done; |
1562 | goto done; |
1561 | } |
1563 | } |
1562 | |
1564 | |
1563 | /* try with XMODIFIERS env. var. */ |
1565 | /* try with XMODIFIERS env. var. */ |
1564 | if (IM_get_IC ("")) |
1566 | if (im_get_ic ("")) |
1565 | goto done; |
1567 | goto done; |
1566 | |
1568 | |
1567 | /* try with no modifiers base IF the user didn't specify an IM */ |
1569 | /* try with no modifiers base IF the user didn't specify an IM */ |
1568 | if (IM_get_IC ("@im=none")) |
1570 | if (im_get_ic ("@im=none")) |
1569 | goto done; |
1571 | goto done; |
1570 | |
1572 | |
1571 | done: |
1573 | done: |
1572 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1574 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1573 | if (rs[Rs_imLocale]) |
1575 | if (rs[Rs_imLocale]) |
1574 | SET_LOCALE (locale); |
1576 | SET_LOCALE (locale); |
1575 | #endif |
1577 | #endif |
1576 | } |
1578 | } |
1577 | |
1579 | |
1578 | void |
1580 | void |
1579 | rxvt_term::IMSetPosition () |
1581 | rxvt_term::im_set_position () |
1580 | { |
1582 | { |
1581 | XRectangle preedit_rect, status_rect, *needed_rect; |
1583 | XRectangle preedit_rect, status_rect, *needed_rect; |
1582 | XVaNestedList preedit_attr, status_attr; |
1584 | XVaNestedList preedit_attr, status_attr; |
1583 | |
1585 | |
1584 | if (!Input_Context |
1586 | if (!Input_Context |
1585 | || !focus |
1587 | || !focus |
1586 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1588 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1587 | || !IMisRunning ()) |
1589 | || !im_is_running ()) |
1588 | return; |
1590 | return; |
1589 | |
1591 | |
1590 | if (input_style & XIMPreeditPosition) |
1592 | if (input_style & XIMPreeditPosition) |
1591 | { |
1593 | { |
1592 | im_set_size (preedit_rect); |
1594 | im_set_size (preedit_rect); |
… | |
… | |
1622 | |
1624 | |
1623 | void |
1625 | void |
1624 | rxvt_term::get_window_origin (int &x, int &y) |
1626 | rxvt_term::get_window_origin (int &x, int &y) |
1625 | { |
1627 | { |
1626 | Window cr; |
1628 | Window cr; |
1627 | XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); |
1629 | XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); |
1628 | } |
1630 | } |
1629 | |
1631 | |
1630 | Pixmap |
1632 | Pixmap |
1631 | rxvt_term::get_pixmap_property (Atom property) |
1633 | rxvt_term::get_pixmap_property (Atom property) |
1632 | { |
1634 | { |
… | |
… | |
1657 | if (update_background_ev.is_active ()) |
1659 | if (update_background_ev.is_active ()) |
1658 | return; |
1660 | return; |
1659 | |
1661 | |
1660 | bg_invalidate (); |
1662 | bg_invalidate (); |
1661 | |
1663 | |
|
|
1664 | if (!mapped) |
|
|
1665 | return; |
|
|
1666 | |
1662 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1667 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1663 | |
1668 | |
1664 | if (to_wait <= 0.) |
1669 | if (to_wait <= 0.) |
1665 | bg_render (); |
1670 | bg_render (); |
1666 | else |
1671 | else |