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.495 by sf-exg, Sun Aug 28 18:48:41 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
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1724
1687void 1725void
1688rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1689{ 1727{
1690 if (!focus) 1728 if (!focus)
1691 { 1729 {
1692 focus = 1; 1730 focus = 1;
1693 want_refresh = 1; 1731 want_refresh = 1;
1694 1732
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1733#if USE_XIM
1698 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1699 { 1735 {
1700 IMSetPosition (); 1736 im_set_position ();
1701 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1702 } 1738 }
1703#endif 1739#endif
1704#if CURSOR_BLINK 1740#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1748 scr_recolour ();
1713 } 1749 }
1714#endif 1750#endif
1715#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1717 { 1753 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 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1757 }
1726} 1758}
1727 1759
1728void 1760void
1729rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1731 if (focus) 1763 if (focus)
1732 { 1764 {
1733 focus = 0; 1765 focus = 0;
1734 want_refresh = 1; 1766 want_refresh = 1;
1735 1767
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1737 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1738#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1773 if (iso14755buf)
1740 { 1774 {
1741 iso14755buf = 0; 1775 iso14755buf = 0;
1742# if ISO_14755 1776# if ISO_14755
… …
1759 { 1793 {
1760 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1795 scr_recolour ();
1762 } 1796 }
1763#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1800 }
1765} 1801}
1766 1802
1767void 1803void
1768rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1796 * 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.
1797 */ 1833 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1836 {
1801 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1802 update_background (); 1838 update_background ();
1803 } 1839 }
1804 1840
1805 break; 1841 break;
1806 } 1842 }
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1849 { 1885 {
1850 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1851 MEvent.clicks++; 1887 MEvent.clicks++;
1852 1888
1853 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1854 { 1890 {
1855 /* only report double clicks */ 1891 /* only report double clicks */
… …
2008 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2045 break;
2010 } 2046 }
2011 2047
2012 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2052
2017 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2018 break; 2054 break;
2019 2055
2020 case Button1: 2056 case Button1:
… …
2023 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2024 2060
2025 case Button3: 2061 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2027 { 2063 {
2028 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2031# else 2067# else
2032 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2033# endif 2069# endif
2034 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2037# else 2073# else
2038 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2039# endif 2075# endif
… …
2042 } 2078 }
2043 else 2079 else
2044 { 2080 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2082 (nrow
2047 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2048 / scrollBar.size ())); 2084 / scrollBar.size ()));
2049 } 2085 }
2050 2086
2051 break; 2087 break;
2052 } 2088 }
… …
2126 selection_make (ev.time); 2162 selection_make (ev.time);
2127 break; 2163 break;
2128 2164
2129 case Button2: 2165 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2168 break;
2133 2169
2134#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2135 case Button4: 2171 case Button4:
2136 case Button5: 2172 case Button5:
… …
2170 } 2206 }
2171} 2207}
2172 2208
2173/*}}} */ 2209/*}}} */
2174 2210
2175bool 2211void
2176rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2177{ 2213{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2181 2216
2182 for (;;) 2217 for (;;)
2183 { 2218 {
2184 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2185 { 2220 {
2186 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2222 ch = next_char ();
2188 2223
2189 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2190 break; 2225 break;
2191 } 2226 }
2192 2227
2193 if (!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))
2194 { 2229 {
2195 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2196 { 2231 {
2197 seen_input = 1; 2232 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2248 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2250
2216 for (;;) 2251 for (;;)
2217 { 2252 {
2218 if (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)))
2219 break; 2254 break;
2220 2255
2221 *str++ = ch; 2256 *str++ = ch;
2222 2257
2223 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2259 {
2225 if (ch == C0_LF) 2260 if (ch == C0_LF)
2226 nlines++; 2261 nlines++;
2227 2262
2228 refresh_count++; 2263 refresh_count++;
… …
2277 * 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.
2278 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2279 */ 2314 */
2280 if (refreshnow) 2315 if (refreshnow)
2281 { 2316 {
2282 flag = true;
2283 scr_refresh (); 2317 scr_refresh ();
2284 want_refresh = 1; 2318 want_refresh = 1;
2285 } 2319 }
2286
2287 } 2320 }
2288 else 2321 else
2289 { 2322 {
2290 try 2323 try
2291 { 2324 {
… …
2299 } 2332 }
2300 2333
2301 ch = NOCHAR; 2334 ch = NOCHAR;
2302 } 2335 }
2303 } 2336 }
2304
2305 return flag;
2306} 2337}
2307 2338
2308// read the next character 2339// read the next character
2309wchar_t 2340wchar_t
2310rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2311{ 2342{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2344 {
2314 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2317 2348
2318 wchar_t wc; 2349 wchar_t wc;
2319 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);
2320 2351
… …
2325 break; 2356 break;
2326 } 2357 }
2327 2358
2328 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2329 { 2360 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2361 mbstate.reset (); // reset now undefined conversion state
2331 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
2332 } 2363 }
2333 2364
2334 // assume wchar == unicode 2365 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
… …
2348 : NOCHAR; 2379 : NOCHAR;
2349} 2380}
2350 2381
2351static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2352 2383
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 2384wchar_t
2359rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2360{ 2386{
2361 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2362 2388
… …
2455 pclose_printer (fd); 2481 pclose_printer (fd);
2456} 2482}
2457#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2458/*}}} */ 2484/*}}} */
2459 2485
2460/* *INDENT-OFF* */
2461enum { 2486enum {
2462 C1_40 = 0x40, 2487 C1_40 = 0x40,
2463 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,
2464 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,
2465 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,
2466 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,
2467}; 2492};
2468/* *INDENT-ON* */
2469 2493
2470/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2471void 2495void
2472rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2473{ 2497{
… …
2595 return; 2619 return;
2596 } 2620 }
2597 2621
2598 switch (ch) 2622 switch (ch)
2599 { 2623 {
2600 /* case 1: do_tek_mode (); break; */
2601 case '#': 2624 case '#':
2602 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2603 scr_E (); 2626 scr_E ();
2604 break; 2627 break;
2605 case '(': 2628 case '(':
… …
2628#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2629 case '9': 2652 case '9':
2630 scr_forwardindex (); 2653 scr_forwardindex ();
2631 break; 2654 break;
2632#endif 2655#endif
2656 // DECPAM/DECPNM
2633 case '=': 2657 case '=':
2634 case '>': 2658 case '>':
2635 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2636 break; 2660 break;
2637 2661
… …
2644 2668
2645 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2646 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2647 { 2671 {
2648 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2649 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2650 } 2674 }
2651 break; 2675 break;
2652 2676
2653 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2654 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2655 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2656 break; 2682 break;
2657 2683
2658 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2659 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2660 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2664 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2665 scr_index (DN); 2691 scr_index (DN);
2666 break; 2692 break;
2667 2693
2668 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2669 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2670 2696
2671 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2672 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2673 2699
2674 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2675 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2676 process_dcs_seq (); 2702 process_dcs_seq ();
2677 break; 2703 break;
… …
2679 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2705 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680 case C1_SCI: /* ESC Z */ 2706 case C1_SCI: /* ESC Z */
2681 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2707 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682 break; /* steal obsolete ESC [ c */ 2708 break; /* steal obsolete ESC [ c */
2683 2709
2684 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2710 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685 case C1_CSI: /* ESC [ */ 2711 case C1_CSI: /* ESC [ */
2686 process_csi_seq (); 2712 process_csi_seq ();
2687 break; 2713 break;
2688 2714
2689 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2715 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690 case C1_OSC: /* ESC ] */ 2716 case C1_OSC: /* ESC ] */
2691 process_osc_seq (); 2717 process_osc_seq ();
2692 break; 2718 break;
2693 2719
2694 /* 8.3.106: RESET TO INITIAL STATE */ 2720 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695 case 'c': 2721 case 'c':
2696 mbstate.reset (); 2722 mbstate.reset ();
2697 scr_poweron (); 2723 scr_poweron ();
2698 scrollBar.show (1); 2724 scrollBar.show (1);
2699 break; 2725 break;
… …
2710 } 2736 }
2711} 2737}
2712/*}}} */ 2738/*}}} */
2713 2739
2714/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2715/* *INDENT-OFF* */
2716enum { 2741enum {
2717 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2718 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 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 , 2744 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, 2745 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, 2748 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 , 2749 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 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2726}; 2751};
2727 2752
2728#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2729 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2730 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2731#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2732 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2733 2758
2734const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2735 { 2760 {
2736 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 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, */ 2762 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, */ 2763 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, [, \, ], ^, _, */ 2764 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, */ 2765 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, */ 2766 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, */ 2767 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, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2744 }; 2769 };
2745/* *INDENT-ON* */
2746 2770
2747void 2771void
2748rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2749{ 2773{
2750 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2754 2778
2755 nargs = 0; 2779 nargs = 0;
2756 2780
2757 priv = 0; 2781 priv = 0;
2758 ch = cmd_getc (); 2782 ch = cmd_getc ();
2759 if (ch >= '<' && ch <= '?') 2783 if ((ch >= '<' && ch <= '?') || ch == '!')
2760 { 2784 {
2761 /* '<' '=' '>' '?' */ 2785 /* '<' '=' '>' '?' '!' */
2762 priv = ch; 2786 priv = ch;
2763 ch = cmd_getc (); 2787 ch = cmd_getc ();
2764 } 2788 }
2765 2789
2766 /* read any numerical arguments */ 2790 /* read any numerical arguments */
… …
2820 2844
2821 case '?': 2845 case '?':
2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2846 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2823 process_terminal_mode (ch, priv, nargs, arg); 2847 process_terminal_mode (ch, priv, nargs, arg);
2824 break; 2848 break;
2849
2850 case '!':
2851 if (ch == CSI_70)
2852 {
2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2854 scr_soft_reset ();
2855
2856 static const int pm_h[] = { 7, 25 };
2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2858
2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2825 } 2861 }
2862 break;
2863 }
2864
2826 return; 2865 return;
2827 } 2866 }
2828 2867
2829 switch (ch) 2868 switch (ch)
2830 { 2869 {
… …
3045 } 3084 }
3046} 3085}
3047/*}}} */ 3086/*}}} */
3048 3087
3049#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3050/* ARGSUSED */
3051void 3089void
3052rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3053{ 3091{
3054 int x, y; 3092 int x, y;
3055 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3064 { 3102 {
3065 /* 3103 /*
3066 * commands 3104 * commands
3067 */ 3105 */
3068 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3069 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3070 break; 3108 break;
3071 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3072 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3073 break; 3111 break;
3074 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3075 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3076 break; 3114 break;
3077 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3079 break; 3117 break;
3080 case 5: /* raise window */ 3118 case 5: /* raise window */
3081 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3082 break; 3120 break;
3083 case 6: /* lower window */ 3121 case 6: /* lower window */
3084 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3085 break; 3123 break;
3086 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3087 scr_touch (true); 3125 scr_touch (true);
3088 break; 3126 break;
3089 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3100 3138
3101 /* 3139 /*
3102 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3103 */ 3141 */
3104 case 11: /* report window state */ 3142 case 11: /* report window state */
3105 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3107 break; 3145 break;
3108 case 13: /* report window position */ 3146 case 13: /* report window position */
3109 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3110 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3111 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3112 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3113 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3114 break; 3152 break;
3115 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3116 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3118 break; 3156 break;
3119 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3120 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3121 break; 3159 break;
… …
3123 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3124 break; 3162 break;
3125 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3126 { 3164 {
3127 char *s; 3165 char *s;
3128 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3130 XFree (s); 3168 XFree (s);
3131 } 3169 }
3132 break; 3170 break;
3133 case 21: /* report window title */ 3171 case 21: /* report window title */
3134 { 3172 {
3135 char *s; 3173 char *s;
3136 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3176 XFree (s);
3139 } 3177 }
3140 break; 3178 break;
3141 } 3179 }
… …
3197 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3198 */ 3236 */
3199void 3237void
3200rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3201{ 3239{
3202 char *s;
3203 unicode_t eh;
3204
3205 /* 3240 /*
3206 * Not handled yet 3241 * Not handled yet
3207 */ 3242 */
3243
3244 unicode_t eh;
3208 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3209 if (s) 3246 if (s)
3210 free (s); 3247 free (s);
3211 3248
3212 return; 3249 return;
3213} 3250}
… …
3217 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3218 */ 3255 */
3219void 3256void
3220rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3221{ 3258{
3222 unicode_t ch, eh;
3223 int arg; 3259 int arg;
3224 3260
3225 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3226 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3228 3264
3229 if (ch == ';') 3265 if (ch == ';')
3230 { 3266 {
3267 unicode_t eh;
3231 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3232 3269
3233 if (s) 3270 if (s)
3234 { 3271 {
3235 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3259 3296
3260/* 3297/*
3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3298 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3262 */ 3299 */
3263void 3300void
3264rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3301rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265{ 3302{
3266 int color; 3303 int color;
3267 char *buf, *name; 3304 char *buf, *name;
3268 bool query = str[0] == '?' && !str[1]; 3305 bool query = str[0] == '?' && !str[1];
3269 int saveop = op; 3306 int saveop = op;
… …
3296 unsigned long bytes_after; 3333 unsigned long bytes_after;
3297 unsigned char *value = 0; 3334 unsigned char *value = 0;
3298 const char *str = ""; 3335 const char *str = "";
3299 3336
3300 if (prop 3337 if (prop
3301 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3302 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3303 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3304 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3305 && actual_type != None 3342 && actual_type != None
3306 && actual_format == 8) 3343 && actual_format == 8)
… …
3310 3347
3311 XFree (value); 3348 XFree (value);
3312 } 3349 }
3313 else 3350 else
3314 { 3351 {
3315 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3352 char *eq = strchr (str, '=');
3316 3353
3317 if (eq) 3354 if (eq)
3318 { 3355 {
3319 *eq = 0; 3356 *eq = 0;
3320 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3321 } 3358 }
3322 else 3359 else
3323 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3324 display->atom (str)); 3361 display->atom (str));
3325 } 3362 }
3326 break; 3363 break;
3327 3364
3328 case XTerm_Color: 3365 case XTerm_Color:
… …
3360 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3361 break; 3398 break;
3362 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3363 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3364 break; 3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3365#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#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: 3411 case URxvt_Color_BD:
3371 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3372 break; 3413 break;
3373 case Rxvt_Color_UL:
3374 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3375 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3376 break; 3416 break;
3377 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3378 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
3379 break; 3419 break;
3380#endif 3420#endif
3421 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp);
3423 break;
3381#if ENABLE_TRANSPARENCY 3424#if ENABLE_TRANSPARENCY
3382 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3383 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3384 { 3427 {
3385 bool changed = false; 3428 bool changed = false;
3386 3429
3387 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391 3432
3392 if (changed) 3433 if (changed)
3393 update_background (); 3434 update_background ();
3394 } 3435 }
3395 3436
… …
3400 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3401 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3402 { 3443 {
3403 char str[256]; 3444 char str[256];
3404 3445
3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3409 } 3450 }
3410 else 3451 else
3411 { 3452 {
3412 int changed = 0; 3453 bool changed = false;
3413 3454
3414 if (*str != ';') 3455 if (*str != ';')
3415 { 3456 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3419 changed++; 3458 changed = true;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 } 3459 }
3424 3460 else
3425 while (str)
3426 { 3461 {
3427 str++; 3462 str++;
3428 if (bgPixmap.set_geometry (str)) 3463 if (bg_set_geometry (str, true))
3429 changed++; 3464 changed = true;
3430 str = strchr (str, ';');
3431 } 3465 }
3432 3466
3433 if (changed) 3467 if (changed)
3468 {
3469 if (bg_window_position_sensitive ())
3470 {
3471 int x, y;
3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3434 update_background (); 3475 update_background ();
3476 }
3435 } 3477 }
3436 break; 3478 break;
3437#endif 3479#endif
3438 3480
3439 case XTerm_logfile: 3481 case XTerm_logfile:
… …
3509 break; 3551 break;
3510#endif 3552#endif
3511 3553
3512#if ENABLE_PERL 3554#if ENABLE_PERL
3513 case URxvt_perl: 3555 case URxvt_perl:
3514 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3556 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3515 ; // no responses yet
3516 break; 3557 break;
3517#endif 3558#endif
3518 } 3559 }
3519} 3560}
3520/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
… …
3543 { 3584 {
3544 if (mode == 'r') 3585 if (mode == 'r')
3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3546 else 3587 else
3547 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3589
3548 set_privmode (bit, state); 3590 set_privmode (bit, state);
3549 } 3591 }
3550 3592
3551 return state; 3593 return state;
3552} 3594}
3553 3595
3554/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3555void 3597void
3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3557{ 3599{
3558 unsigned int i, j; 3600 unsigned int i, j;
3559 int state; 3601 int state;
3560 3602
3561 static const struct 3603 static const struct
3562 { 3604 {
3563 const int argval; 3605 const int argval;
3564 const unsigned long bit; 3606 const unsigned long bit;
3565 } argtopriv[] = { 3607 } argtopriv[] = {
3566 { 1, PrivMode_aplCUR }, 3608 { 1, PrivMode_aplCUR }, // DECCKM
3567 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3568 { 3, PrivMode_132 }, 3610 { 3, PrivMode_132 }, // DECCOLM
3569 { 4, PrivMode_smoothScroll }, 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3570 { 5, PrivMode_rVideo }, 3612 { 5, PrivMode_rVideo }, // DECSCNM
3571 { 6, PrivMode_relOrigin }, 3613 { 6, PrivMode_relOrigin }, // DECOM
3572 { 7, PrivMode_Autowrap }, 3614 { 7, PrivMode_Autowrap }, // DECAWM
3573 // 8, bi-directional support mode 3615 // 8, auto-repeat keys // DECARM
3574 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3575 // 18, 19 printing-related 3617 // 18 end FF to printer after print screen
3618 // 19 Print screen prints full screen/scroll region
3576 { 25, PrivMode_VisibleCursor }, 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3577#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3578 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3579#endif 3622#endif
3580 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3624 // 38, tektronix mode // DECTEK
3581 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3582 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3583 // 45 margin bell NYI 3627 // 45 margin bell NYI
3584 // 46 start logging 3628 // 46 start logging
3585 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3586 { 66, PrivMode_aplKP }, 3630 { 66, PrivMode_aplKP }, // DECNKM
3587#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3588 { 67, PrivMode_BackSpace }, 3632 { 67, PrivMode_BackSpace }, // DECBKM
3589#endif 3633#endif
3590 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3591 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
3592 { 1003, PrivMode_MouseAnyEvent }, 3636 { 1003, PrivMode_MouseAnyEvent },
3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3594 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
3595 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
3596 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
3597 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
3598 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
3599 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste }, 3652 { 2004, PrivMode_BracketPaste },
3603 }; 3653 };
3604 3654
… …
3614 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3615 { 3665 {
3616 state = -1; 3666 state = -1;
3617 3667
3618 /* basic handling */ 3668 /* basic handling */
3619 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3620 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3621 { 3671 {
3622 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3623 break; 3673 break;
3624 } 3674 }
… …
3632 3682
3633 scr_touch (true); 3683 scr_touch (true);
3634 break; 3684 break;
3635#endif 3685#endif
3636 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3637 case 1049:
3638 if (option (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
3639 if (mode == 0) 3688 if (mode == 0)
3640 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
3641 else if (mode == 1) 3690 else if (mode == 1)
3642 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
… …
3655 */ 3704 */
3656 set_privmode (PrivMode_vt52, 1); 3705 set_privmode (PrivMode_vt52, 1);
3657 break; 3706 break;
3658 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
3659 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663 }
3664 break; 3710 break;
3665 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
3666 set_option (Opt_jumpScroll, !state); 3712 set_option (Opt_jumpScroll, !state);
3667 break; 3713 break;
3668 case 5: /* reverse video */ 3714 case 5: /* reverse video */
… …
3679 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3681 break; 3727 break;
3682#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
3683 case scrollBar_esc: 3729 case scrollBar_esc:
3684 if (scrollBar.map (state)) 3730 scrollBar.map (state);
3685 {
3686 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
3687 scr_touch (true); 3732 scr_touch (true);
3688 }
3689 break; 3733 break;
3690#endif 3734#endif
3691 case 25: /* visible/invisible cursor */ 3735 case 25: /* visible/invisible cursor */
3692 scr_cursor_visible (state); 3736 scr_cursor_visible (state);
3693 break; 3737 break;
… …
3706 case 1003: 3750 case 1003:
3707 if (state) 3751 if (state)
3708 { 3752 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3753 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3754 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3755 mouse_row = mouse_col = 0;
3711 vt_emask_mouse = PointerMotionMask; 3756 vt_emask_mouse = PointerMotionMask;
3712 } 3757 }
3713 else 3758 else
3714 vt_emask_mouse = NoEventMask; 3759 vt_emask_mouse = NoEventMask;
3760
3715 vt_select_input (); 3761 vt_select_input ();
3716 break; 3762 break;
3717 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
3718 set_option (Opt_scrollTtyOutput, !state); 3764 set_option (Opt_scrollTtyOutput, !state);
3719 break; 3765 break;
3720 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
3721 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
3722 break; 3768 break;
3723 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
3724 if (option (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3771 if (!state)
3726 scr_erase_screen (2); 3772 scr_erase_screen (2);
3773
3727 scr_change_screen (state); 3774 scr_change_screen (state);
3728 break; 3775 break;
3729 case 1049: /* secondary screen w/ clearing first */ 3776 case 1049: /* secondary screen w/ clearing first */
3777 if (option (Opt_secondaryScreen))
3778 if (state)
3779 scr_cursor (SAVE);
3780
3730 scr_change_screen (state); 3781 scr_change_screen (state);
3782
3731 if (option (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3784 if (state)
3733 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786 else
3787 scr_cursor (RESTORE);
3734 break; 3788 break;
3735 default: 3789 default:
3736 break; 3790 break;
3737 } 3791 }
3738 } 3792 }
… …
3891 } 3945 }
3892 } 3946 }
3893} 3947}
3894/*}}} */ 3948/*}}} */
3895 3949
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/* ------------------------------------------------------------------------- */ 3950/* ------------------------------------------------------------------------- */
3916 3951
3917/* 3952/*
3918 * Send printf () formatted output to the command. 3953 * Send printf () formatted output to the command.
3919 * Only use for small amounts of data. 3954 * Only use for small amounts of data.
… …
3932 3967
3933/* ---------------------------------------------------------------------- */ 3968/* ---------------------------------------------------------------------- */
3934/* Write data to the pty as typed by the user, pasted with the mouse, 3969/* 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. 3970 * or generated by us in response to a query ESC sequence.
3936 */ 3971 */
3937const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3972static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3938 3973
3939void 3974void
3940rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
3941{ 3976{
3942 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3947 3982
3948 if (v_buflen == 0) 3983 if (v_buflen == 0)
3949 { 3984 {
3950 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3951 3986
3987 max_it (written, 0);
3988
3952 if ((unsigned int)written == len) 3989 if (written == len)
3953 return; 3990 return;
3954 3991
3955 data += written; 3992 data += written;
3956 len -= written; 3993 len -= written;
3957 } 3994 }
3958 3995
3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3996 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3960 3997
3961 memcpy (v_buffer + v_buflen, data, len); 3998 memcpy (v_buffer + v_buflen, data, len);
3962 v_buflen += len; 3999 v_buflen += len;
3963 4000
3964 pty_ev.set (ev::READ | ev::WRITE); 4001 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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