… | |
… | |
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) |
… | |
… | |
267 | for (int i = 0; i < allocated.size (); i++) |
267 | for (int i = 0; i < allocated.size (); i++) |
268 | free (allocated [i]); |
268 | free (allocated [i]); |
269 | |
269 | |
270 | free (selection.text); |
270 | free (selection.text); |
271 | free (selection.clip_text); |
271 | free (selection.clip_text); |
272 | // TODO: manage env vars in child only(!) |
|
|
273 | free (env_display); |
|
|
274 | free (env_term); |
|
|
275 | free (locale); |
272 | free (locale); |
276 | free (v_buffer); |
273 | free (v_buffer); |
277 | |
274 | |
278 | delete selection_req; |
275 | delete selection_req; |
279 | |
276 | |
… | |
… | |
706 | if (recalc_y) |
703 | if (recalc_y) |
707 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
704 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
708 | |
705 | |
709 | ncol = width / fwidth; |
706 | ncol = width / fwidth; |
710 | nrow = height / fheight; |
707 | nrow = height / fheight; |
|
|
708 | |
|
|
709 | // When the size of the vt window is not a multiple of the cell |
|
|
710 | // size, i.e., when the wm does not honour our size hints, there are |
|
|
711 | // extra areas not covered by the terminal screen. Such gaps, when a |
|
|
712 | // bg pixmap is set, would have to be cleared manually to properly |
|
|
713 | // refresh the background. We take the simpler route and shrink the |
|
|
714 | // vt window so as to avoid creating gaps. |
|
|
715 | vt_width = ncol * fwidth; |
|
|
716 | vt_height = nrow * fheight; |
711 | } |
717 | } |
712 | |
718 | |
713 | /*----------------------------------------------------------------------*/ |
719 | /*----------------------------------------------------------------------*/ |
714 | /* |
720 | /* |
715 | * Tell the teletype handler what size the window is. |
721 | * Tell the teletype handler what size the window is. |
… | |
… | |
723 | |
729 | |
724 | struct winsize ws; |
730 | struct winsize ws; |
725 | |
731 | |
726 | ws.ws_col = ncol; |
732 | ws.ws_col = ncol; |
727 | ws.ws_row = nrow; |
733 | ws.ws_row = nrow; |
728 | ws.ws_xpixel = width; |
734 | ws.ws_xpixel = vt_width; |
729 | ws.ws_ypixel = height; |
735 | ws.ws_ypixel = vt_height; |
730 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
736 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
731 | |
737 | |
732 | #if 0 |
738 | #if 0 |
733 | // TIOCSWINSZ is supposed to do this automatically and correctly |
739 | // TIOCSWINSZ is supposed to do this automatically and correctly |
734 | if (cmd_pid) /* force through to the command */ |
740 | if (cmd_pid) /* force through to the command */ |
… | |
… | |
938 | |
944 | |
939 | /*----------------------------------------------------------------------*/ |
945 | /*----------------------------------------------------------------------*/ |
940 | /* |
946 | /* |
941 | * find if fg/bg matches any of the normal (low-intensity) colors |
947 | * find if fg/bg matches any of the normal (low-intensity) colors |
942 | */ |
948 | */ |
943 | void |
949 | char * |
944 | rxvt_term::set_colorfgbg () |
950 | rxvt_term::get_colorfgbg () |
945 | { |
951 | { |
946 | unsigned int i; |
952 | unsigned int i; |
947 | const char *xpmb = ""; |
953 | const char *xpmb = ""; |
948 | char fstr[] = "default"; |
954 | char fstr[] = "default"; |
949 | char bstr[] = "default"; |
955 | char bstr[] = "default"; |
|
|
956 | char *env_colorfgbg; |
950 | |
957 | |
951 | for (i = Color_Black; i <= Color_White; i++) |
958 | for (i = Color_Black; i <= Color_White; i++) |
952 | if (pix_colors[Color_fg] == pix_colors[i]) |
959 | if (pix_colors[Color_fg] == pix_colors[i]) |
953 | { |
960 | { |
954 | sprintf (fstr, "%d", i - Color_Black); |
961 | sprintf (fstr, "%d", i - Color_Black); |
… | |
… | |
963 | xpmb = "default;"; |
970 | xpmb = "default;"; |
964 | #endif |
971 | #endif |
965 | break; |
972 | break; |
966 | } |
973 | } |
967 | |
974 | |
|
|
975 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); |
968 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
976 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
|
|
977 | return env_colorfgbg; |
969 | } |
978 | } |
970 | |
979 | |
971 | /*----------------------------------------------------------------------*/ |
980 | /*----------------------------------------------------------------------*/ |
972 | |
981 | |
973 | bool |
982 | bool |
… | |
… | |
1066 | if (scrollBar.state) |
1075 | if (scrollBar.state) |
1067 | scrollBar.resize (); |
1076 | scrollBar.resize (); |
1068 | |
1077 | |
1069 | XMoveResizeWindow (dpy, vt, |
1078 | XMoveResizeWindow (dpy, vt, |
1070 | window_vt_x, window_vt_y, |
1079 | window_vt_x, window_vt_y, |
1071 | width, height); |
1080 | vt_width, vt_height); |
1072 | |
1081 | |
1073 | #ifdef HAVE_BG_PIXMAP |
1082 | #ifdef HAVE_BG_PIXMAP |
1074 | if (bg_window_size_sensitive ()) |
1083 | if (bg_window_size_sensitive ()) |
1075 | update_background (); |
1084 | update_background (); |
1076 | #endif |
1085 | #endif |
… | |
… | |
1078 | |
1087 | |
1079 | if (fix_screen || old_height == 0) |
1088 | if (fix_screen || old_height == 0) |
1080 | scr_reset (); |
1089 | scr_reset (); |
1081 | |
1090 | |
1082 | #ifdef USE_XIM |
1091 | #ifdef USE_XIM |
1083 | IMSetPosition (); |
1092 | im_set_position (); |
1084 | #endif |
1093 | #endif |
1085 | } |
1094 | } |
1086 | |
1095 | |
1087 | /* |
1096 | /* |
1088 | * 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. |
… | |
… | |
1101 | newwidth = wattr.width - szHint.base_width; |
1110 | newwidth = wattr.width - szHint.base_width; |
1102 | if (newheight == 0) |
1111 | if (newheight == 0) |
1103 | newheight = wattr.height - szHint.base_height; |
1112 | newheight = wattr.height - szHint.base_height; |
1104 | } |
1113 | } |
1105 | |
1114 | |
1106 | if (newwidth != width || newheight != height) |
1115 | if (newwidth != vt_width || newheight != vt_height) |
1107 | { |
1116 | { |
1108 | newwidth += szHint.base_width; |
1117 | newwidth += szHint.base_width; |
1109 | newheight += szHint.base_height; |
1118 | newheight += szHint.base_height; |
1110 | resize_all_windows (newwidth, newheight, 0); |
1119 | resize_all_windows (newwidth, newheight, 0); |
1111 | } |
1120 | } |
… | |
… | |
1149 | status_rect.height = fheight; |
1158 | status_rect.height = fheight; |
1150 | } |
1159 | } |
1151 | |
1160 | |
1152 | /* Checking whether input method is running. */ |
1161 | /* Checking whether input method is running. */ |
1153 | bool |
1162 | bool |
1154 | rxvt_term::IMisRunning () |
1163 | rxvt_term::im_is_running () |
1155 | { |
1164 | { |
1156 | Atom atom; |
1165 | Atom atom; |
1157 | Window win; |
1166 | Window win; |
1158 | char server[IMBUFSIZ]; |
1167 | char server[IMBUFSIZ]; |
1159 | |
1168 | |
… | |
… | |
1175 | |
1184 | |
1176 | return false; |
1185 | return false; |
1177 | } |
1186 | } |
1178 | |
1187 | |
1179 | void |
1188 | void |
1180 | rxvt_term::IMSendSpot () |
1189 | rxvt_term::im_send_spot () |
1181 | { |
1190 | { |
1182 | XPoint nspot; |
1191 | XPoint nspot; |
1183 | XVaNestedList preedit_attr; |
1192 | XVaNestedList preedit_attr; |
1184 | |
1193 | |
1185 | if (!Input_Context |
1194 | if (!Input_Context |
… | |
… | |
1291 | /* |
1300 | /* |
1292 | * 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 |
1293 | * open a suitable preedit type |
1302 | * open a suitable preedit type |
1294 | */ |
1303 | */ |
1295 | bool |
1304 | bool |
1296 | rxvt_term::IM_get_IC (const char *modifiers) |
1305 | rxvt_term::im_get_ic (const char *modifiers) |
1297 | { |
1306 | { |
1298 | int i, j, found; |
1307 | int i, j, found; |
1299 | XIM xim; |
1308 | XIM xim; |
1300 | XPoint spot; |
1309 | XPoint spot; |
1301 | XRectangle rect, status_rect, needed_rect; |
1310 | XRectangle rect, status_rect, needed_rect; |
… | |
… | |
1499 | // 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 |
1500 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1509 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1501 | vt_select_input (); |
1510 | vt_select_input (); |
1502 | #endif |
1511 | #endif |
1503 | |
1512 | |
1504 | IMSetPosition (); |
1513 | im_set_position (); |
1505 | |
1514 | |
1506 | return true; |
1515 | return true; |
1507 | } |
1516 | } |
1508 | |
1517 | |
1509 | void |
1518 | void |
… | |
… | |
1537 | { |
1546 | { |
1538 | if (*s[i]) |
1547 | if (*s[i]) |
1539 | { |
1548 | { |
1540 | strcpy (buf, "@im="); |
1549 | strcpy (buf, "@im="); |
1541 | strncat (buf, s[i], IMBUFSIZ - 5); |
1550 | strncat (buf, s[i], IMBUFSIZ - 5); |
1542 | if (IM_get_IC (buf)) |
1551 | if (im_get_ic (buf)) |
1543 | { |
1552 | { |
1544 | found = true; |
1553 | found = true; |
1545 | break; |
1554 | break; |
1546 | } |
1555 | } |
1547 | } |
1556 | } |
… | |
… | |
1552 | if (found) |
1561 | if (found) |
1553 | goto done; |
1562 | goto done; |
1554 | } |
1563 | } |
1555 | |
1564 | |
1556 | /* try with XMODIFIERS env. var. */ |
1565 | /* try with XMODIFIERS env. var. */ |
1557 | if (IM_get_IC ("")) |
1566 | if (im_get_ic ("")) |
1558 | goto done; |
1567 | goto done; |
1559 | |
1568 | |
1560 | /* 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 */ |
1561 | if (IM_get_IC ("@im=none")) |
1570 | if (im_get_ic ("@im=none")) |
1562 | goto done; |
1571 | goto done; |
1563 | |
1572 | |
1564 | done: |
1573 | done: ; |
1565 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1574 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1566 | if (rs[Rs_imLocale]) |
1575 | if (rs[Rs_imLocale]) |
1567 | SET_LOCALE (locale); |
1576 | SET_LOCALE (locale); |
1568 | #endif |
1577 | #endif |
1569 | } |
1578 | } |
1570 | |
1579 | |
1571 | void |
1580 | void |
1572 | rxvt_term::IMSetPosition () |
1581 | rxvt_term::im_set_position () |
1573 | { |
1582 | { |
1574 | XRectangle preedit_rect, status_rect, *needed_rect; |
1583 | XRectangle preedit_rect, status_rect, *needed_rect; |
1575 | XVaNestedList preedit_attr, status_attr; |
1584 | XVaNestedList preedit_attr, status_attr; |
1576 | |
1585 | |
1577 | if (!Input_Context |
1586 | if (!Input_Context |
1578 | || !focus |
1587 | || !focus |
1579 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1588 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1580 | || !IMisRunning ()) |
1589 | || !im_is_running ()) |
1581 | return; |
1590 | return; |
1582 | |
1591 | |
1583 | if (input_style & XIMPreeditPosition) |
1592 | if (input_style & XIMPreeditPosition) |
1584 | { |
1593 | { |
1585 | im_set_size (preedit_rect); |
1594 | im_set_size (preedit_rect); |
… | |
… | |
1650 | if (update_background_ev.is_active ()) |
1659 | if (update_background_ev.is_active ()) |
1651 | return; |
1660 | return; |
1652 | |
1661 | |
1653 | bg_invalidate (); |
1662 | bg_invalidate (); |
1654 | |
1663 | |
|
|
1664 | if (!mapped) |
|
|
1665 | return; |
|
|
1666 | |
1655 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1667 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1656 | |
1668 | |
1657 | if (to_wait <= 0.) |
1669 | if (to_wait <= 0.) |
1658 | bg_render (); |
1670 | bg_render (); |
1659 | else |
1671 | else |