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.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.235 by root, Wed Jan 4 20:43:37 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;
954 SET_LOCALE (locale); 986 SET_LOCALE (locale);
955 987
956 display->flush (); 988 display->flush ();
957 989
958 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 992}
961 993
962void 994void
963rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
964{ 996{
1028{ 1060{
1029 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1064 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1065 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1066 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1067 mouse_slip_wheel_speed = 0;
1036 1068
1037 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1070 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1072 }
1041} 1073}
1042#endif 1074#endif
1043 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1044bool 1094bool
1045rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1046{ 1096{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1098
1049 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1050 { 1100 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1102 n = 0;
1053 } 1103 }
1054 1104
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1058 1108
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1110
1061 if (n > 0) 1111 if (r > 0)
1062 { 1112 {
1063 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1064 return true; 1114 return true;
1065 } 1115 }
1066 else if (n < 0 && errno != EAGAIN) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1124 {
1125 pty_ev.stop ();
1126
1127 if (!OPTION (Opt_hold))
1067 destroy (); 1128 destroy ();
1129 }
1068 1130
1069 return false; 1131 return false;
1070} 1132}
1071 1133
1072void 1134void
1086} 1148}
1087 1149
1088void 1150void
1089rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1090{ 1152{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1154 recolour_cursor ();
1093 1155
1094#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1157 hidden_pointer = 0;
1096 1158
1097 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1161#endif
1100} 1162}
1101 1163
1102#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1103void 1165void
1104rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1105{ 1167{
1106 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1107 return; 1169 return;
1108 1170
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1172 XFlush (display->display);
1111 1173
1112 hidden_pointer = 1; 1174 hidden_pointer = 1;
1113} 1175}
1114 1176
1209 1271
1210 SET_R (this); 1272 SET_R (this);
1211 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1212 1274
1213#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1277 {
1216 if (hidden_cursor) 1278 if (hidden_cursor)
1217 { 1279 {
1218 hidden_cursor = 0; 1280 hidden_cursor = 0;
1219 want_refresh = 1; 1281 want_refresh = 1;
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1285 }
1224#endif 1286#endif
1225 1287
1226#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1290 {
1229 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1294 if (hidden_pointer)
1416 case FocusOut: 1478 case FocusOut:
1417 focus_out (); 1479 focus_out ();
1418 break; 1480 break;
1419 1481
1420 case ConfigureNotify: 1482 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1422 { 1484 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ;
1432 1487
1433 if (szHint.width != width || szHint.height != height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1489 {
1435 seen_resize = 1; 1490 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1492 }
1438 1493
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1496 check_our_parents ();
1442#endif 1497#endif
1443 } 1498 }
1444 break; 1499 break;
1445 1500
1462 case SelectionRequest: 1517 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1464 break; 1519 break;
1465 1520
1466 case UnmapNotify: 1521 case UnmapNotify:
1467 TermWin.mapped = 0; 1522 mapped = 0;
1468#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1470#endif 1525#endif
1471 break; 1526 break;
1472 1527
1473 case MapNotify: 1528 case MapNotify:
1474 TermWin.mapped = 1; 1529 mapped = 1;
1475#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif 1532#endif
1478 break; 1533 break;
1479 1534
1483 break; 1538 break;
1484#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1485 1540
1486 case GraphicsExpose: 1541 case GraphicsExpose:
1487 case Expose: 1542 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1489 { 1544 {
1490 do 1545 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1549
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1551
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1500 1555
1501 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1502 } 1557 }
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose (); 1574 menubar_expose ();
1520#endif 1575#endif
1521 1576
1522#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1525#endif 1580#endif
1526 } 1581 }
1527 break; 1582 break;
1528 1583
1539 } 1594 }
1540#endif 1595#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1597 break;
1543 1598
1544 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1545 { 1600 {
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1602 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1604 ;
1550 1605
1551 XQueryPointer (disp, TermWin.vt, 1606 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1609 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1610 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1568#endif 1623#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1626
1572#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1630 {
1576 int dist; 1631 int dist;
1577 1632
1578 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1587 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1645
1591 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1593 { 1648 {
1594 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1596 } 1651 }
1597 else 1652 else
1598 { 1653 {
1599 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1656 }
1602 1657
1603 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1660 + 1;
1606 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1608 } 1663 }
1609 else 1664 else
1610 { 1665 {
1611 /* we are within the text window, so we 1666 /* we are within the text window, so we
1642} 1697}
1643 1698
1644void 1699void
1645rxvt_term::focus_in () 1700rxvt_term::focus_in ()
1646{ 1701{
1647 if (!TermWin.focus) 1702 if (!focus)
1648 { 1703 {
1649 TermWin.focus = 1; 1704 focus = 1;
1650 want_refresh = 1; 1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1651#ifdef USE_XIM 1709#if USE_XIM
1652 if (Input_Context != NULL) 1710 if (Input_Context != NULL)
1653 { 1711 {
1654 IMSetStatusPosition (); 1712 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1713 XSetICFocus (Input_Context);
1656 } 1714 }
1657#endif 1715#endif
1658#ifdef CURSOR_BLINK 1716#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1717 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1719#endif
1662#ifdef OFF_FOCUS_FADING 1720#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1721 if (rs[Rs_fade])
1664 { 1722 {
1665 pix_colors = pix_colors_focused; 1723 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1724 scr_recolour ();
1667 } 1725 }
1670} 1728}
1671 1729
1672void 1730void
1673rxvt_term::focus_out () 1731rxvt_term::focus_out ()
1674{ 1732{
1675 if (TermWin.focus) 1733 if (focus)
1676 { 1734 {
1677 TermWin.focus = 0; 1735 focus = 0;
1678 want_refresh = 1; 1736 want_refresh = 1;
1679 1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1680#if ENABLE_FRILLS || ISO_14755 1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1681 iso14755buf = 0; 1743 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1744# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1745 scr_overlay_off ();
1685#endif 1746# endif
1747 }
1748#endif
1686#ifdef USE_XIM 1749#if USE_XIM
1687 if (Input_Context != NULL) 1750 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1751 XUnsetICFocus (Input_Context);
1689#endif 1752#endif
1690#ifdef CURSOR_BLINK 1753#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1754 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1755 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1756 hidden_cursor = 0;
1694#endif 1757#endif
1695#ifdef OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1697 { 1760 {
1698 pix_colors = pix_colors_unfocused; 1761 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1762 scr_recolour ();
1700 } 1763 }
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1784 return;
1722 1785
1723 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1724 case ReparentNotify: 1787 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1727 break; 1790 break;
1728 } 1791 }
1729} 1792}
1730#endif 1793#endif
1733rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1734{ 1797{
1735 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1736 1799
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1738 if (!bypass_keystate) 1802 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1804
1741 /* 1805 /*
1742 * VT window processing of button press 1806 * VT window processing of button press
1743 */ 1807 */
1744 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1745 { 1809 {
1746#if ISO_14755 1810#if ISO_14755
1747 // 5.4 1811 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1813 {
1791 else 1855 else
1792 { 1856 {
1793 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1795 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1861 switch (ev.button)
1797 { 1862 {
1798 case Button1: 1863 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1868#else
1804 selection.rect = false; 1869 selection.rect = false;
1805#endif 1870#endif
1806 1871
1807 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1809 { 1874 {
1810 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1812 else 1877 else
1813 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1814 } 1879 }
1815 else 1880 else
1816 { 1881 {
1817 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1883 MEvent.clicks++;
1819 else 1884 else
1820 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1821 1886
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1888 }
1824 1889
1825 MEvent.button = Button1; 1890 MEvent.button = Button1;
1826 break; 1891 break;
1827 1892
1828 case Button3: 1893 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1831 else 1896 else
1832 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1833 1898
1834 MEvent.button = Button3; 1899 MEvent.button = Button3;
1835 break; 1900 break;
1836 } 1901 }
1837 } 1902 }
1838 1903
1839 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1840 return; 1905 return;
1841 } 1906 }
1842 1907
1954 case Button3: 2019 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1956 { 2021 {
1957 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1960# else 2025# else
1961 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1962# endif 2027# endif
1963 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1966# else 2031# else
1967 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1968# endif 2033# endif
1969 else 2034 else
1970 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1971 } 2036 }
1972 else 2037 else
1973 { 2038 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2040 (nrow
1976 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2042 / scrollbar_size ()));
1978 } 2043 }
1979 2044
1980 break; 2045 break;
2012#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
2015#endif 2080#endif
2016 2081
2017 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
2018 { 2083 {
2019#if ISO_14755 2084#if ISO_14755
2020 // 5.4 2085 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2087 return;
2072 2137
2073 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2074 2139
2075 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2076 i = 1; 2141 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2079 else 2144 else
2080 i = 5; 2145 i = 5;
2081 2146
2082# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2084 { 2149 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2153
2089 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2156
2092 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
2368 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2434 dDisp;
2370 2435
2371 pchanged = 0; 2436 pchanged = 0;
2372 2437
2373 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2375 2440
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2378 2443
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2445
2381 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2382 { 2447 {
2383 if (am_transparent) 2448 if (am_transparent)
2384 { 2449 {
2385 pchanged = 1; 2450 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2388 } 2453 }
2389 2454
2390 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2391 } 2456 }
2432 Window cr; 2497 Window cr;
2433 XImage *image; 2498 XImage *image;
2434 GC gc; 2499 GC gc;
2435 XGCValues gcvalue; 2500 XGCValues gcvalue;
2436 2501
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2506 nx = ny = 0;
2442 2507
2452 nh += sy; 2517 nh += sy;
2453 ny = -sy; 2518 ny = -sy;
2454 sy = 0; 2519 sy = 0;
2455 } 2520 }
2456 2521
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2524
2460 XSync (disp, False); 2525 XSync (disp, False);
2461 allowedxerror = -1; 2526 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2528
2468 if (image == NULL) 2533 if (image == NULL)
2469 { 2534 {
2470 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2471 { 2536 {
2472 pchanged = 1; 2537 pchanged = 1;
2473 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2474 { 2539 {
2475 XFreePixmap (disp, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2541 pixmap = None;
2477 } 2542 }
2478 } 2543 }
2479 2544
2480 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2481 } 2546 }
2482 else 2547 else
2483 { 2548 {
2484 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2486 2551
2487#if TINTING 2552#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2554 {
2490 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
2494 2559
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2561 }
2497#endif 2562#endif
2498 2563
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2569 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2570 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2508 2573
2509 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2575 pchanged = 1;
2511 2576
2512 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2513 } 2578 }
2514 } 2579 }
2515 2580
2516 if (am_pixmap_trans) 2581 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2583 else
2519 { 2584 {
2520 unsigned int n; 2585 unsigned int n;
2521 /* 2586 /*
2522 * InheritPixmap transparency 2587 * InheritPixmap transparency
2523 */ 2588 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2590 {
2526 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2529 XFree (list); 2594 XFree (list);
2530 2595
2531 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2532 { 2597 {
2533 if (oldp != None) 2598 if (oldp != None)
2534 pchanged = 1; 2599 pchanged = 1;
2535 2600
2536 break; 2601 break;
2537 } 2602 }
2538 2603
2539 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2540 pchanged = 1; 2605 pchanged = 1;
2541 } 2606 }
2542 2607
2543 n = 0; 2608 n = 0;
2544 2609
2545 if (pchanged) 2610 if (pchanged)
2546 { 2611 {
2547 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2548 { 2613 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2616 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2618 break;
2554 } 2619 }
2555 } 2620 }
2556 } 2621 }
2557 2622
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2624 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2627 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2564 } 2629 }
2565 else 2630 else
2566 { 2631 {
2569 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2635 sleep (1);
2571#endif 2636#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2573 { 2638 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2576 } 2641 }
2577 2642
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2644 am_transparent = 1;
2580 } 2645 }
2581 2646
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2648 parent[i] = None;
2584 } 2649 }
2585 2650
2586 if (scrollBar.win) 2651 if (scrollBar.win)
2587 { 2652 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2606bool 2671bool
2607rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2608{ 2673{
2609 bool flag = false; 2674 bool flag = false;
2610 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2612 2677
2613 for (;;) 2678 for (;;)
2614 { 2679 {
2615 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2616 { 2681 {
2640 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2707 bool refreshnow = false;
2643 int nlines = 0; 2708 int nlines = 0;
2644 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2645 2711
2646 for (;;) 2712 for (;;)
2647 { 2713 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2715 break;
2650 2716
2651 *str++ = ch; 2717 *str++ = ch;
2652 2718
2653 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2654 { 2720 {
2721 if (ch == C0_LF)
2655 nlines++; 2722 nlines++;
2723
2656 refresh_count++; 2724 refresh_count++;
2657 2725
2658 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2728 {
2661 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2662 ch = NOCHAR; 2731 ch = NOCHAR;
2663 break; 2732 break;
2664 } 2733 }
2665 2734
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2668 { 2737 {
2669 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2739 nlines = 0;
2671 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2672 } 2742 }
2673 }
2674 2743
2675 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2676 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2677 ch = NOCHAR; 2748 ch = NOCHAR;
2678 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2679 } 2755 }
2680 2756
2681 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2758 ch = next_char ();
2683 } 2759 }
2690 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2768 */
2693 if (refreshnow) 2769 if (refreshnow)
2694 { 2770 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2772 refresh_limit++;
2697 else 2773 else
2698 { 2774 {
2699 flag = true; 2775 flag = true;
2700 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2701 } 2778 }
2702 } 2779 }
2703 2780
2704 } 2781 }
2705 else 2782 else
2736rxvt_term::next_char () 2813rxvt_term::next_char ()
2737{ 2814{
2738 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2739 { 2816 {
2740 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2741 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2742 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2743 2820
2744 wchar_t wc; 2821 wchar_t wc;
2745 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2746 2823
2747 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2748 { 2825 {
2749 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2750 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
2889 case C0_ESC: 2966 case C0_ESC:
2890 process_escape_seq (); 2967 process_escape_seq ();
2891 break; 2968 break;
2892 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2893 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2896 else 2972 else
2897 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2898 (unsigned int)strlen (VT100_ANS));
2899 break; 2974 break;
2900 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2901 scr_bell (); 2976 scr_bell ();
2902 break; 2977 break;
2903 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
3091 process_dcs_seq (); 3166 process_dcs_seq ();
3092 break; 3167 break;
3093 3168
3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3095 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
3096 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3098 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
3099 3173
3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3101 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
3102 process_csi_seq (); 3176 process_csi_seq ();
3342 3416
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3422 break;
3349 3423
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3352 (unsigned int) (sizeof (VT100_ANS) - 1));
3353 break; 3426 break;
3354 3427
3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3356 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3357 break; 3430 break;
3364 break; 3437 break;
3365 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3366 scr_report_position (); 3439 scr_report_position ();
3367 break; 3440 break;
3368 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3444 break;
3372 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3447 break;
3477 { 3550 {
3478 /* 3551 /*
3479 * commands 3552 * commands
3480 */ 3553 */
3481 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3483 break; 3556 break;
3484 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3559 break;
3487 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3562 break;
3490 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3565 break;
3493 case 5: /* raise window */ 3566 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3495 break; 3568 break;
3496 case 6: /* lower window */ 3569 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3498 break; 3571 break;
3499 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3500 scr_touch (true); 3573 scr_touch (true);
3501 break; 3574 break;
3502 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3505 break; 3578 break;
3506 3579
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3581 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3512 break; 3585 break;
3513 3586
3514 3587
3515 /* 3588 /*
3516 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3517 */ 3590 */
3518 case 11: /* report window state */ 3591 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3594 break;
3522 case 13: /* report window position */ 3595 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3601 break;
3529 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3605 break;
3533 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3608 break;
3536 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3611 break;
3539 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3540 { 3613 {
3541 char *s; 3614 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3617 XFree (s);
3545 } 3618 }
3546 break; 3619 break;
3547 case 21: /* report window title */ 3620 case 21: /* report window title */
3548 { 3621 {
3549 char *s; 3622 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3625 XFree (s);
3553 } 3626 }
3554 break; 3627 break;
3555 } 3628 }
3556} 3629}
3559/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3560/* 3633/*
3561 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3562 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3563 */ 3636 */
3564unsigned char * 3637char *
3565rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3566{ 3639{
3567 unicode_t ch; 3640 unicode_t ch;
3568 bool seen_esc = false; 3641 bool seen_esc = false;
3569 unsigned int n = 0; 3642 unsigned int n = 0;
3588 else if (ch < 0x20) 3661 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3590 3663
3591 seen_esc = false; 3664 seen_esc = false;
3592 3665
3593 if (n >= sizeof (string) - 1) 3666 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3667 // stop at some sane length
3595 return NULL; 3668 return NULL;
3596 3669
3597 if (ch == C0_SYN) 3670 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3671 string[n++] = cmd_get8 ();
3602 3675
3603 string[n++] = '\0'; 3676 string[n++] = '\0';
3604 3677
3605 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3606 3679
3607 return (unsigned char *)rxvt_wcstombs (string); 3680 return rxvt_wcstombs (string);
3608} 3681}
3609 3682
3610/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3611/* 3684/*
3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3613 */ 3686 */
3614void 3687void
3615rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3616{ 3689{
3617 unsigned char *s; 3690 char *s;
3618 unicode_t eh; 3691 unicode_t eh;
3619 3692
3620 /* 3693 /*
3621 * Not handled yet 3694 * Not handled yet
3622 */ 3695 */
3641 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3642 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3643 3716
3644 if (ch == ';') 3717 if (ch == ';')
3645 { 3718 {
3646 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3647 3720
3648 if (s) 3721 if (s)
3649 { 3722 {
3650 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3651 free (s); 3724 free (s);
3652 } 3725 }
3653 } 3726 }
3654} 3727}
3655 3728
3656void 3729void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3658{ 3731{
3659 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3660 { 3733 {
3661 unsigned short r, g, b; 3734 unsigned short r, g, b;
3662 pix_colors_focused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
3668 3741
3669/* 3742/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 */ 3744 */
3672void 3745void
3673rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3674{ 3747{
3675 int changed = 0; 3748 int changed = 0;
3676 int color; 3749 int color;
3677 char *buf, *name; 3750 char *buf, *name;
3678 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3701 unsigned long bytes_after; 3774 unsigned long bytes_after;
3702 unsigned char *value = 0; 3775 unsigned char *value = 0;
3703 const char *str = ""; 3776 const char *str = "";
3704 3777
3705 if (prop 3778 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None 3783 && actual_type != None
3711 && actual_format == 8) 3784 && actual_format == 8)
3723 { 3796 {
3724 *eq = 0; 3797 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3726 } 3799 }
3727 else 3800 else
3728 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3729 display->atom (str)); 3802 display->atom (str));
3730 } 3803 }
3731 break; 3804 break;
3732 3805
3733 case XTerm_Color: 3806 case XTerm_Color:
3832 // TODO, when secure mode? 3905 // TODO, when secure mode?
3833 break; 3906 break;
3834 3907
3835#ifdef MENUBAR 3908#ifdef MENUBAR
3836 case URxvt_Menu: 3909 case URxvt_Menu:
3837 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3839 break; 3912 break;
3840#endif 3913#endif
3841#if 0 3914#if 0
3842 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
3858 case URxvt_italicFont: 3931 case URxvt_italicFont:
3859 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3860#endif 3933#endif
3861 if (query) 3934 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3865 resp); 3938 resp);
3866 else 3939 else
3867 { 3940 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869 3942
3874 break; 3947 break;
3875 3948
3876#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3877 case URxvt_locale: 3950 case URxvt_locale:
3878 if (query) 3951 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3880 else 3953 else
3881 { 3954 {
3882 set_locale (str); 3955 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale (); 3957 init_xlocale ();
3885 } 3958 }
3886 break; 3959 break;
3887 3960
3888 case URxvt_view_up: 3961 case URxvt_view_up:
3889 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3890 int lines = atoi (str); 3964 int lines = atoi (str);
3891 3965
3892 if (lines) 3966 if (lines)
3893 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894 else 3968 else
3895 {
3896 scr_erase_savelines (); 3969 scr_erase_savelines ();
3897 } 3970 }
3898 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3978 ; // no responses yet
3899 break; 3979 break;
3900#endif 3980#endif
3901 } 3981 }
3902} 3982}
3903/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
4012 } 4092 }
4013 4093
4014 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
4015 switch (arg[i]) 4095 switch (arg[i])
4016 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 if (mode)
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103
4104 scr_touch (true);
4105 break;
4106#endif
4017 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4018 case 1049: 4108 case 1049:
4019 if (options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
4020 if (mode == 0) 4110 if (mode == 0)
4021 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
4022 else if (mode == 1) 4112 else if (mode == 1)
4023 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
4024 break; 4114 break;
4036 */ 4126 */
4037 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
4038 break; 4128 break;
4039 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4040 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4042 break; 4132 break;
4043 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4044 if (state) 4134 if (!state)
4045 options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
4046 else 4136 else
4047 options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
4048 break; 4138 break;
4049 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4050 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4051 break; 4141 break;
4052 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
4093#if 0 4183#if 0
4094 case 1001: 4184 case 1001:
4095 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
4096#endif 4186#endif
4097 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
4098 if (state) 4188 if (!state)
4099 options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
4100 else 4190 else
4101 options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
4102 break; 4192 break;
4103 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
4104 if (state) 4194 if (state)
4105 options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
4106 else 4196 else
4107 options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
4108 break; 4198 break;
4109 case 1047: /* secondary screen w/ clearing last */ 4199 case 1047: /* secondary screen w/ clearing last */
4110 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4111 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4112 scr_erase_screen (2); 4202 scr_erase_screen (2);
4113 scr_change_screen (state); 4203 scr_change_screen (state);
4114 break; 4204 break;
4115 case 1049: /* secondary screen w/ clearing first */ 4205 case 1049: /* secondary screen w/ clearing first */
4116 scr_change_screen (state); 4206 scr_change_screen (state);
4117 if (options & Opt_secondaryScreen) 4207 if (OPTION (Opt_secondaryScreen))
4118 if (current_screen != PRIMARY) 4208 if (current_screen != PRIMARY)
4119 scr_erase_screen (2); 4209 scr_erase_screen (2);
4120 break; 4210 break;
4121 default: 4211 default:
4122 break; 4212 break;
4250 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
4251 break; 4341 break;
4252 4342
4253 //case 50: // not variable spacing 4343 //case 50: // not variable spacing
4254 4344
4255#ifndef NO_BRIGHTCOLOR 4345#if ENABLE_FRILLS
4256 case 90: 4346 case 90:
4257 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
4258 case 92: 4348 case 92:
4259 case 93: 4349 case 93:
4260 case 94: 4350 case 94:
4272 case 106: 4362 case 106:
4273 case 107: 4363 case 107:
4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4275 break; 4365 break;
4276#endif 4366#endif
4277
4278 } 4367 }
4279 } 4368 }
4280} 4369}
4281/*}}} */ 4370/*}}} */
4282 4371
4306 */ 4395 */
4307void 4396void
4308rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4309{ 4398{
4310 va_list arg_ptr; 4399 va_list arg_ptr;
4311 unsigned char buf[256]; 4400 char buf[256];
4312 4401
4313 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4314 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4315 va_end (arg_ptr); 4404 va_end (arg_ptr);
4316 tt_write (buf, strlen (buf)); 4405 tt_write (buf, strlen (buf));
4321 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4322 */ 4411 */
4323const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4324 4413
4325void 4414void
4326rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4327{ 4416{
4328 if (v_buflen == 0) 4417 if (v_buflen == 0)
4329 { 4418 {
4330 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4331 4420
4334 4423
4335 data += written; 4424 data += written;
4336 len -= written; 4425 len -= written;
4337 } 4426 }
4338 4427
4339 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4340 4429
4341 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4342 v_buflen += len; 4431 v_buflen += len;
4343 4432
4344 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);
4363 } 4452 }
4364 4453
4365 memmove (v_buffer, v_buffer + written, v_buflen); 4454 memmove (v_buffer, v_buffer + written, v_buflen);
4366 } 4455 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this... 4457 pty_ev.set (EVENT_READ);
4369 destroy ();
4370} 4458}
4371 4459
4372/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
4373 4461

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines