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.416 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.491 by sf-exg, Fri Aug 19 17:42:09 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
282} 285}
283 286
284static int 287static int
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
416 */ 419 */
417 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
420 423
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#ifdef USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
… …
505#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 504#else
508 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
509#endif 506#endif
507 max_it (lnsppg, 1);
508
510 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
511 { 510 {
512 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
513 return; 512 return;
514 } 513 }
… …
567 selection_request (ev.time); 566 selection_request (ev.time);
568 return; 567 return;
569#if TODO 568#if TODO
570 /* rxvt extras */ 569 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 571 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 573 return;
577#endif 574#endif
578 } 575 }
579 } 576 }
580 } 577 }
581 578
582#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 580 // ISO 14755 support
584 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 582 {
586 int hv; 583 int hv;
587 584
588 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 616 scr_overlay_off ();
620# endif 617# endif
621 iso14755buf = 0; 618 iso14755buf = 0;
622 } 619 }
623 } 620 }
621 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
627 { 625 {
628 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 627# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 643 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 645 unsigned int newlen = 1;
648 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
649 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
650 { 653 {
651#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 655 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
654 { 657 {
… …
881 commit_iso14755 (); 884 commit_iso14755 ();
882 885
883 return; 886 return;
884 } 887 }
885 888
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 890 if (i[0] == keysym)
888 { 891 {
889 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 893 commit_iso14755 ();
891 894
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
930#endif 933#endif
931} 934}
932 935
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 936void
967rxvt_term::flush () 937rxvt_term::flush ()
968{ 938{
969 flush_ev.stop (); 939 flush_ev.stop ();
970 940
971#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
973 { 943 {
974// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 945 scr_touch (false);
976 } 946 }
977#endif 947#endif
978 948
979 if (want_refresh) 949 if (want_refresh)
… …
1017 } 987 }
1018 988
1019 scr_refresh (); 989 scr_refresh ();
1020 scrollBar.show (1); 990 scrollBar.show (1);
1021#ifdef USE_XIM 991#ifdef USE_XIM
1022 IMSendSpot (); 992 im_send_spot ();
1023#endif 993#endif
1024 } 994 }
1025 995
1026 display->flush (); 996 display->flush ();
1027} 997}
1028 998
1029/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1030void 1000void
1031rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1032{ 1002{
1033 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1097 {
1128 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1132 1105
1133 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1135 1108
1136 w.stop (); 1109 w.stop ();
1137 } 1110 }
1138 1111
… …
1141 { 1114 {
1142 } 1115 }
1143} event_handler; 1116} event_handler;
1144#endif 1117#endif
1145 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1146bool 1152bool
1147rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1148{ 1154{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1150 1156
1151 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1158
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1154 n = 0;
1155 } 1160 {
1156 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1160 1166
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1168
1163 if (r > 0) 1169 if (r > 0)
1164 { 1170 {
1165 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1166 return true; 1172 return true;
… …
1188{ 1194{
1189 make_current (); 1195 make_current ();
1190 1196
1191 if (revents & ev::READ) 1197 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1200 cmd_parse ();
1195 break;
1196 1201
1197 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1198 pty_write (); 1203 pty_write ();
1199 1204
1200 refresh_check (); 1205 refresh_check ();
… …
1241{ 1246{
1242 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1243 int x, y; 1248 int x, y;
1244 int code = 32; 1249 int code = 32;
1245 1250
1246 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1248 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1249 { 1255 {
1250 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1251 return; 1257 return;
1258
1252 mouse_row = x; 1259 mouse_row = x;
1253 mouse_col = y; 1260 mouse_col = y;
1254 code += 32; 1261 code += 32;
1255 } 1262 }
1256 1263
… …
1259 else 1266 else
1260 { 1267 {
1261 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1270 if (button_number >= 3)
1264 button_number += (64 - 3); 1271 button_number += 64 - 3;
1265 } 1272 }
1266 1273
1267 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1268 { 1275 {
1269 /* 1276 /*
… …
1301 fputc ('A', stderr); 1308 fputc ('A', stderr);
1302 if (key_state & 32) 1309 if (key_state & 32)
1303 fputc ('2', stderr); 1310 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1312 button_number,
1306 x + 1, 1313 x,
1307 y + 1); 1314 y);
1308#endif 1315#endif
1309 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1310 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1331 code + button_number + key_state,
1312 (32 + x + 1), 1332 32 + x,
1313 (32 + y + 1)); 1333 32 + y);
1314} 1334}
1315 1335
1316/*{{{ process an X event */ 1336/*{{{ process an X event */
1317void 1337void
1318rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1420 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1441 focus_out ();
1422 break; 1442 break;
1423 1443
1424 case ConfigureNotify: 1444 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1429 { 1446 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1432 1468
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1470 {
1435 seen_resize = 1; 1471 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1473 }
1438 else 1474 else
1439 { 1475 {
1440#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1442 { 1478 {
1443 if (mapped) 1479 if (mapped)
1444 update_background (); 1480 update_background ();
1445 else 1481 else
1446 bgPixmap.invalidate (); 1482 bg_invalidate ();
1447 } 1483 }
1448#endif 1484#endif
1449 } 1485 }
1450 1486
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1488 }
1453 break; 1489 break;
1454 1490
1455 case PropertyNotify: 1491 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1493 break;
1462 1494
1463 case SelectionClear: 1495 case SelectionClear:
1464 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1497 break;
1471 1498
1472 case SelectionRequest: 1499 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1474 break; 1501 break;
1475 1502
1476 case MapNotify: 1503 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1505 /* This is needed specifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1509 * reparenting.
1483 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1489 */ 1516 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1492#endif 1519#endif
1493 mapped = 1; 1520 mapped = 1;
1494#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1511 { 1538 {
1512 do 1539 do
1513 { 1540 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1543 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1545
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1547
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1549 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1552 }
1526 1553
1527 want_refresh = 1; 1554 want_refresh = 1;
1528 } 1555 }
1529 else 1556 else
… …
1682#endif 1709#endif
1683 1710
1684 refresh_check (); 1711 refresh_check ();
1685} 1712}
1686 1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1729
1687void 1730void
1688rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1689{ 1732{
1690 if (!focus) 1733 if (!focus)
1691 { 1734 {
1692 focus = 1; 1735 focus = 1;
1693 want_refresh = 1; 1736 want_refresh = 1;
1694 1737
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1738#if USE_XIM
1698 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1699 { 1740 {
1700 IMSetPosition (); 1741 im_set_position ();
1701 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1702 } 1743 }
1703#endif 1744#endif
1704#if CURSOR_BLINK 1745#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1753 scr_recolour ();
1713 } 1754 }
1714#endif 1755#endif
1715#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1717 { 1758 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1762 }
1726} 1763}
1727 1764
1728void 1765void
1729rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1731 if (focus) 1768 if (focus)
1732 { 1769 {
1733 focus = 0; 1770 focus = 0;
1734 want_refresh = 1; 1771 want_refresh = 1;
1735 1772
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1737 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1738#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1778 if (iso14755buf)
1740 { 1779 {
1741 iso14755buf = 0; 1780 iso14755buf = 0;
1742# if ISO_14755 1781# if ISO_14755
… …
1759 { 1798 {
1760 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1800 scr_recolour ();
1762 } 1801 }
1763#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1805 }
1765} 1806}
1766 1807
1767void 1808void
1768rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1796 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1797 */ 1838 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1841 {
1801 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1802 update_background (); 1843 update_background ();
1803 } 1844 }
1804 1845
1805 break; 1846 break;
1806 } 1847 }
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1849 { 1890 {
1850 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1851 MEvent.clicks++; 1892 MEvent.clicks++;
1852 1893
1853 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1854 { 1895 {
1855 /* only report double clicks */ 1896 /* only report double clicks */
… …
2126 selection_make (ev.time); 2167 selection_make (ev.time);
2127 break; 2168 break;
2128 2169
2129 case Button2: 2170 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2173 break;
2133 2174
2134#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2135 case Button4: 2176 case Button4:
2136 case Button5: 2177 case Button5:
… …
2170 } 2211 }
2171} 2212}
2172 2213
2173/*}}} */ 2214/*}}} */
2174 2215
2175bool 2216void
2176rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2177{ 2218{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2181 2221
2182 for (;;) 2222 for (;;)
2183 { 2223 {
2184 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2185 { 2225 {
2186 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2227 ch = next_char ();
2188 2228
2189 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2190 break; 2230 break;
2191 } 2231 }
2192 2232
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2234 {
2195 if (!seen_input) 2235 if (ecb_unlikely (!seen_input))
2196 { 2236 {
2197 seen_input = 1; 2237 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2253 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2255
2216 for (;;) 2256 for (;;)
2217 { 2257 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2259 break;
2220 2260
2221 *str++ = ch; 2261 *str++ = ch;
2222 2262
2223 if (ch == C0_LF || str >= eol) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2264 {
2225 if (ch == C0_LF) 2265 if (ch == C0_LF)
2226 nlines++; 2266 nlines++;
2227 2267
2228 refresh_count++; 2268 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2279 */ 2319 */
2280 if (refreshnow) 2320 if (refreshnow)
2281 { 2321 {
2282 flag = true;
2283 scr_refresh (); 2322 scr_refresh ();
2284 want_refresh = 1; 2323 want_refresh = 1;
2285 } 2324 }
2286
2287 } 2325 }
2288 else 2326 else
2289 { 2327 {
2290 try 2328 try
2291 { 2329 {
… …
2299 } 2337 }
2300 2338
2301 ch = NOCHAR; 2339 ch = NOCHAR;
2302 } 2340 }
2303 } 2341 }
2304
2305 return flag;
2306} 2342}
2307 2343
2308// read the next character 2344// read the next character
2309wchar_t 2345wchar_t
2310rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2311{ 2347{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2349 {
2314 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2317 2353
2318 wchar_t wc; 2354 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2356
… …
2325 break; 2361 break;
2326 } 2362 }
2327 2363
2328 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2329 { 2365 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2366 mbstate.reset (); // reset now undefined conversion state
2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 } 2368 }
2333 2369
2334 // assume wchar == unicode 2370 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
… …
2348 : NOCHAR; 2384 : NOCHAR;
2349} 2385}
2350 2386
2351static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2352 2388
2353/* rxvt_cmd_getc () - Return next input character */
2354/*
2355 * Return the next input character after first passing any keyboard input
2356 * to the command.
2357 */
2358wchar_t 2389wchar_t
2359rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2360{ 2391{
2361 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2362 2393
… …
2455 pclose_printer (fd); 2486 pclose_printer (fd);
2456} 2487}
2457#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2458/*}}} */ 2489/*}}} */
2459 2490
2460/* *INDENT-OFF* */
2461enum { 2491enum {
2462 C1_40 = 0x40, 2492 C1_40 = 0x40,
2463 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2464 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2465 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2466 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2467}; 2497};
2468/* *INDENT-ON* */
2469 2498
2470/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2471void 2500void
2472rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2473{ 2502{
… …
2595 return; 2624 return;
2596 } 2625 }
2597 2626
2598 switch (ch) 2627 switch (ch)
2599 { 2628 {
2600 /* case 1: do_tek_mode (); break; */
2601 case '#': 2629 case '#':
2602 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2603 scr_E (); 2631 scr_E ();
2604 break; 2632 break;
2605 case '(': 2633 case '(':
… …
2628#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2629 case '9': 2657 case '9':
2630 scr_forwardindex (); 2658 scr_forwardindex ();
2631 break; 2659 break;
2632#endif 2660#endif
2661 // DECPAM/DECPNM
2633 case '=': 2662 case '=':
2634 case '>': 2663 case '>':
2635 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2636 break; 2665 break;
2637 2666
… …
2644 2673
2645 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2646 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2647 { 2676 {
2648 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2649 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2650 } 2679 }
2651 break; 2680 break;
2652 2681
2653 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2654 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2655 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2656 break; 2687 break;
2657 2688
2658 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2659 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2660 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2664 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2665 scr_index (DN); 2696 scr_index (DN);
2666 break; 2697 break;
2667 2698
2668 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2669 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2670 2701
2671 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2672 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2673 2704
2674 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2675 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2676 process_dcs_seq (); 2707 process_dcs_seq ();
2677 break; 2708 break;
… …
2679 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2710 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680 case C1_SCI: /* ESC Z */ 2711 case C1_SCI: /* ESC Z */
2681 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2712 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682 break; /* steal obsolete ESC [ c */ 2713 break; /* steal obsolete ESC [ c */
2683 2714
2684 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2715 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685 case C1_CSI: /* ESC [ */ 2716 case C1_CSI: /* ESC [ */
2686 process_csi_seq (); 2717 process_csi_seq ();
2687 break; 2718 break;
2688 2719
2689 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2720 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690 case C1_OSC: /* ESC ] */ 2721 case C1_OSC: /* ESC ] */
2691 process_osc_seq (); 2722 process_osc_seq ();
2692 break; 2723 break;
2693 2724
2694 /* 8.3.106: RESET TO INITIAL STATE */ 2725 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695 case 'c': 2726 case 'c':
2696 mbstate.reset (); 2727 mbstate.reset ();
2697 scr_poweron (); 2728 scr_poweron ();
2698 scrollBar.show (1); 2729 scrollBar.show (1);
2699 break; 2730 break;
… …
2710 } 2741 }
2711} 2742}
2712/*}}} */ 2743/*}}} */
2713 2744
2714/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2715/* *INDENT-OFF* */
2716enum { 2746enum {
2717 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2718 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2719 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2720 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2723 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2724 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2725 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2726}; 2756};
2727 2757
2728#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2729 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2730 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2731#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
2732 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2733 2763
2734const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
2735 { 2765 {
2736 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2737 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2738 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2739 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2740 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2741 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2742 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2743 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2744 }; 2774 };
2745/* *INDENT-ON* */
2746 2775
2747void 2776void
2748rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2749{ 2778{
2750 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2754 2783
2755 nargs = 0; 2784 nargs = 0;
2756 2785
2757 priv = 0; 2786 priv = 0;
2758 ch = cmd_getc (); 2787 ch = cmd_getc ();
2759 if (ch >= '<' && ch <= '?') 2788 if ((ch >= '<' && ch <= '?') || ch == '!')
2760 { 2789 {
2761 /* '<' '=' '>' '?' */ 2790 /* '<' '=' '>' '?' '!' */
2762 priv = ch; 2791 priv = ch;
2763 ch = cmd_getc (); 2792 ch = cmd_getc ();
2764 } 2793 }
2765 2794
2766 /* read any numerical arguments */ 2795 /* read any numerical arguments */
… …
2820 2849
2821 case '?': 2850 case '?':
2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2851 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2823 process_terminal_mode (ch, priv, nargs, arg); 2852 process_terminal_mode (ch, priv, nargs, arg);
2824 break; 2853 break;
2854
2855 case '!':
2856 if (ch == CSI_70)
2857 {
2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2859 scr_soft_reset ();
2860
2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863
2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2825 } 2866 }
2867 break;
2868 }
2869
2826 return; 2870 return;
2827 } 2871 }
2828 2872
2829 switch (ch) 2873 switch (ch)
2830 { 2874 {
… …
3045 } 3089 }
3046} 3090}
3047/*}}} */ 3091/*}}} */
3048 3092
3049#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3050/* ARGSUSED */
3051void 3094void
3052rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3053{ 3096{
3054 int x, y; 3097 int x, y;
3055 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3064 { 3107 {
3065 /* 3108 /*
3066 * commands 3109 * commands
3067 */ 3110 */
3068 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3069 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3070 break; 3113 break;
3071 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3072 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3073 break; 3116 break;
3074 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3075 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3076 break; 3119 break;
3077 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3079 break; 3122 break;
3080 case 5: /* raise window */ 3123 case 5: /* raise window */
3081 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3082 break; 3125 break;
3083 case 6: /* lower window */ 3126 case 6: /* lower window */
3084 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3085 break; 3128 break;
3086 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3087 scr_touch (true); 3130 scr_touch (true);
3088 break; 3131 break;
3089 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3100 3143
3101 /* 3144 /*
3102 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3103 */ 3146 */
3104 case 11: /* report window state */ 3147 case 11: /* report window state */
3105 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3107 break; 3150 break;
3108 case 13: /* report window position */ 3151 case 13: /* report window position */
3109 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3110 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3111 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3112 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3113 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3114 break; 3157 break;
3115 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3116 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3118 break; 3161 break;
3119 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3120 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3121 break; 3164 break;
… …
3123 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3124 break; 3167 break;
3125 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3126 { 3169 {
3127 char *s; 3170 char *s;
3128 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3130 XFree (s); 3173 XFree (s);
3131 } 3174 }
3132 break; 3175 break;
3133 case 21: /* report window title */ 3176 case 21: /* report window title */
3134 { 3177 {
3135 char *s; 3178 char *s;
3136 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3181 XFree (s);
3139 } 3182 }
3140 break; 3183 break;
3141 } 3184 }
… …
3197 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3198 */ 3241 */
3199void 3242void
3200rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3201{ 3244{
3202 char *s;
3203 unicode_t eh;
3204
3205 /* 3245 /*
3206 * Not handled yet 3246 * Not handled yet
3207 */ 3247 */
3248
3249 unicode_t eh;
3208 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3209 if (s) 3251 if (s)
3210 free (s); 3252 free (s);
3211 3253
3212 return; 3254 return;
3213} 3255}
… …
3217 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3218 */ 3260 */
3219void 3261void
3220rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3221{ 3263{
3222 unicode_t ch, eh;
3223 int arg; 3264 int arg;
3224 3265
3225 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3226 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3228 3269
3229 if (ch == ';') 3270 if (ch == ';')
3230 { 3271 {
3272 unicode_t eh;
3231 char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3232 3274
3233 if (s) 3275 if (s)
3234 { 3276 {
3235 process_xterm_seq (arg, s, eh); 3277 process_xterm_seq (arg, s, eh);
… …
3259 3301
3260/* 3302/*
3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3303 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3262 */ 3304 */
3263void 3305void
3264rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3306rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265{ 3307{
3266 int color; 3308 int color;
3267 char *buf, *name; 3309 char *buf, *name;
3268 bool query = str[0] == '?' && !str[1]; 3310 bool query = str[0] == '?' && !str[1];
3269 int saveop = op; 3311 int saveop = op;
… …
3296 unsigned long bytes_after; 3338 unsigned long bytes_after;
3297 unsigned char *value = 0; 3339 unsigned char *value = 0;
3298 const char *str = ""; 3340 const char *str = "";
3299 3341
3300 if (prop 3342 if (prop
3301 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3302 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3303 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3304 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3305 && actual_type != None 3347 && actual_type != None
3306 && actual_format == 8) 3348 && actual_format == 8)
… …
3310 3352
3311 XFree (value); 3353 XFree (value);
3312 } 3354 }
3313 else 3355 else
3314 { 3356 {
3315 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3357 char *eq = strchr (str, '=');
3316 3358
3317 if (eq) 3359 if (eq)
3318 { 3360 {
3319 *eq = 0; 3361 *eq = 0;
3320 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3321 } 3363 }
3322 else 3364 else
3323 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3324 display->atom (str)); 3366 display->atom (str));
3325 } 3367 }
3326 break; 3368 break;
3327 3369
3328 case XTerm_Color: 3370 case XTerm_Color:
… …
3360 process_color_seq (op, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3361 break; 3403 break;
3362 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3363 process_color_seq (op, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3364 break; 3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3365#ifndef NO_BOLD_UNDERLINE_REVERSE 3415#ifndef NO_BOLD_UNDERLINE_REVERSE
3366 case XTerm_Color_RV:
3367 process_color_seq (op, Color_RV, str, resp);
3368 break;
3369 case Rxvt_Color_BD:
3370 case URxvt_Color_BD: 3416 case URxvt_Color_BD:
3371 process_color_seq (op, Color_BD, str, resp); 3417 process_color_seq (op, Color_BD, str, resp);
3372 break; 3418 break;
3373 case Rxvt_Color_UL:
3374 case URxvt_Color_UL: 3419 case URxvt_Color_UL:
3375 process_color_seq (op, Color_UL, str, resp); 3420 process_color_seq (op, Color_UL, str, resp);
3376 break; 3421 break;
3377 case URxvt_Color_IT: 3422 case URxvt_Color_IT:
3378 process_color_seq (op, Color_IT, str, resp); 3423 process_color_seq (op, Color_IT, str, resp);
3379 break; 3424 break;
3380#endif 3425#endif
3426 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp);
3428 break;
3381#if ENABLE_TRANSPARENCY 3429#if ENABLE_TRANSPARENCY
3382 case URxvt_Color_tint: 3430 case URxvt_Color_tint:
3383 process_color_seq (op, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3384 { 3432 {
3385 bool changed = false; 3433 bool changed = false;
3386 3434
3387 if (ISSET_PIXCOLOR (Color_tint)) 3435 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391 3437
3392 if (changed) 3438 if (changed)
3393 update_background (); 3439 update_background ();
3394 } 3440 }
3395 3441
… …
3400 case Rxvt_Pixmap: 3446 case Rxvt_Pixmap:
3401 if (!strcmp (str, "?")) 3447 if (!strcmp (str, "?"))
3402 { 3448 {
3403 char str[256]; 3449 char str[256];
3404 3450
3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3451 sprintf (str, "[%dx%d+%d+%d]",
3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3452 min (h_scale, 32767), min (v_scale, 32767),
3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3453 min (h_align, 32767), min (v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST); 3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3409 } 3455 }
3410 else 3456 else
3411 { 3457 {
3412 int changed = 0; 3458 int changed = 0;
3413 3459
3414 if (*str != ';') 3460 if (*str != ';')
3415 { 3461 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3463 {
3419 changed++; 3464 changed++;
3420 str = strchr (str, ';'); 3465 }
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 } 3466 }
3424 3467 else
3425 while (str)
3426 { 3468 {
3427 str++; 3469 str++;
3428 if (bgPixmap.set_geometry (str)) 3470 if (bg_set_geometry (str, true))
3429 changed++; 3471 changed++;
3430 str = strchr (str, ';');
3431 } 3472 }
3432 3473
3433 if (changed) 3474 if (changed)
3475 {
3476 if (bg_window_position_sensitive ())
3477 {
3478 int x, y;
3479 get_window_origin (x, y);
3480 bg_set_position (x, y);
3481 }
3434 update_background (); 3482 update_background ();
3483 }
3435 } 3484 }
3436 break; 3485 break;
3437#endif 3486#endif
3438 3487
3439 case XTerm_logfile: 3488 case XTerm_logfile:
… …
3509 break; 3558 break;
3510#endif 3559#endif
3511 3560
3512#if ENABLE_PERL 3561#if ENABLE_PERL
3513 case URxvt_perl: 3562 case URxvt_perl:
3514 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3563 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3515 ; // no responses yet
3516 break; 3564 break;
3517#endif 3565#endif
3518 } 3566 }
3519} 3567}
3520/*----------------------------------------------------------------------*/ 3568/*----------------------------------------------------------------------*/
… …
3543 { 3591 {
3544 if (mode == 'r') 3592 if (mode == 'r')
3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3546 else 3594 else
3547 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3595 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596
3548 set_privmode (bit, state); 3597 set_privmode (bit, state);
3549 } 3598 }
3550 3599
3551 return state; 3600 return state;
3552} 3601}
3553 3602
3554/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3555void 3604void
3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3557{ 3606{
3558 unsigned int i, j; 3607 unsigned int i, j;
3559 int state; 3608 int state;
3560 3609
3561 static const struct 3610 static const struct
3562 { 3611 {
3563 const int argval; 3612 const int argval;
3564 const unsigned long bit; 3613 const unsigned long bit;
3565 } argtopriv[] = { 3614 } argtopriv[] = {
3566 { 1, PrivMode_aplCUR }, 3615 { 1, PrivMode_aplCUR }, // DECCKM
3567 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3568 { 3, PrivMode_132 }, 3617 { 3, PrivMode_132 }, // DECCOLM
3569 { 4, PrivMode_smoothScroll }, 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3570 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo }, // DECSCNM
3571 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin }, // DECOM
3572 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap }, // DECAWM
3573 // 8, bi-directional support mode 3622 // 8, auto-repeat keys // DECARM
3574 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3575 // 18, 19 printing-related 3624 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region
3576 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3577#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3578 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3579#endif 3629#endif
3580 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3631 // 38, tektronix mode // DECTEK
3581 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3582 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3583 // 45 margin bell NYI 3634 // 45 margin bell NYI
3584 // 46 start logging 3635 // 46 start logging
3585 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3586 { 66, PrivMode_aplKP }, 3637 { 66, PrivMode_aplKP }, // DECNKM
3587#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3588 { 67, PrivMode_BackSpace }, 3639 { 67, PrivMode_BackSpace }, // DECBKM
3589#endif 3640#endif
3590 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3591 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3592 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3594 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
3595 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3596 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3597 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3598 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3599 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste }, 3659 { 2004, PrivMode_BracketPaste },
3603 }; 3660 };
3604 3661
… …
3614 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3615 { 3672 {
3616 state = -1; 3673 state = -1;
3617 3674
3618 /* basic handling */ 3675 /* basic handling */
3619 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3620 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3621 { 3678 {
3622 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3623 break; 3680 break;
3624 } 3681 }
… …
3632 3689
3633 scr_touch (true); 3690 scr_touch (true);
3634 break; 3691 break;
3635#endif 3692#endif
3636 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
3637 case 1049:
3638 if (option (Opt_secondaryScreen)) 3694 if (option (Opt_secondaryScreen))
3639 if (mode == 0) 3695 if (mode == 0)
3640 scr_cursor (RESTORE); 3696 scr_cursor (RESTORE);
3641 else if (mode == 1) 3697 else if (mode == 1)
3642 scr_cursor (SAVE); 3698 scr_cursor (SAVE);
… …
3655 */ 3711 */
3656 set_privmode (PrivMode_vt52, 1); 3712 set_privmode (PrivMode_vt52, 1);
3657 break; 3713 break;
3658 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3659 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663 }
3664 break; 3717 break;
3665 case 4: /* smooth scrolling */ 3718 case 4: /* smooth scrolling */
3666 set_option (Opt_jumpScroll, !state); 3719 set_option (Opt_jumpScroll, !state);
3667 break; 3720 break;
3668 case 5: /* reverse video */ 3721 case 5: /* reverse video */
… …
3706 case 1003: 3759 case 1003:
3707 if (state) 3760 if (state)
3708 { 3761 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3762 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3763 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3764 mouse_row = mouse_col = 0;
3711 vt_emask_mouse = PointerMotionMask; 3765 vt_emask_mouse = PointerMotionMask;
3712 } 3766 }
3713 else 3767 else
3714 vt_emask_mouse = NoEventMask; 3768 vt_emask_mouse = NoEventMask;
3769
3715 vt_select_input (); 3770 vt_select_input ();
3716 break; 3771 break;
3717 case 1010: /* scroll to bottom on TTY output inhibit */ 3772 case 1010: /* scroll to bottom on TTY output inhibit */
3718 set_option (Opt_scrollTtyOutput, !state); 3773 set_option (Opt_scrollTtyOutput, !state);
3719 break; 3774 break;
3720 case 1011: /* scroll to bottom on key press */ 3775 case 1011: /* scroll to bottom on key press */
3721 set_option (Opt_scrollTtyKeypress, state); 3776 set_option (Opt_scrollTtyKeypress, state);
3722 break; 3777 break;
3723 case 1047: /* secondary screen w/ clearing last */ 3778 case 1047: /* secondary screen w/ clearing last */
3724 if (option (Opt_secondaryScreen)) 3779 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3780 if (!state)
3726 scr_erase_screen (2); 3781 scr_erase_screen (2);
3782
3727 scr_change_screen (state); 3783 scr_change_screen (state);
3728 break; 3784 break;
3729 case 1049: /* secondary screen w/ clearing first */ 3785 case 1049: /* secondary screen w/ clearing first */
3786 if (option (Opt_secondaryScreen))
3787 if (state)
3788 scr_cursor (SAVE);
3789
3730 scr_change_screen (state); 3790 scr_change_screen (state);
3791
3731 if (option (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3793 if (state)
3733 scr_erase_screen (2); 3794 scr_erase_screen (2);
3795 else
3796 scr_cursor (RESTORE);
3734 break; 3797 break;
3735 default: 3798 default:
3736 break; 3799 break;
3737 } 3800 }
3738 } 3801 }
… …
3891 } 3954 }
3892 } 3955 }
3893} 3956}
3894/*}}} */ 3957/*}}} */
3895 3958
3896/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3897void
3898rxvt_term::process_graphics ()
3899{
3900 unicode_t ch, cmd = cmd_getc ();
3901
3902 if (cmd == 'Q')
3903 {
3904 /* query graphics */
3905 tt_printf ("\033G0\012"); /* no graphics */
3906 return;
3907 }
3908 /* swallow other graphics sequences until terminating ':' */
3909 do
3910 ch = cmd_getc ();
3911 while (ch != ':');
3912}
3913/*}}} */
3914
3915/* ------------------------------------------------------------------------- */ 3959/* ------------------------------------------------------------------------- */
3916 3960
3917/* 3961/*
3918 * Send printf () formatted output to the command. 3962 * Send printf () formatted output to the command.
3919 * Only use for small amounts of data. 3963 * Only use for small amounts of data.
… …
3932 3976
3933/* ---------------------------------------------------------------------- */ 3977/* ---------------------------------------------------------------------- */
3934/* Write data to the pty as typed by the user, pasted with the mouse, 3978/* Write data to the pty as typed by the user, pasted with the mouse,
3935 * or generated by us in response to a query ESC sequence. 3979 * or generated by us in response to a query ESC sequence.
3936 */ 3980 */
3937const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3981static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3938 3982
3939void 3983void
3940rxvt_term::tt_write (const char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
3941{ 3985{
3942 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3947 3991
3948 if (v_buflen == 0) 3992 if (v_buflen == 0)
3949 { 3993 {
3950 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3951 3995
3996 max_it (written, 0);
3997
3952 if ((unsigned int)written == len) 3998 if (written == len)
3953 return; 3999 return;
3954 4000
3955 data += written; 4001 data += written;
3956 len -= written; 4002 len -= written;
3957 } 4003 }
3958 4004
3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4005 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3960 4006
3961 memcpy (v_buffer + v_buflen, data, len); 4007 memcpy (v_buffer + v_buflen, data, len);
3962 v_buflen += len; 4008 v_buflen += len;
3963 4009
3964 pty_ev.set (ev::READ | ev::WRITE); 4010 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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