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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 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 ())
1442 {
1443 if (mapped) 1477 if (moved)
1444 update_background (); 1478 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1479#endif
1449 } 1480 }
1450 1481
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1483 }
1453 break; 1484 break;
1454 1485
1455 case PropertyNotify: 1486 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 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; 1488 break;
1462 1489
1463 case SelectionClear: 1490 case SelectionClear:
1464 selection_clear (); 1491 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; 1492 break;
1471 1493
1472 case SelectionRequest: 1494 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1474 break; 1496 break;
1475 1497
1476 case MapNotify: 1498 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1500 /* 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 1501 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1504 * reparenting.
1483 * We should not render background immidiately, as there could be several 1505 * 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 1506 * 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 1507 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1489 */ 1511 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1492#endif 1514#endif
1493 mapped = 1; 1515 mapped = 1;
1494#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1511 { 1533 {
1512 do 1534 do
1513 { 1535 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1538 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1540
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1542
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1544 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1547 }
1526 1548
1527 want_refresh = 1; 1549 want_refresh = 1;
1528 } 1550 }
1529 else 1551 else
… …
1644 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1670 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1672 scrollBar.size ());
1651 want_refresh = 1; 1673 want_refresh = 1;
1652 scrollBar.show (1); 1674 scrollBar.show (1);
1653 } 1675 }
1654 break; 1676 break;
… …
1682#endif 1704#endif
1683 1705
1684 refresh_check (); 1706 refresh_check ();
1685} 1707}
1686 1708
1709#if ENABLE_FRILLS
1687void 1710void
1688rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1689{ 1712{
1690 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1691 return; 1714 return;
1692 1715
1693 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1694 { 1717 {
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1697 urgency_hint = enable; 1720 urgency_hint = enable;
1698 } 1721 }
1699} 1722}
1723#endif
1700 1724
1701void 1725void
1702rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1703{ 1727{
1704 if (!focus) 1728 if (!focus)
… …
1707 want_refresh = 1; 1731 want_refresh = 1;
1708 1732
1709#if USE_XIM 1733#if USE_XIM
1710 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1711 { 1735 {
1712 IMSetPosition (); 1736 im_set_position ();
1713 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1714 } 1738 }
1715#endif 1739#endif
1716#if CURSOR_BLINK 1740#if CURSOR_BLINK
1717 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1808 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1809 */ 1833 */
1810 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1811 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1812 { 1836 {
1813 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1814 update_background (); 1838 update_background ();
1815 } 1839 }
1816 1840
1817 break; 1841 break;
1818 } 1842 }
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1861 { 1885 {
1862 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1863 MEvent.clicks++; 1887 MEvent.clicks++;
1864 1888
1865 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1866 { 1890 {
1867 /* only report double clicks */ 1891 /* only report double clicks */
… …
2020 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2021 break; 2045 break;
2022 } 2046 }
2023 2047
2024 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2025 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2028 2052
2029 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2030 break; 2054 break;
2031 2055
2032 case Button1: 2056 case Button1:
… …
2035 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2036 2060
2037 case Button3: 2061 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2039 { 2063 {
2040 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2041# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2042 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2043# else 2067# else
2044 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2045# endif 2069# endif
2046 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2047# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2048 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2049# else 2073# else
2050 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2051# endif 2075# endif
… …
2054 } 2078 }
2055 else 2079 else
2056 { 2080 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2082 (nrow
2059 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2060 / scrollBar.size ())); 2084 / scrollBar.size ()));
2061 } 2085 }
2062 2086
2063 break; 2087 break;
2064 } 2088 }
… …
2138 selection_make (ev.time); 2162 selection_make (ev.time);
2139 break; 2163 break;
2140 2164
2141 case Button2: 2165 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2168 break;
2145 2169
2146#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2147 case Button4: 2171 case Button4:
2148 case Button5: 2172 case Button5:
… …
2182 } 2206 }
2183} 2207}
2184 2208
2185/*}}} */ 2209/*}}} */
2186 2210
2187bool 2211void
2188rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2189{ 2213{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2193 2216
2194 for (;;) 2217 for (;;)
2195 { 2218 {
2196 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2197 { 2220 {
2198 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2199 ch = next_char (); 2222 ch = next_char ();
2200 2223
2201 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2202 break; 2225 break;
2203 } 2226 }
2204 2227
2205 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2206 { 2229 {
2207 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2208 { 2231 {
2209 seen_input = 1; 2232 seen_input = 1;
2210 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2211 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2212 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2225 wchar_t *str = buf; 2248 wchar_t *str = buf;
2226 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2227 2250
2228 for (;;) 2251 for (;;)
2229 { 2252 {
2230 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2231 break; 2254 break;
2232 2255
2233 *str++ = ch; 2256 *str++ = ch;
2234 2257
2235 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2236 { 2259 {
2237 if (ch == C0_LF) 2260 if (ch == C0_LF)
2238 nlines++; 2261 nlines++;
2239 2262
2240 refresh_count++; 2263 refresh_count++;
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2291 */ 2314 */
2292 if (refreshnow) 2315 if (refreshnow)
2293 { 2316 {
2294 flag = true;
2295 scr_refresh (); 2317 scr_refresh ();
2296 want_refresh = 1; 2318 want_refresh = 1;
2297 } 2319 }
2298
2299 } 2320 }
2300 else 2321 else
2301 { 2322 {
2302 try 2323 try
2303 { 2324 {
… …
2311 } 2332 }
2312 2333
2313 ch = NOCHAR; 2334 ch = NOCHAR;
2314 } 2335 }
2315 } 2336 }
2316
2317 return flag;
2318} 2337}
2319 2338
2320// read the next character 2339// read the next character
2321wchar_t 2340wchar_t
2322rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2323{ 2342{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2344 {
2326 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2329 2348
2330 wchar_t wc; 2349 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2351
… …
2337 break; 2356 break;
2338 } 2357 }
2339 2358
2340 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2341 { 2360 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2361 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2363 }
2345 2364
2346 // assume wchar == unicode 2365 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
… …
2360 : NOCHAR; 2379 : NOCHAR;
2361} 2380}
2362 2381
2363static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2364 2383
2365/* rxvt_cmd_getc () - Return next input character */
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t 2384wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2386{
2373 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2374 2388
… …
2467 pclose_printer (fd); 2481 pclose_printer (fd);
2468} 2482}
2469#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2470/*}}} */ 2484/*}}} */
2471 2485
2472/* *INDENT-OFF* */
2473enum { 2486enum {
2474 C1_40 = 0x40, 2487 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2492};
2480/* *INDENT-ON* */
2481 2493
2482/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2483void 2495void
2484rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2497{
… …
2578 break; 2590 break;
2579 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2593 break;
2582 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2584 break; 2596 break;
2585 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2587 /* unimplemented */ 2599 /* unimplemented */
2588 break; 2600 break;
… …
2607 return; 2619 return;
2608 } 2620 }
2609 2621
2610 switch (ch) 2622 switch (ch)
2611 { 2623 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2624 case '#':
2614 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2615 scr_E (); 2626 scr_E ();
2616 break; 2627 break;
2617 case '(': 2628 case '(':
… …
2640#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2641 case '9': 2652 case '9':
2642 scr_forwardindex (); 2653 scr_forwardindex ();
2643 break; 2654 break;
2644#endif 2655#endif
2656 // DECPAM/DECPNM
2645 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2646 case '>': 2660 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2648 break; 2662 break;
2649 2663
2650 case C1_40: 2664 case C1_40:
2651 cmd_getc (); 2665 cmd_getc ();
2652 break; 2666 break;
… …
2656 2670
2657 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2659 { 2673 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2676 }
2663 break; 2677 break;
2664 2678
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2667 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2684 break;
2669 2685
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2677 scr_index (DN); 2693 scr_index (DN);
2678 break; 2694 break;
2679 2695
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2682 2698
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2685 2701
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2704 process_dcs_seq ();
2689 break; 2705 break;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
2695 2711
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2714 process_csi_seq ();
2699 break; 2715 break;
2700 2716
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2719 process_osc_seq ();
2704 break; 2720 break;
2705 2721
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2723 case 'c':
2708 mbstate.reset (); 2724 mbstate.reset ();
2709 scr_poweron (); 2725 scr_poweron ();
2710 scrollBar.show (1); 2726 scrollBar.show (1);
2711 break; 2727 break;
… …
2722 } 2738 }
2723} 2739}
2724/*}}} */ 2740/*}}} */
2725 2741
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2743enum {
2729 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2746 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2747 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2750 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2751 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2752 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2753};
2739 2754
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2760
2746const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
2747 { 2762 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2763 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2764 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2765 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2766 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2767 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2771 };
2757/* *INDENT-ON* */
2758 2772
2759void 2773void
2760rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2761{ 2775{
2762 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2766 2780
2767 nargs = 0; 2781 nargs = 0;
2768 2782
2769 priv = 0; 2783 priv = 0;
2770 ch = cmd_getc (); 2784 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2786 {
2773 /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2788 priv = ch;
2775 ch = cmd_getc (); 2789 ch = cmd_getc ();
2776 } 2790 }
2777 2791
2778 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
2832 2846
2833 case '?': 2847 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2850 break;
2851
2852 case '!':
2853 if (ch == CSI_70)
2854 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset ();
2857
2858 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2860
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2837 } 2863 }
2864 break;
2865 }
2866
2838 return; 2867 return;
2839 } 2868 }
2840 2869
2841 switch (ch) 2870 switch (ch)
2842 { 2871 {
… …
3057 } 3086 }
3058} 3087}
3059/*}}} */ 3088/*}}} */
3060 3089
3061#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3062/* ARGSUSED */
3063void 3091void
3064rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3065{ 3093{
3066 int x, y; 3094 int x, y;
3067 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3076 { 3104 {
3077 /* 3105 /*
3078 * commands 3106 * commands
3079 */ 3107 */
3080 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3081 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3082 break; 3110 break;
3083 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3084 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3085 break; 3113 break;
3086 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3087 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3088 break; 3116 break;
3089 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3091 break; 3119 break;
3092 case 5: /* raise window */ 3120 case 5: /* raise window */
3093 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3094 break; 3122 break;
3095 case 6: /* lower window */ 3123 case 6: /* lower window */
3096 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3097 break; 3125 break;
3098 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3099 scr_touch (true); 3127 scr_touch (true);
3100 break; 3128 break;
3101 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3112 3140
3113 /* 3141 /*
3114 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3115 */ 3143 */
3116 case 11: /* report window state */ 3144 case 11: /* report window state */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3119 break; 3147 break;
3120 case 13: /* report window position */ 3148 case 13: /* report window position */
3121 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3122 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3123 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3124 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3125 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3126 break; 3154 break;
3127 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3128 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3130 break; 3158 break;
3131 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3132 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3133 break; 3161 break;
… …
3135 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3136 break; 3164 break;
3137 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3138 { 3166 {
3139 char *s; 3167 char *s;
3140 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3142 XFree (s); 3170 XFree (s);
3143 } 3171 }
3144 break; 3172 break;
3145 case 21: /* report window title */ 3173 case 21: /* report window title */
3146 { 3174 {
3147 char *s; 3175 char *s;
3148 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3178 XFree (s);
3151 } 3179 }
3152 break; 3180 break;
3153 } 3181 }
… …
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3237 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3238 */
3211void 3239void
3212rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3213{ 3241{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3242 /*
3218 * Not handled yet 3243 * Not handled yet
3219 */ 3244 */
3245
3246 unicode_t eh;
3220 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3221 if (s) 3248 if (s)
3222 free (s); 3249 free (s);
3223 3250
3224 return; 3251 return;
3225} 3252}
… …
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3257 */
3231void 3258void
3232rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3233{ 3260{
3234 unicode_t ch, eh;
3235 int arg; 3261 int arg;
3236 3262
3237 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3240 3266
3241 if (ch == ';') 3267 if (ch == ';')
3242 { 3268 {
3269 unicode_t eh;
3243 char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3244 3271
3245 if (s) 3272 if (s)
3246 { 3273 {
3247 process_xterm_seq (arg, s, eh); 3274 process_xterm_seq (arg, s, eh);
… …
3271 3298
3272/* 3299/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3301 */
3275void 3302void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3304{
3278 int color; 3305 int color;
3279 char *buf, *name; 3306 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3308 int saveop = op;
… …
3308 unsigned long bytes_after; 3335 unsigned long bytes_after;
3309 unsigned char *value = 0; 3336 unsigned char *value = 0;
3310 const char *str = ""; 3337 const char *str = "";
3311 3338
3312 if (prop 3339 if (prop
3313 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3314 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3315 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3316 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3317 && actual_type != None 3344 && actual_type != None
3318 && actual_format == 8) 3345 && actual_format == 8)
… …
3322 3349
3323 XFree (value); 3350 XFree (value);
3324 } 3351 }
3325 else 3352 else
3326 { 3353 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3328 3355
3329 if (eq) 3356 if (eq)
3330 { 3357 {
3331 *eq = 0; 3358 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3333 } 3360 }
3334 else 3361 else
3335 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3336 display->atom (str)); 3363 display->atom (str));
3337 } 3364 }
3338 break; 3365 break;
3339 3366
3340 case XTerm_Color: 3367 case XTerm_Color:
… …
3372 process_color_seq (op, Color_pointer_fg, str, resp); 3399 process_color_seq (op, Color_pointer_fg, str, resp);
3373 break; 3400 break;
3374 case XTerm_Color_pointer_bg: 3401 case XTerm_Color_pointer_bg:
3375 process_color_seq (op, Color_pointer_bg, str, resp); 3402 process_color_seq (op, Color_pointer_bg, str, resp);
3376 break; 3403 break;
3404#ifdef OPTION_HC
3405 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp);
3407 break;
3408 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp);
3410 break;
3411#endif
3377#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3378 case XTerm_Color_RV:
3379 process_color_seq (op, Color_RV, str, resp);
3380 break;
3381 case Rxvt_Color_BD:
3382 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3383 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3384 break; 3415 break;
3385 case Rxvt_Color_UL:
3386 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3387 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3388 break; 3418 break;
3389 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3391 break; 3421 break;
3392#endif 3422#endif
3423 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp);
3425 break;
3393#if ENABLE_TRANSPARENCY 3426#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3427 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3428 process_color_seq (op, Color_tint, str, resp);
3396 { 3429 {
3397 bool changed = false; 3430 bool changed = false;
3398 3431
3399 if (ISSET_PIXCOLOR (Color_tint)) 3432 if (ISSET_PIXCOLOR (Color_tint))
3400 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3401 else
3402 changed = bgPixmap.unset_tint ();
3403 3434
3404 if (changed) 3435 if (changed)
3405 update_background (); 3436 update_background ();
3406 } 3437 }
3407 3438
… …
3412 case Rxvt_Pixmap: 3443 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3444 if (!strcmp (str, "?"))
3414 { 3445 {
3415 char str[256]; 3446 char str[256];
3416 3447
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3448 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3449 min (h_scale, 32767), min (v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3452 }
3422 else 3453 else
3423 { 3454 {
3424 int changed = 0; 3455 bool changed = false;
3425 3456
3426 if (*str != ';') 3457 if (*str != ';')
3427 { 3458 {
3428 /* reset to default scaling :*/
3429 bgPixmap.unset_geometry ();
3430 if (bgPixmap.set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3431 changed++; 3460 changed = true;
3432 str = strchr (str, ';');
3433 if (str == NULL)
3434 bgPixmap.set_defaultGeometry ();
3435 } 3461 }
3436 3462 else
3437 while (str)
3438 { 3463 {
3439 str++; 3464 str++;
3440 if (bgPixmap.set_geometry (str)) 3465 if (bg_set_geometry (str, true))
3441 changed++; 3466 changed = true;
3442 str = strchr (str, ';');
3443 } 3467 }
3444 3468
3445 if (changed) 3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3446 update_background (); 3477 update_background ();
3478 }
3447 } 3479 }
3448 break; 3480 break;
3449#endif 3481#endif
3450 3482
3451 case XTerm_logfile: 3483 case XTerm_logfile:
… …
3554 { 3586 {
3555 if (mode == 'r') 3587 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3589 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 set_privmode (bit, state); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3560 } 3596 }
3561 3597
3562 return state; 3598 return state;
3563} 3599}
3564 3600
3565/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3566void 3602void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3604{
3569 unsigned int i, j; 3605 unsigned int i, j;
3570 int state; 3606 int state;
3571 3607
3572 static const struct 3608 static const struct
3573 { 3609 {
3574 const int argval; 3610 const int argval;
3575 const unsigned long bit; 3611 const unsigned long bit;
3576 } argtopriv[] = { 3612 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3620 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3622 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region
3587 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3627#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3632 // 45 margin bell NYI
3595 // 46 start logging 3633 // 46 start logging
3596 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3638#endif
3601 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3641 { 1003, PrivMode_MouseAnyEvent },
3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3646 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3649#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3613 { 2004, PrivMode_BracketPaste }, 3657 { 2004, PrivMode_BracketPaste },
3614 }; 3658 };
3615 3659
… …
3625 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3626 { 3670 {
3627 state = -1; 3671 state = -1;
3628 3672
3629 /* basic handling */ 3673 /* basic handling */
3630 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3631 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3632 { 3676 {
3633 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3634 break; 3678 break;
3635 } 3679 }
… …
3643 3687
3644 scr_touch (true); 3688 scr_touch (true);
3645 break; 3689 break;
3646#endif 3690#endif
3647 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3693 if (mode == 0)
3651 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3652 else if (mode == 1) 3695 else if (mode == 1)
3653 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
… …
3662 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3663 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3664 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3665 * within VT52 mode 3708 * within VT52 mode
3666 */ 3709 */
3667 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3668 break; 3711 break;
3669 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3715 break;
3676 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3717 set_option (Opt_jumpScroll, !state);
3678 break; 3718 break;
3679 case 5: /* reverse video */ 3719 case 5: /* reverse video */
… …
3690 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3691 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3692 break; 3732 break;
3693#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3694 case scrollBar_esc: 3734 case scrollBar_esc:
3695 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3696 {
3697 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3698 scr_touch (true); 3737 scr_touch (true);
3699 }
3700 break; 3738 break;
3701#endif 3739#endif
3702 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3703 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3704 break; 3742 break;
… …
3717 case 1003: 3755 case 1003:
3718 if (state) 3756 if (state)
3719 { 3757 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3759 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3760 mouse_row = mouse_col = 0;
3722 vt_emask_mouse = PointerMotionMask; 3761 vt_emask_mouse = PointerMotionMask;
3723 } 3762 }
3724 else 3763 else
3725 vt_emask_mouse = NoEventMask; 3764 vt_emask_mouse = NoEventMask;
3765
3726 vt_select_input (); 3766 vt_select_input ();
3727 break; 3767 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3769 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3770 break;
3731 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3772 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3773 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3776 if (!state)
3737 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
3738 scr_change_screen (state); 3779 scr_change_screen (state);
3739 break; 3780 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3782 if (option (Opt_secondaryScreen))
3783 if (state)
3784 scr_cursor (SAVE);
3785
3741 scr_change_screen (state); 3786 scr_change_screen (state);
3787
3742 if (option (Opt_secondaryScreen)) 3788 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3789 if (state)
3744 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
3745 break; 3793 break;
3746 default: 3794 default:
3747 break; 3795 break;
3748 } 3796 }
3749 } 3797 }
… …
3902 } 3950 }
3903 } 3951 }
3904} 3952}
3905/*}}} */ 3953/*}}} */
3906 3954
3907/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3908void
3909rxvt_term::process_graphics ()
3910{
3911 unicode_t ch, cmd = cmd_getc ();
3912
3913 if (cmd == 'Q')
3914 {
3915 /* query graphics */
3916 tt_printf ("\033G0\012"); /* no graphics */
3917 return;
3918 }
3919 /* swallow other graphics sequences until terminating ':' */
3920 do
3921 ch = cmd_getc ();
3922 while (ch != ':');
3923}
3924/*}}} */
3925
3926/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3927 3956
3928/* 3957/*
3929 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
3930 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
3943 3972
3944/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
3945/* Write data to the pty as typed by the user, pasted with the mouse, 3974/* Write data to the pty as typed by the user, pasted with the mouse,
3946 * or generated by us in response to a query ESC sequence. 3975 * or generated by us in response to a query ESC sequence.
3947 */ 3976 */
3948const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3949 3978
3950void 3979void
3951rxvt_term::tt_write (const char *data, unsigned int len) 3980rxvt_term::tt_write (const char *data, unsigned int len)
3952{ 3981{
3953 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3958 3987
3959 if (v_buflen == 0) 3988 if (v_buflen == 0)
3960 { 3989 {
3961 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3962 3991
3992 max_it (written, 0);
3993
3963 if ((unsigned int)written == len) 3994 if (written == len)
3964 return; 3995 return;
3965 3996
3966 data += written; 3997 data += written;
3967 len -= written; 3998 len -= written;
3968 } 3999 }
3969 4000
3970 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3971 4002
3972 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len; 4004 v_buflen += len;
3974 4005
3975 pty_ev.set (ev::READ | ev::WRITE); 4006 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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