ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC

43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
147 155
148 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
149 { 157 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
153 break; 160 break;
154 } 161 }
155 162
156 x--; 163 x--;
157 } 164 }
158
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
175 fname = rxvt_utf8towcs (f->name);
176
171#if ENABLE_COMBINING 177# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
173 { 179 {
174 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
177 } 183 }
178 else 184 else
179#endif 185# endif
180 { 186 {
181 ch2 = ch; 187 ch2 = ch;
182 188
183 alloc = 0; 189 alloc = 0;
184 chr = &ch2; 190 chr = &ch2;
185 len = 1; 191 len = 1;
186 } 192 }
187 193
188 int width = strlen (f->name); 194 char attr[80]; // plenty
189 195
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
191 218
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 220
194 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
195 { 222 {
198 ch = *chr++; 225 ch = *chr++;
199 226
200 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
203#if !UNICODE3 230# if !UNICODE3
204 if (ch >= 0x10000) 231 if (ch >= 0x10000)
205 ch = 0xfffd; 232 ch = 0xfffd;
206#endif 233# endif
207 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
209 } 236 }
210 237
238 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
212 240
241 free (fname);
242
213#if ENABLE_COMBINING 243# if ENABLE_COMBINING
214 if (alloc) 244 if (alloc)
215 delete [] alloc; 245 delete [] alloc;
216#endif 246# endif
217} 247}
218#endif 248#endif
219 249
220void 250void
221rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
238 mb[0] = ch[0]; 268 mb[0] = ch[0];
239 len = 1; 269 len = 1;
240 } 270 }
241 271
242 if (len > 0) 272 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
244 else 274 else
245 scr_bell (); 275 scr_bell ();
246 } 276 }
247 277
248 iso14755buf = 0; 278 iso14755buf = 0;
276 KeySym keysym; 306 KeySym keysym;
277#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
279#endif 309#endif
280 int valid_keysym; 310 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
282 312
283 /* 313 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
286 * 316 *
304 Status status_return; 334 Status status_return;
305 335
306#if 0 336#if 0
307#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
311 else 341 else
312#endif 342#endif
313#endif 343#endif
314 { 344 {
316 346
317 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
321 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
324 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 357 SET_LOCALE (locale);
326 358
327 if (status_return == XLookupChars 359 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
349 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
350 } 382 }
351 else 383 else
352#endif 384#endif
353 { 385 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
356 } 388 }
357 389
358 if (valid_keysym) 390 if (valid_keysym)
359 { 391 {
360#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 394 return;
363#endif 395#endif
364 396
365 if (TermWin.saveLines) 397 if (saveLines)
366 { 398 {
367#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 400 if (!ctrl && !meta)
369#else 401#else
370 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
371#endif 403#endif
372 { 404 {
373 int lnsppg; 405 int lnsppg;
374 406
375#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 409#else
378 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
379#endif 411#endif
380 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
381 { 413 {
382 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
383 return; 415 return;
823 { 855 {
824#ifdef META8_OPTION 856#ifdef META8_OPTION
825 /* set 8-bit on */ 857 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
827 { 859 {
828 unsigned char *ch; 860 char *ch;
829 861
830 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 863 *ch |= 0x80;
832 864
833 meta = 0; 865 meta = 0;
838 } 870 }
839 871
840 if (len <= 0) 872 if (len <= 0)
841 return; /* not mapped */ 873 return; /* not mapped */
842 874
843 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 876 if (view_start)
845 { 877 {
846 TermWin.view_start = 0; 878 view_start = 0;
847 want_refresh = 1; 879 want_refresh = 1;
848 } 880 }
849 881
850 /* 882 /*
851 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
866#ifdef META8_OPTION 898#ifdef META8_OPTION
867 && meta_char == C0_ESC 899 && meta_char == C0_ESC
868#endif 900#endif
869 ) 901 )
870 { 902 {
871 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
872 tt_write (&ch, 1); 904 tt_write (&ch, 1);
873 } 905 }
874 906
875#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
888 920
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
892unsigned int 924unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 926{
895 unsigned int n, s; 927 unsigned int n, s;
896 928
897 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
935 } 967 }
936#endif 968#endif
937 969
938 if (want_refresh) 970 if (want_refresh)
939 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
940 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
941 scrollbar_show (1); 1012 scrollbar_show (1);
942#ifdef USE_XIM 1013#ifdef USE_XIM
943 IMSendSpot (); 1014 IMSendSpot ();
944#endif 1015#endif
954 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
955 1026
956 display->flush (); 1027 display->flush ();
957 1028
958 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1031}
961 1032
962void 1033void
963rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
964{ 1035{
1028{ 1099{
1029 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1103 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1104 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1105 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1106 mouse_slip_wheel_speed = 0;
1036 1107
1037 refresh_type |= SMOOTH_REFRESH; 1108 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1109 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1111 }
1041} 1112}
1042#endif 1113#endif
1043 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
1044bool 1133bool
1045rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
1046{ 1135{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1137
1049 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1050 { 1139 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1141 n = 0;
1053 } 1142 }
1054 1143
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
1058 1147
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1149
1061 if (n > 0) 1150 if (r > 0)
1062 { 1151 {
1063 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
1064 return true; 1153 return true;
1065 } 1154 }
1066 else if (n < 0 && errno != EAGAIN) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1163 {
1164 pty_ev.stop ();
1165
1166 if (!OPTION (Opt_hold))
1067 destroy (); 1167 destroy ();
1168 }
1068 1169
1069 return false; 1170 return false;
1070} 1171}
1071 1172
1072void 1173void
1086} 1187}
1087 1188
1088void 1189void
1089rxvt_term::pointer_unblank () 1190rxvt_term::pointer_unblank ()
1090{ 1191{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1192 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1193 recolour_cursor ();
1093 1194
1094#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1196 hidden_pointer = 0;
1096 1197
1097 if (options & Opt_pointerBlank) 1198 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1199 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1200#endif
1100} 1201}
1101 1202
1102#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
1103void 1204void
1104rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
1105{ 1206{
1106 if (! (options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
1107 return; 1208 return;
1108 1209
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1211 XFlush (display->display);
1111 1212
1112 hidden_pointer = 1; 1213 hidden_pointer = 1;
1113} 1214}
1114 1215
1209 1310
1210 SET_R (this); 1311 SET_R (this);
1211 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
1212 1313
1213#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1316 {
1216 if (hidden_cursor) 1317 if (hidden_cursor)
1217 { 1318 {
1218 hidden_cursor = 0; 1319 hidden_cursor = 0;
1219 want_refresh = 1; 1320 want_refresh = 1;
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1324 }
1224#endif 1325#endif
1225 1326
1226#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1329 {
1229 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1333 if (hidden_pointer)
1330 button_release (ev.xbutton); 1431 button_release (ev.xbutton);
1331 break; 1432 break;
1332 1433
1333 case ClientMessage: 1434 case ClientMessage:
1334 if (ev.xclient.format == 32 1435 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1437 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1439 destroy ();
1440#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev);
1445#endif
1446 }
1338#if ENABLE_XEMBED 1447#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1449 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1451 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1453 focus_out ();
1409 case FocusOut: 1517 case FocusOut:
1410 focus_out (); 1518 focus_out ();
1411 break; 1519 break;
1412 1520
1413 case ConfigureNotify: 1521 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1522 if (ev.xconfigure.window == parent[0])
1415 { 1523 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ;
1425 1526
1426 if (szHint.width != width || szHint.height != height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1528 {
1428 seen_resize = 1; 1529 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1531 }
1431 1532
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1534 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1535 check_our_parents ();
1435#endif 1536#endif
1436 } 1537 }
1437 break; 1538 break;
1438 1539
1455 case SelectionRequest: 1556 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1457 break; 1558 break;
1458 1559
1459 case UnmapNotify: 1560 case UnmapNotify:
1460 TermWin.mapped = 0; 1561 mapped = 0;
1461#ifdef TEXT_BLINK 1562#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1563 text_blink_ev.stop ();
1463#endif 1564#endif
1464 break; 1565 break;
1465 1566
1466 case MapNotify: 1567 case MapNotify:
1467 TermWin.mapped = 1; 1568 mapped = 1;
1468#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1571#endif
1471 break; 1572 break;
1472 1573
1476 break; 1577 break;
1477#endif /* TRANSPARENT */ 1578#endif /* TRANSPARENT */
1478 1579
1479 case GraphicsExpose: 1580 case GraphicsExpose:
1480 case Expose: 1581 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1482 { 1583 {
1483 do 1584 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1585 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1586 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1588
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1590
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1493 1594
1494 scr_refresh (refresh_type); 1595 scr_refresh (refresh_type);
1495 } 1596 }
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1613 menubar_expose ();
1513#endif 1614#endif
1514 1615
1515#ifdef TRANSPARENT 1616#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1617 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1618 XClearWindow (disp, ev.xany.window);
1518#endif 1619#endif
1519 } 1620 }
1520 break; 1621 break;
1521 1622
1532 } 1633 }
1533#endif 1634#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1636 break;
1536 1637
1537 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1538 { 1639 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1641 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1643 ;
1543 1644
1544 XQueryPointer (disp, TermWin.vt, 1645 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1649 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1561#endif 1662#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1665
1565#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1669 {
1569 int dist; 1670 int dist;
1570 1671
1571 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1580 selection_save_x = ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1684
1584 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1586 { 1687 {
1587 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1589 } 1690 }
1590 else 1691 else
1591 { 1692 {
1592 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1694 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1695 }
1595 1696
1596 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1699 + 1;
1599 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1601 } 1702 }
1602 else 1703 else
1603 { 1704 {
1604 /* we are within the text window, so we 1705 /* we are within the text window, so we
1635} 1736}
1636 1737
1637void 1738void
1638rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1639{ 1740{
1640 if (!TermWin.focus) 1741 if (!focus)
1641 { 1742 {
1642 TermWin.focus = 1; 1743 focus = 1;
1643 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1644#ifdef USE_XIM 1748#if USE_XIM
1645 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1646 { 1750 {
1647 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
1649 } 1753 }
1650#endif 1754#endif
1651#ifdef CURSOR_BLINK 1755#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1756 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1758#endif
1655#ifdef OFF_FOCUS_FADING 1759#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1760 if (rs[Rs_fade])
1657 { 1761 {
1658 pix_colors = pix_colors_focused; 1762 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1763 scr_recolour ();
1660 } 1764 }
1663} 1767}
1664 1768
1665void 1769void
1666rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1667{ 1771{
1668 if (TermWin.focus) 1772 if (focus)
1669 { 1773 {
1670 TermWin.focus = 0; 1774 focus = 0;
1671 want_refresh = 1; 1775 want_refresh = 1;
1672 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1673#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1674 iso14755buf = 0; 1782 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1677 scr_overlay_off (); 1784 scr_overlay_off ();
1678#endif 1785# endif
1786 }
1787#endif
1679#ifdef USE_XIM 1788#if USE_XIM
1680 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1682#endif 1791#endif
1683#ifdef CURSOR_BLINK 1792#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1793 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1795 hidden_cursor = 0;
1687#endif 1796#endif
1688#ifdef OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
1690 { 1799 {
1691 pix_colors = pix_colors_unfocused; 1800 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1801 scr_recolour ();
1693 } 1802 }
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1823 return;
1715 1824
1716 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1717 case ReparentNotify: 1826 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1720 break; 1829 break;
1721 } 1830 }
1722} 1831}
1723#endif 1832#endif
1726rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1727{ 1836{
1728 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1729 1838
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1731 if (!bypass_keystate) 1841 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1843
1734 /* 1844 /*
1735 * VT window processing of button press 1845 * VT window processing of button press
1736 */ 1846 */
1737 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1738 { 1848 {
1739#if ISO_14755 1849#if ISO_14755
1740 // 5.4 1850 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1852 {
1784 else 1894 else
1785 { 1895 {
1786 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1787 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1788 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1789 switch (ev.button) 1900 switch (ev.button)
1790 { 1901 {
1791 case Button1: 1902 case Button1:
1792 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1794#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1796#else 1907#else
1797 selection.rect = false; 1908 selection.rect = false;
1798#endif 1909#endif
1799 1910
1800 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1802 { 1913 {
1803 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1805 else 1916 else
1806 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1807 } 1918 }
1808 else 1919 else
1809 { 1920 {
1810 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1811 MEvent.clicks++; 1922 MEvent.clicks++;
1812 else 1923 else
1813 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1814 1925
1815 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1816 } 1927 }
1817 1928
1818 MEvent.button = Button1; 1929 MEvent.button = Button1;
1819 break; 1930 break;
1820 1931
1821 case Button3: 1932 case Button3:
1822 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1823 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1824 else 1935 else
1825 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1826 1937
1827 MEvent.button = Button3; 1938 MEvent.button = Button3;
1828 break; 1939 break;
1829 } 1940 }
1830 } 1941 }
1831 1942
1832 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1833 return; 1944 return;
1834 } 1945 }
1835 1946
1947 case Button3: 2058 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1949 { 2060 {
1950 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1953# else 2064# else
1954 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1955# endif 2066# endif
1956 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1959# else 2070# else
1960 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1961# endif 2072# endif
1962 else 2073 else
1963 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1964 } 2075 }
1965 else 2076 else
1966 { 2077 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2079 (nrow
1969 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2081 / scrollbar_size ()));
1971 } 2082 }
1972 2083
1973 break; 2084 break;
2005#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2008#endif 2119#endif
2009 2120
2010 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
2011 { 2122 {
2012#if ISO_14755 2123#if ISO_14755
2013 // 5.4 2124 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2126 return;
2065 2176
2066 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2067 2178
2068 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2069 i = 1; 2180 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2182 i = nrow - 1;
2072 else 2183 else
2073 i = 5; 2184 i = 5;
2074 2185
2075# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
2077 { 2188 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2192
2082 if (slip_wheel_ev.at < NOW) 2193 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2195
2085 slip_wheel_ev.start (); 2196 slip_wheel_ev.start ();
2361 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2473 dDisp;
2363 2474
2364 pchanged = 0; 2475 pchanged = 0;
2365 2476
2366 if (!(options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
2368 2479
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
2371 2482
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2484
2374 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
2375 { 2486 {
2376 if (am_transparent) 2487 if (am_transparent)
2377 { 2488 {
2378 pchanged = 1; 2489 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
2381 } 2492 }
2382 2493
2383 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
2384 } 2495 }
2425 Window cr; 2536 Window cr;
2426 XImage *image; 2537 XImage *image;
2427 GC gc; 2538 GC gc;
2428 XGCValues gcvalue; 2539 XGCValues gcvalue;
2429 2540
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2545 nx = ny = 0;
2435 2546
2445 nh += sy; 2556 nh += sy;
2446 ny = -sy; 2557 ny = -sy;
2447 sy = 0; 2558 sy = 0;
2448 } 2559 }
2449 2560
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2563
2453 XSync (disp, False); 2564 XSync (disp, False);
2454 allowedxerror = -1; 2565 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2567
2461 if (image == NULL) 2572 if (image == NULL)
2462 { 2573 {
2463 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2464 { 2575 {
2465 pchanged = 1; 2576 pchanged = 1;
2466 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2467 { 2578 {
2468 XFreePixmap (disp, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2580 pixmap = None;
2470 } 2581 }
2471 } 2582 }
2472 2583
2473 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2474 } 2585 }
2475 else 2586 else
2476 { 2587 {
2477 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2479 2590
2480#if TINTING 2591#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2593 {
2483 unsigned short rm, gm, bm; 2594 unsigned short rm, gm, bm;
2487 2598
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2600 }
2490#endif 2601#endif
2491 2602
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2608 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2609 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2611 XClearWindow (disp, parent[0]);
2501 2612
2502 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2614 pchanged = 1;
2504 2615
2505 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2506 } 2617 }
2507 } 2618 }
2508 2619
2509 if (am_pixmap_trans) 2620 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2622 else
2512 { 2623 {
2513 unsigned int n; 2624 unsigned int n;
2514 /* 2625 /*
2515 * InheritPixmap transparency 2626 * InheritPixmap transparency
2516 */ 2627 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2629 {
2519 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2522 XFree (list); 2633 XFree (list);
2523 2634
2524 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2525 { 2636 {
2526 if (oldp != None) 2637 if (oldp != None)
2527 pchanged = 1; 2638 pchanged = 1;
2528 2639
2529 break; 2640 break;
2530 } 2641 }
2531 2642
2532 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2533 pchanged = 1; 2644 pchanged = 1;
2534 } 2645 }
2535 2646
2536 n = 0; 2647 n = 0;
2537 2648
2538 if (pchanged) 2649 if (pchanged)
2539 { 2650 {
2540 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2541 { 2652 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2653 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2655 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2657 break;
2547 } 2658 }
2548 } 2659 }
2549 } 2660 }
2550 2661
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2663 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2666 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2557 } 2668 }
2558 else 2669 else
2559 { 2670 {
2562 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2674 sleep (1);
2564#endif 2675#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2566 { 2677 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2679 XClearWindow (disp, parent[n]);
2569 } 2680 }
2570 2681
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2683 am_transparent = 1;
2573 } 2684 }
2574 2685
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2687 parent[i] = None;
2577 } 2688 }
2578 2689
2579 if (scrollBar.win) 2690 if (scrollBar.win)
2580 { 2691 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2599bool 2710bool
2600rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2601{ 2712{
2602 bool flag = false; 2713 bool flag = false;
2603 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2605 2716
2606 for (;;) 2717 for (;;)
2607 { 2718 {
2608 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2609 { 2720 {
2610 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2722 ch = next_char ();
2612 }
2613 2723
2614 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2615 break; 2725 break;
2726 }
2616 2727
2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2618 { 2729 {
2619 if (!seen_input) 2730 if (!seen_input)
2620 { 2731 {
2633 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2746 bool refreshnow = false;
2636 int nlines = 0; 2747 int nlines = 0;
2637 unicode_t *str = buf; 2748 unicode_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2750
2639 for (;;) 2751 for (;;)
2640 { 2752 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2754 break;
2643 2755
2644 *str++ = ch; 2756 *str++ = ch;
2645 2757
2646 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2647 { 2759 {
2760 if (ch == C0_LF)
2648 nlines++; 2761 nlines++;
2762
2649 refresh_count++; 2763 refresh_count++;
2650 2764
2651 if (!(options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2767 {
2654 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2655 ch = NOCHAR; 2770 ch = NOCHAR;
2656 break; 2771 break;
2657 } 2772 }
2658 2773
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2661 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2662 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2663 nlines = 0; 2780 nlines = 0;
2664 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2665 } 2783 }
2666 }
2667 2784
2668 if (str >= buf + UBUFSIZ) 2785 if (str >= eol)
2669 { 2786 {
2787 if (eol >= buf + UBUFSIZ)
2788 {
2670 ch = NOCHAR; 2789 ch = NOCHAR;
2671 break; 2790 break;
2791 }
2792 else
2793 eol = min (eol + ncol, buf + UBUFSIZ);
2794 }
2795
2672 } 2796 }
2673 2797
2674 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2799 ch = next_char ();
2676 } 2800 }
2677 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2678 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2679 2804
2680 /* 2805 /*
2681 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2682 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2683 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2810 */
2686 if (refreshnow) 2811 if (refreshnow)
2687 { 2812 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2814 refresh_limit++;
2690 else 2815 else
2691 { 2816 {
2692 flag = true; 2817 flag = true;
2693 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2694 } 2820 }
2695 } 2821 }
2696 2822
2697 } 2823 }
2698 else 2824 else
2729rxvt_term::next_char () 2855rxvt_term::next_char ()
2730{ 2856{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2858 {
2733 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2735 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2736 2862
2737 wchar_t wc; 2863 wchar_t wc;
2738 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739 2865
2740 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2741 { 2867 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
2882 case C0_ESC: 3008 case C0_ESC:
2883 process_escape_seq (); 3009 process_escape_seq ();
2884 break; 3010 break;
2885 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 3014 else
2890 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 3016 break;
2893 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2894 scr_bell (); 3018 scr_bell ();
2895 break; 3019 break;
2896 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
3084 process_dcs_seq (); 3208 process_dcs_seq ();
3085 break; 3209 break;
3086 3210
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3092 3215
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3094 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 3218 process_csi_seq ();
3335 3458
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3464 break;
3342 3465
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3468 break;
3347 3469
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3350 break; 3472 break;
3357 break; 3479 break;
3358 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
3359 scr_report_position (); 3481 scr_report_position ();
3360 break; 3482 break;
3361 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3486 break;
3365 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3489 break;
3470 { 3592 {
3471 /* 3593 /*
3472 * commands 3594 * commands
3473 */ 3595 */
3474 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3476 break; 3598 break;
3477 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3600 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3601 break;
3480 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3604 break;
3483 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3607 break;
3486 case 5: /* raise window */ 3608 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3488 break; 3610 break;
3489 case 6: /* lower window */ 3611 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3491 break; 3613 break;
3492 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3493 scr_touch (true); 3615 scr_touch (true);
3494 break; 3616 break;
3495 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3498 break; 3620 break;
3499 3621
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3623 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3505 break; 3627 break;
3506 3628
3507 3629
3508 /* 3630 /*
3509 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3510 */ 3632 */
3511 case 11: /* report window state */ 3633 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3636 break;
3515 case 13: /* report window position */ 3637 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3643 break;
3522 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3647 break;
3526 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3650 break;
3529 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3653 break;
3532 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3533 { 3655 {
3534 char *s; 3656 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3659 XFree (s);
3538 } 3660 }
3539 break; 3661 break;
3540 case 21: /* report window title */ 3662 case 21: /* report window title */
3541 { 3663 {
3542 char *s; 3664 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3667 XFree (s);
3546 } 3668 }
3547 break; 3669 break;
3548 } 3670 }
3549} 3671}
3552/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3553/* 3675/*
3554 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3556 */ 3678 */
3557unsigned char * 3679char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3681{
3560 unicode_t ch; 3682 unicode_t ch;
3561 bool seen_esc = false; 3683 bool seen_esc = false;
3562 unsigned int n = 0; 3684 unsigned int n = 0;
3581 else if (ch < 0x20) 3703 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3583 3705
3584 seen_esc = false; 3706 seen_esc = false;
3585 3707
3586 if (n >= sizeof (string) - 1) 3708 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3709 // stop at some sane length
3588 return NULL; 3710 return NULL;
3589 3711
3590 if (ch == C0_SYN) 3712 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3713 string[n++] = cmd_get8 ();
3595 3717
3596 string[n++] = '\0'; 3718 string[n++] = '\0';
3597 3719
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3721
3600 return (unsigned char *)rxvt_wcstombs (string); 3722 return rxvt_wcstombs (string);
3601} 3723}
3602 3724
3603/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3604/* 3726/*
3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606 */ 3728 */
3607void 3729void
3608rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3609{ 3731{
3610 unsigned char *s; 3732 char *s;
3611 unicode_t eh; 3733 unicode_t eh;
3612 3734
3613 /* 3735 /*
3614 * Not handled yet 3736 * Not handled yet
3615 */ 3737 */
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3636 3758
3637 if (ch == ';') 3759 if (ch == ';')
3638 { 3760 {
3639 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3640 3762
3641 if (s) 3763 if (s)
3642 { 3764 {
3643 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3644 free (s); 3766 free (s);
3645 } 3767 }
3646 } 3768 }
3647} 3769}
3648 3770
3649void 3771void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651{ 3773{
3652 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3653 { 3775 {
3654 unsigned short r, g, b; 3776 unsigned short r, g, b;
3655 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
3659 set_window_color (color, str); 3781 set_window_color (color, str);
3660} 3782}
3661 3783
3662/* 3784/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3786 */
3687void 3787void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3689{ 3789{
3690 int changed = 0; 3790 int changed = 0;
3691 int color; 3791 int color;
3692 char *buf, *name; 3792 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3716 unsigned long bytes_after; 3816 unsigned long bytes_after;
3717 unsigned char *value = 0; 3817 unsigned char *value = 0;
3718 const char *str = ""; 3818 const char *str = "";
3719 3819
3720 if (prop 3820 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3825 && actual_type != None
3726 && actual_format == 8) 3826 && actual_format == 8)
3738 { 3838 {
3739 *eq = 0; 3839 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3840 set_utf8_property (display->atom (str), eq + 1);
3741 } 3841 }
3742 else 3842 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3844 display->atom (str));
3745 } 3845 }
3746 break; 3846 break;
3747 3847
3748 case XTerm_Color: 3848 case XTerm_Color:
3789 break; 3889 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3890#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3891 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3893 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3896 break;
3800 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3899 break;
3900 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break;
3803#endif 3903#endif
3804#if TRANSPARENT && TINTING 3904#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3905 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3907 check_our_parents ();
3808 if (am_transparent) 3908 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3909 want_full_refresh = want_refresh = 1;
3810 break; 3910 break;
3811#endif 3911#endif
3845 3945
3846 case XTerm_logfile: 3946 case XTerm_logfile:
3847 // TODO, when secure mode? 3947 // TODO, when secure mode?
3848 break; 3948 break;
3849 3949
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0
3957 case XTerm_dumpscreen: /* no error notices */
3958 {
3959 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 {
3962 scr_dump (fd);
3963 close (fd);
3964 }
3965 }
3966 break;
3967#endif
3850 case XTerm_font: 3968 case XTerm_font:
3851 op = URxvt_font; 3969 op = URxvt_font;
3852 case URxvt_font: 3970 case URxvt_font:
3853#if ENABLE_STYLES 3971#if ENABLE_STYLES
3854 case URxvt_boldFont: 3972 case URxvt_boldFont:
3855 case URxvt_italicFont: 3973 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3974 case URxvt_boldItalicFont:
3857#endif 3975#endif
3858 if (query) 3976 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3979 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3980 resp);
3863 else 3981 else
3864 { 3982 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3984
3869 set_fonts (); 3987 set_fonts ();
3870 } 3988 }
3871 break; 3989 break;
3872 3990
3873#if ENABLE_FRILLS 3991#if ENABLE_FRILLS
3874 case XTerm_locale: 3992 case URxvt_locale:
3875 if (query) 3993 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3995 else
3878 { 3996 {
3879 set_locale (str); 3997 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3998 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3999 init_xlocale ();
3883# endif
3884 } 4000 }
3885 break; 4001 break;
3886#endif
3887 4002
3888#ifdef MENUBAR 4003 case URxvt_view_up:
3889 case XTerm_Menu: 4004 case URxvt_view_down:
3890 if (options & Opt_insecure) 4005 {
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4006 int lines = atoi (str);
4007
4008 if (lines)
4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
4010 else
4011 scr_erase_savelines ();
4012 }
4013
3892 break; 4014 break;
3893#endif 4015#endif
3894#if 0 4016
3895 case XTerm_dumpscreen: /* no error notices */ 4017#if ENABLE_PERL
3896 { 4018 case URxvt_perl:
3897 int fd; 4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4020 ; // no responses yet
3899 {
3900 scr_dump (fd);
3901 close (fd);
3902 }
3903 }
3904 break; 4021 break;
3905#endif 4022#endif
3906 } 4023 }
3907} 4024}
3908/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
4017 } 4134 }
4018 4135
4019 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4137 switch (arg[i])
4021 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
4022 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4023 case 1049: 4150 case 1049:
4024 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4152 if (mode == 0)
4026 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
4027 else if (mode == 1) 4154 else if (mode == 1)
4028 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
4029 break; 4156 break;
4041 */ 4168 */
4042 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
4043 break; 4170 break;
4044 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4174 break;
4048 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
4049 if (state) 4176 if (!state)
4050 options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
4051 else 4178 else
4052 options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
4053 break; 4180 break;
4054 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4056 break; 4183 break;
4057 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
4098#if 0 4225#if 0
4099 case 1001: 4226 case 1001:
4100 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
4101#endif 4228#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4230 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4232 else
4106 options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4234 break;
4108 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4109 if (state) 4236 if (state)
4110 options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4238 else
4112 options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4240 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4244 scr_erase_screen (2);
4118 scr_change_screen (state); 4245 scr_change_screen (state);
4119 break; 4246 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4248 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4251 scr_erase_screen (2);
4125 break; 4252 break;
4126 default: 4253 default:
4127 break; 4254 break;
4255 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4256 break; 4383 break;
4257 4384
4258 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4259 4386
4260#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4261 case 90: 4388 case 90:
4262 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4263 case 92: 4390 case 92:
4264 case 93: 4391 case 93:
4265 case 94: 4392 case 94:
4277 case 106: 4404 case 106:
4278 case 107: 4405 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4407 break;
4281#endif 4408#endif
4282
4283 } 4409 }
4284 } 4410 }
4285} 4411}
4286/*}}} */ 4412/*}}} */
4287 4413
4311 */ 4437 */
4312void 4438void
4313rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4314{ 4440{
4315 va_list arg_ptr; 4441 va_list arg_ptr;
4316 unsigned char buf[256]; 4442 char buf[256];
4317 4443
4318 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4320 va_end (arg_ptr); 4446 va_end (arg_ptr);
4321 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
4326 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4327 */ 4453 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329 4455
4330void 4456void
4331rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4332{ 4458{
4459 if (pty.pty < 0)
4460 return;
4461
4333 if (v_buflen == 0) 4462 if (v_buflen == 0)
4334 { 4463 {
4335 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4336 4465
4337 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
4339 4468
4340 data += written; 4469 data += written;
4341 len -= written; 4470 len -= written;
4342 } 4471 }
4343 4472
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4345 4474
4346 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len; 4476 v_buflen += len;
4348 4477
4349 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
4368 } 4497 }
4369 4498
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4499 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4500 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4502 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4503}
4376 4504
4377/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
4378 4506

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines