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.435 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs.
Revision 1.492 by sf-exg, Sun Aug 21 20:13:58 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 }
… …
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 { 643 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1; 645 unsigned int newlen = 1;
649 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
651 { 653 {
652#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace: 655 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
655 { 657 {
… …
882 commit_iso14755 (); 884 commit_iso14755 ();
883 885
884 return; 886 return;
885 } 887 }
886 888
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 890 if (i[0] == keysym)
889 { 891 {
890 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 893 commit_iso14755 ();
892 894
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
931#endif 933#endif
932} 934}
933 935
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 936void
968rxvt_term::flush () 937rxvt_term::flush ()
969{ 938{
970 flush_ev.stop (); 939 flush_ev.stop ();
971 940
972#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
974 { 943 {
975// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 945 scr_touch (false);
977 } 946 }
978#endif 947#endif
979 948
980 if (want_refresh) 949 if (want_refresh)
… …
1018 } 987 }
1019 988
1020 scr_refresh (); 989 scr_refresh ();
1021 scrollBar.show (1); 990 scrollBar.show (1);
1022#ifdef USE_XIM 991#ifdef USE_XIM
1023 IMSendSpot (); 992 im_send_spot ();
1024#endif 993#endif
1025 } 994 }
1026 995
1027 display->flush (); 996 display->flush ();
1028} 997}
1029 998
1030/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1031void 1000void
1032rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1033{ 1002{
1034 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1129 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1131 // 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
1132 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only 1102 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool, 1103 // known workaround against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best. 1104 // we just nanosleep a bit and hope for the best.
1136 1105
1137 struct timespec ts = { 0, 1000 }; 1106 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1139 1108
… …
1145 { 1114 {
1146 } 1115 }
1147} event_handler; 1116} event_handler;
1148#endif 1117#endif
1149 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
1150bool 1152bool
1151rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1152{ 1154{
1153 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1154 1156
1155 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1156 { 1158
1157 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1158 n = 0;
1159 } 1160 {
1160 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1161 memmove (cmdbuf_base, cmdbuf_ptr, n);
1162 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1163 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1164 1166
1165 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1166 1168
1167 if (r > 0) 1169 if (r > 0)
1168 { 1170 {
1169 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1170 return true; 1172 return true;
… …
1244{ 1246{
1245 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1246 int x, y; 1248 int x, y;
1247 int code = 32; 1249 int code = 32;
1248 1250
1249 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1251 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1252 { 1255 {
1253 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1254 return; 1257 return;
1258
1255 mouse_row = x; 1259 mouse_row = x;
1256 mouse_col = y; 1260 mouse_col = y;
1257 code += 32; 1261 code += 32;
1258 } 1262 }
1259 1263
… …
1262 else 1266 else
1263 { 1267 {
1264 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1270 if (button_number >= 3)
1267 button_number += (64 - 3); 1271 button_number += 64 - 3;
1268 } 1272 }
1269 1273
1270 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1271 { 1275 {
1272 /* 1276 /*
… …
1304 fputc ('A', stderr); 1308 fputc ('A', stderr);
1305 if (key_state & 32) 1309 if (key_state & 32)
1306 fputc ('2', stderr); 1310 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1312 button_number,
1309 x + 1, 1313 x,
1310 y + 1); 1314 y);
1311#endif 1315#endif
1312 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
1313 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1331 code + button_number + key_state,
1315 (32 + x + 1), 1332 32 + x,
1316 (32 + y + 1)); 1333 32 + y);
1317} 1334}
1318 1335
1319/*{{{ process an X event */ 1336/*{{{ process an X event */
1320void 1337void
1321rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1423 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1441 focus_out ();
1425 break; 1442 break;
1426 1443
1427 case ConfigureNotify: 1444 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1431 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1432 { 1446 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 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
1435 1468
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1470 {
1438 seen_resize = 1; 1471 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1473 }
1441 else 1474 else
1442 { 1475 {
1443#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped) 1477 if (moved)
1447 update_background (); 1478 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif 1479#endif
1452 } 1480 }
1453 1481
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1483 }
1456 break; 1484 break;
1457 1485
1458 case PropertyNotify: 1486 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1461 && ev.xproperty.state == PropertyNewValue)
1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463
1464 break; 1488 break;
1465 1489
1466 case SelectionClear: 1490 case SelectionClear:
1467 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break;
1469
1470 case SelectionNotify:
1471 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1473 break; 1492 break;
1474 1493
1475 case SelectionRequest: 1494 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1477 break; 1496 break;
1478 1497
1479 case MapNotify: 1498 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1481 /* 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
1482 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1485 * reparenting. 1504 * reparenting.
1486 * We should not render background immidiately, as there could be several 1505 * We should not render background immediately, as there could be several
1487 * 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
1488 * 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
1489 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1490 * 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
1491 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1492 */ 1511 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1494 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1495#endif 1514#endif
1496 mapped = 1; 1515 mapped = 1;
1497#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1513 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1514 { 1533 {
1515 do 1534 do
1516 { 1535 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1538 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1540
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1542
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1544 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1547 }
1529 1548
1530 want_refresh = 1; 1549 want_refresh = 1;
1531 } 1550 }
1532 else 1551 else
… …
1692rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1693{ 1712{
1694 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1695 return; 1714 return;
1696 1715
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1698 { 1717 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1701 urgency_hint = enable; 1720 urgency_hint = enable;
1702 } 1721 }
1703} 1722}
1704#endif 1723#endif
1705 1724
… …
1712 want_refresh = 1; 1731 want_refresh = 1;
1713 1732
1714#if USE_XIM 1733#if USE_XIM
1715 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1716 { 1735 {
1717 IMSetPosition (); 1736 im_set_position ();
1718 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1719 } 1738 }
1720#endif 1739#endif
1721#if CURSOR_BLINK 1740#if CURSOR_BLINK
1722 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1813 * 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.
1814 */ 1833 */
1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 { 1836 {
1818 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1819 update_background (); 1838 update_background ();
1820 } 1839 }
1821 1840
1822 break; 1841 break;
1823 } 1842 }
… …
1862 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1863 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1864#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1865 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1866 { 1885 {
1867 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1868 MEvent.clicks++; 1887 MEvent.clicks++;
1869 1888
1870 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1871 { 1890 {
1872 /* only report double clicks */ 1891 /* only report double clicks */
… …
2143 selection_make (ev.time); 2162 selection_make (ev.time);
2144 break; 2163 break;
2145 2164
2146 case Button2: 2165 case Button2:
2147 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?
2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149 break; 2168 break;
2150 2169
2151#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2152 case Button4: 2171 case Button4:
2153 case Button5: 2172 case Button5:
… …
2195 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2197 2216
2198 for (;;) 2217 for (;;)
2199 { 2218 {
2200 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2201 { 2220 {
2202 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2222 ch = next_char ();
2204 2223
2205 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2206 break; 2225 break;
2207 } 2226 }
2208 2227
2209 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))
2210 { 2229 {
2211 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2212 { 2231 {
2213 seen_input = 1; 2232 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2229 wchar_t *str = buf; 2248 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2250
2232 for (;;) 2251 for (;;)
2233 { 2252 {
2234 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)))
2235 break; 2254 break;
2236 2255
2237 *str++ = ch; 2256 *str++ = ch;
2238 2257
2239 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2240 { 2259 {
2241 if (ch == C0_LF) 2260 if (ch == C0_LF)
2242 nlines++; 2261 nlines++;
2243 2262
2244 refresh_count++; 2263 refresh_count++;
… …
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
… …
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{
… …
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 '=':
2646 case '>': 2658 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2648 break; 2660 break;
2649 2661
… …
2656 2668
2657 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2659 { 2671 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2674 }
2663 break; 2675 break;
2664 2676
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2667 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 */
2668 break; 2682 break;
2669 2683
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2677 scr_index (DN); 2691 scr_index (DN);
2678 break; 2692 break;
2679 2693
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2682 2696
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2685 2699
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2702 process_dcs_seq ();
2689 break; 2703 break;
… …
2722 } 2736 }
2723} 2737}
2724/*}}} */ 2738/*}}} */
2725 2739
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2741enum {
2729 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2730 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,
2731 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 ,
2732 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,
… …
2735 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,
2736 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 ,
2737 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
2738}; 2751};
2739 2752
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2758
2746const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2747 { 2760 {
2748 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, */
2749 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, */
2750 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, */
2751 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, [, \, ], ^, _, */
2752 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, */
2753 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, */
2754 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, */
2755 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, {, |, }, ~, */
2756 }; 2769 };
2757/* *INDENT-ON* */
2758 2770
2759void 2771void
2760rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2761{ 2773{
2762 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2840 { 2852 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset (); 2854 scr_soft_reset ();
2843 2855
2844 static const int pm_h[] = { 7, 25 }; 2856 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2846 2858
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2849 } 2861 }
2850 break; 2862 break;
2851 } 2863 }
2852 2864
2853 return; 2865 return;
… …
3072 } 3084 }
3073} 3085}
3074/*}}} */ 3086/*}}} */
3075 3087
3076#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3077/* ARGSUSED */
3078void 3089void
3079rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3080{ 3091{
3081 int x, y; 3092 int x, y;
3082 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3091 { 3102 {
3092 /* 3103 /*
3093 * commands 3104 * commands
3094 */ 3105 */
3095 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3096 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3097 break; 3108 break;
3098 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3099 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3100 break; 3111 break;
3101 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3102 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3103 break; 3114 break;
3104 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3106 break; 3117 break;
3107 case 5: /* raise window */ 3118 case 5: /* raise window */
3108 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3109 break; 3120 break;
3110 case 6: /* lower window */ 3121 case 6: /* lower window */
3111 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3112 break; 3123 break;
3113 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3114 scr_touch (true); 3125 scr_touch (true);
3115 break; 3126 break;
3116 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3127 3138
3128 /* 3139 /*
3129 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3130 */ 3141 */
3131 case 11: /* report window state */ 3142 case 11: /* report window state */
3132 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3134 break; 3145 break;
3135 case 13: /* report window position */ 3146 case 13: /* report window position */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3137 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3138 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3139 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3140 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3141 break; 3152 break;
3142 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3145 break; 3156 break;
3146 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3147 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3148 break; 3159 break;
… …
3150 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3151 break; 3162 break;
3152 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3153 { 3164 {
3154 char *s; 3165 char *s;
3155 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3156 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 */
3157 XFree (s); 3168 XFree (s);
3158 } 3169 }
3159 break; 3170 break;
3160 case 21: /* report window title */ 3171 case 21: /* report window title */
3161 { 3172 {
3162 char *s; 3173 char *s;
3163 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3164 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 */
3165 XFree (s); 3176 XFree (s);
3166 } 3177 }
3167 break; 3178 break;
3168 } 3179 }
… …
3224 * 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)'
3225 */ 3236 */
3226void 3237void
3227rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3228{ 3239{
3229 char *s;
3230 unicode_t eh;
3231
3232 /* 3240 /*
3233 * Not handled yet 3241 * Not handled yet
3234 */ 3242 */
3243
3244 unicode_t eh;
3235 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3236 if (s) 3246 if (s)
3237 free (s); 3247 free (s);
3238 3248
3239 return; 3249 return;
3240} 3250}
… …
3244 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3245 */ 3255 */
3246void 3256void
3247rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3248{ 3258{
3249 unicode_t ch, eh;
3250 int arg; 3259 int arg;
3251 3260
3252 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3253 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3254 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3255 3264
3256 if (ch == ';') 3265 if (ch == ';')
3257 { 3266 {
3267 unicode_t eh;
3258 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3259 3269
3260 if (s) 3270 if (s)
3261 { 3271 {
3262 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3323 unsigned long bytes_after; 3333 unsigned long bytes_after;
3324 unsigned char *value = 0; 3334 unsigned char *value = 0;
3325 const char *str = ""; 3335 const char *str = "";
3326 3336
3327 if (prop 3337 if (prop
3328 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3329 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3330 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3331 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3332 && actual_type != None 3342 && actual_type != None
3333 && actual_format == 8) 3343 && actual_format == 8)
… …
3345 { 3355 {
3346 *eq = 0; 3356 *eq = 0;
3347 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3348 } 3358 }
3349 else 3359 else
3350 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3351 display->atom (str)); 3361 display->atom (str));
3352 } 3362 }
3353 break; 3363 break;
3354 3364
3355 case XTerm_Color: 3365 case XTerm_Color:
… …
3387 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3388 break; 3398 break;
3389 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3390 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3391 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
3392#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3393 case XTerm_Color_RV:
3394 process_color_seq (op, Color_RV, str, resp);
3395 break;
3396 case Rxvt_Color_BD:
3397 case URxvt_Color_BD: 3411 case URxvt_Color_BD:
3398 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3399 break; 3413 break;
3400 case Rxvt_Color_UL:
3401 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3402 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3403 break; 3416 break;
3404 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3405 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
… …
3413 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3414 { 3427 {
3415 bool changed = false; 3428 bool changed = false;
3416 3429
3417 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421 3432
3422 if (changed) 3433 if (changed)
3423 update_background (); 3434 update_background ();
3424 } 3435 }
3425 3436
… …
3430 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3431 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3432 { 3443 {
3433 char str[256]; 3444 char str[256];
3434 3445
3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3439 } 3450 }
3440 else 3451 else
3441 { 3452 {
3442 int changed = 0; 3453 int changed = 0;
3443 3454
3444 if (*str != ';') 3455 if (*str != ';')
3445 { 3456 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3458 {
3449 changed++; 3459 changed++;
3450 str = strchr (str, ';'); 3460 }
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 } 3461 }
3454 3462 else
3455 while (str)
3456 { 3463 {
3457 str++; 3464 str++;
3458 if (bgPixmap.set_geometry (str)) 3465 if (bg_set_geometry (str, true))
3459 changed++; 3466 changed++;
3460 str = strchr (str, ';');
3461 } 3467 }
3462 3468
3463 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 }
3464 update_background (); 3477 update_background ();
3478 }
3465 } 3479 }
3466 break; 3480 break;
3467#endif 3481#endif
3468 3482
3469 case XTerm_logfile: 3483 case XTerm_logfile:
… …
3572 { 3586 {
3573 if (mode == 'r') 3587 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3589 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3591
3577 set_privmode (bit, state); 3592 set_privmode (bit, state);
3578 } 3593 }
3579 3594
3580 return state; 3595 return state;
3581} 3596}
3582 3597
3583/* we're not using priv _yet_ */ 3598/* we're not using priv _yet_ */
3584void 3599void
3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3600rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3586{ 3601{
3587 unsigned int i, j; 3602 unsigned int i, j;
3588 int state; 3603 int state;
3589 3604
3590 static const struct 3605 static const struct
3591 { 3606 {
3592 const int argval; 3607 const int argval;
3593 const unsigned long bit; 3608 const unsigned long bit;
3594 } argtopriv[] = { 3609 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, // DECCKM 3610 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3611 { 2, PrivMode_vt52 }, // DECANM
3597 { 3, PrivMode_132 }, // DECCOLM 3612 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, // DECSCLM 3613 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, // DECSCNM 3614 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, // DECOM 3615 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, // DECAWM 3616 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, auto-repeat keys // DECARM 3617 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3618 { 9, PrivMode_MouseX10 },
3604 // 18 end FF to printer after print screen 3619 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region 3620 // 19 Print screen prints full screen/scroll region
3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3621 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3607#ifdef scrollBar_esc 3622#ifdef scrollBar_esc
3608 { scrollBar_esc, PrivMode_scrollBar }, 3623 { scrollBar_esc, PrivMode_scrollBar },
3609#endif 3624#endif
3610 { 35, PrivMode_ShiftKeys }, // rxvt extension 3625 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK 3626 // 38, tektronix mode // DECTEK
3612 { 40, PrivMode_132OK }, 3627 { 40, PrivMode_132OK },
3613 // 41 xterm more fixes NYI 3628 // 41 xterm more fixes NYI
3614 // 45 margin bell NYI 3629 // 45 margin bell NYI
3615 // 46 start logging 3630 // 46 start logging
3616 { 47, PrivMode_Screen }, 3631 { 47, PrivMode_Screen },
3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3632 { 66, PrivMode_aplKP }, // DECNKM
3618#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3619 { 67, PrivMode_BackSpace }, // DECBKM 3634 { 67, PrivMode_BackSpace }, // DECBKM
3620#endif 3635#endif
3621 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3622 { 1002, PrivMode_MouseBtnEvent }, 3637 { 1002, PrivMode_MouseBtnEvent },
3623 { 1003, PrivMode_MouseAnyEvent }, 3638 { 1003, PrivMode_MouseAnyEvent },
3639#if ENABLE_FRILLS
3640 { 1005, PrivMode_ExtModeMouse },
3641#endif
3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3625 { 1011, PrivMode_Keypress }, // rxvt extension 3643 { 1011, PrivMode_Keypress }, // rxvt extension
3644#if ENABLE_FRILLS
3645 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3646#endif
3626 // 1035 enable modifiers for alt, numlock NYI 3647 // 1035 enable modifiers for alt, numlock NYI
3627 // 1036 send ESC for meta keys NYI 3648 // 1036 send ESC for meta keys NYI
3628 // 1037 send DEL for keypad delete NYI 3649 // 1037 send DEL for keypad delete NYI
3629 { 1047, PrivMode_Screen }, 3650 { 1047, PrivMode_Screen },
3630 // 1048 save and restore cursor 3651 // 1048 save and restore cursor, implemented in code
3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3652 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3653 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste }, 3654 { 2004, PrivMode_BracketPaste },
3634 }; 3655 };
3635 3656
… …
3645 for (i = 0; i < nargs; i++) 3666 for (i = 0; i < nargs; i++)
3646 { 3667 {
3647 state = -1; 3668 state = -1;
3648 3669
3649 /* basic handling */ 3670 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3671 for (j = 0; j < ecb_array_length (argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3672 if (argtopriv[j].argval == arg[i])
3652 { 3673 {
3653 state = privcases (mode, argtopriv[j].bit); 3674 state = privcases (mode, argtopriv[j].bit);
3654 break; 3675 break;
3655 } 3676 }
… …
3733 case 1003: 3754 case 1003:
3734 if (state) 3755 if (state)
3735 { 3756 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3757 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3758 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3759 mouse_row = mouse_col = 0;
3738 vt_emask_mouse = PointerMotionMask; 3760 vt_emask_mouse = PointerMotionMask;
3739 } 3761 }
3740 else 3762 else
3741 vt_emask_mouse = NoEventMask; 3763 vt_emask_mouse = NoEventMask;
3742 3764
… …
3927 } 3949 }
3928 } 3950 }
3929} 3951}
3930/*}}} */ 3952/*}}} */
3931 3953
3932/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3933void
3934rxvt_term::process_graphics ()
3935{
3936 unicode_t ch, cmd = cmd_getc ();
3937
3938 if (cmd == 'Q')
3939 {
3940 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */
3942 return;
3943 }
3944 /* swallow other graphics sequences until terminating ':' */
3945 do
3946 ch = cmd_getc ();
3947 while (ch != ':');
3948}
3949/*}}} */
3950
3951/* ------------------------------------------------------------------------- */ 3954/* ------------------------------------------------------------------------- */
3952 3955
3953/* 3956/*
3954 * Send printf () formatted output to the command. 3957 * Send printf () formatted output to the command.
3955 * Only use for small amounts of data. 3958 * Only use for small amounts of data.
… …
3968 3971
3969/* ---------------------------------------------------------------------- */ 3972/* ---------------------------------------------------------------------- */
3970/* Write data to the pty as typed by the user, pasted with the mouse, 3973/* Write data to the pty as typed by the user, pasted with the mouse,
3971 * or generated by us in response to a query ESC sequence. 3974 * or generated by us in response to a query ESC sequence.
3972 */ 3975 */
3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3976static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3974 3977
3975void 3978void
3976rxvt_term::tt_write (const char *data, unsigned int len) 3979rxvt_term::tt_write (const char *data, unsigned int len)
3977{ 3980{
3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3981 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3983 3986
3984 if (v_buflen == 0) 3987 if (v_buflen == 0)
3985 { 3988 {
3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3989 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3987 3990
3991 max_it (written, 0);
3992
3988 if ((unsigned int)written == len) 3993 if (written == len)
3989 return; 3994 return;
3990 3995
3991 data += written; 3996 data += written;
3992 len -= written; 3997 len -= written;
3993 } 3998 }
3994 3999
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4000 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996 4001
3997 memcpy (v_buffer + v_buflen, data, len); 4002 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4003 v_buflen += len;
3999 4004
4000 pty_ev.set (ev::READ | ev::WRITE); 4005 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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