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.484 by sf-exg, Fri Apr 29 10:10:20 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
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
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; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
567 selection_request (ev.time); 569 selection_request (ev.time);
568 return; 570 return;
569#if TODO 571#if TODO
570 /* rxvt extras */ 572 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 574 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 576 return;
577#endif 577#endif
578 } 578 }
579 } 579 }
580 } 580 }
… …
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1; 648 unsigned int newlen = 1;
649 649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
650 switch (translate_keypad (keysym, kp)) 653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
651 { 656 {
652#ifndef NO_BACKSPACE_KEY 657#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace: 658 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace) 659 if (priv_modes & PrivMode_HaveBackSpace)
655 { 660 {
… …
882 commit_iso14755 (); 887 commit_iso14755 ();
883 888
884 return; 889 return;
885 } 890 }
886 891
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 893 if (i[0] == keysym)
889 { 894 {
890 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 896 commit_iso14755 ();
892 897
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
931#endif 936#endif
932} 937}
933 938
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 939void
968rxvt_term::flush () 940rxvt_term::flush ()
969{ 941{
970 flush_ev.stop (); 942 flush_ev.stop ();
971 943
972#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
974 { 946 {
975// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 948 scr_touch (false);
977 } 949 }
978#endif 950#endif
979 951
980 if (want_refresh) 952 if (want_refresh)
… …
1025 } 997 }
1026 998
1027 display->flush (); 999 display->flush ();
1028} 1000}
1029 1001
1030/* checks wether a refresh is requested and starts the refresh timer */ 1002/* checks whether a refresh is requested and starts the refresh timer */
1031void 1003void
1032rxvt_term::refresh_check () 1004rxvt_term::refresh_check ()
1033{ 1005{
1034 if (want_refresh && !flush_ev.is_active ()) 1006 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1129 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1102 // 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 1103 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only 1105 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool, 1106 // known workaround against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best. 1107 // we just nanosleep a bit and hope for the best.
1136 1108
1137 struct timespec ts = { 0, 1000 }; 1109 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1139 1111
… …
1145 { 1117 {
1146 } 1118 }
1147} event_handler; 1119} event_handler;
1148#endif 1120#endif
1149 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1150bool 1155bool
1151rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1152{ 1157{
1153 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1154 1159
1155 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1156 { 1161
1157 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1158 n = 0;
1159 } 1163 {
1160 1164 // 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; 1165 cmdbuf_ptr = cmdbuf_base;
1163 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1164 1169
1165 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1166 1171
1167 if (r > 0) 1172 if (r > 0)
1168 { 1173 {
1169 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1170 return true; 1175 return true;
… …
1244{ 1249{
1245 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1246 int x, y; 1251 int x, y;
1247 int code = 32; 1252 int code = 32;
1248 1253
1249 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1251 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1252 { 1258 {
1253 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1254 return; 1260 return;
1261
1255 mouse_row = x; 1262 mouse_row = x;
1256 mouse_col = y; 1263 mouse_col = y;
1257 code += 32; 1264 code += 32;
1258 } 1265 }
1259 1266
… …
1262 else 1269 else
1263 { 1270 {
1264 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1273 if (button_number >= 3)
1267 button_number += (64 - 3); 1274 button_number += 64 - 3;
1268 } 1275 }
1269 1276
1270 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1271 { 1278 {
1272 /* 1279 /*
… …
1304 fputc ('A', stderr); 1311 fputc ('A', stderr);
1305 if (key_state & 32) 1312 if (key_state & 32)
1306 fputc ('2', stderr); 1313 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1315 button_number,
1309 x + 1, 1316 x,
1310 y + 1); 1317 y);
1311#endif 1318#endif
1312 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1313 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1334 code + button_number + key_state,
1315 (32 + x + 1), 1335 32 + x,
1316 (32 + y + 1)); 1336 32 + y);
1317} 1337}
1318 1338
1319/*{{{ process an X event */ 1339/*{{{ process an X event */
1320void 1340void
1321rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1423 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1444 focus_out ();
1425 break; 1445 break;
1426 1446
1427 case ConfigureNotify: 1447 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]) 1448 if (ev.xconfigure.window == parent)
1432 { 1449 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1435 1471
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1473 {
1438 seen_resize = 1; 1474 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1476 }
1441 else 1477 else
1442 { 1478 {
1443#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1445 { 1481 {
1446 if (mapped) 1482 if (mapped)
1447 update_background (); 1483 update_background ();
1448 else 1484 else
1449 bgPixmap.invalidate (); 1485 bg_invalidate ();
1450 } 1486 }
1451#endif 1487#endif
1452 } 1488 }
1453 1489
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1491 }
1456 break; 1492 break;
1457 1493
1458 case PropertyNotify: 1494 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 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; 1496 break;
1465 1497
1466 case SelectionClear: 1498 case SelectionClear:
1467 selection_clear (); 1499 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; 1500 break;
1474 1501
1475 case SelectionRequest: 1502 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1477 break; 1504 break;
1478 1505
1479 case MapNotify: 1506 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1507#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a 1508 /* 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 1509 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1485 * reparenting. 1512 * reparenting.
1486 * We should not render background immidiately, as there could be several 1513 * 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 1514 * 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 1515 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all 1517 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1492 */ 1519 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1494 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1495#endif 1522#endif
1496 mapped = 1; 1523 mapped = 1;
1497#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1513 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1514 { 1541 {
1515 do 1542 do
1516 { 1543 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1546 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1548
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1550
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1552 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1555 }
1529 1556
1530 want_refresh = 1; 1557 want_refresh = 1;
1531 } 1558 }
1532 else 1559 else
… …
1692rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1693{ 1720{
1694 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1695 return; 1722 return;
1696 1723
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1698 { 1725 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1701 urgency_hint = enable; 1728 urgency_hint = enable;
1702 } 1729 }
1703} 1730}
1704#endif 1731#endif
1705 1732
… …
1813 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1814 */ 1841 */
1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 { 1844 {
1818 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1819 update_background (); 1846 update_background ();
1820 } 1847 }
1821 1848
1822 break; 1849 break;
1823 } 1850 }
… …
1862 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1863 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1864#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1865 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1866 { 1893 {
1867 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1868 MEvent.clicks++; 1895 MEvent.clicks++;
1869 1896
1870 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1871 { 1898 {
1872 /* only report double clicks */ 1899 /* only report double clicks */
… …
2143 selection_make (ev.time); 2170 selection_make (ev.time);
2144 break; 2171 break;
2145 2172
2146 case Button2: 2173 case Button2:
2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 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); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149 break; 2176 break;
2150 2177
2151#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2152 case Button4: 2179 case Button4:
2153 case Button5: 2180 case Button5:
… …
2360 : NOCHAR; 2387 : NOCHAR;
2361} 2388}
2362 2389
2363static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2364 2391
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 2392wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2394{
2373 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2374 2396
… …
2656 2678
2657 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
2659 { 2681 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2662 } 2684 }
2663 break; 2685 break;
2664 2686
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2667 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2692 break;
2669 2693
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2696 scr_set_tab (1);
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 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 , 2760 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 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2762};
2739 2763
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2769
2746const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2747 { 2771 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 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, */ 2773 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, */ 2774 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, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2840 { 2864 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset (); 2866 scr_soft_reset ();
2843 2867
2844 static const int pm_h[] = { 7, 25 }; 2868 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2846 2870
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2849 } 2873 }
2850 break; 2874 break;
2851 } 2875 }
2852 2876
2853 return; 2877 return;
… …
3091 { 3115 {
3092 /* 3116 /*
3093 * commands 3117 * commands
3094 */ 3118 */
3095 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3096 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3097 break; 3121 break;
3098 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3099 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3100 break; 3124 break;
3101 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3102 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3103 break; 3127 break;
3104 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3106 break; 3130 break;
3107 case 5: /* raise window */ 3131 case 5: /* raise window */
3108 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3109 break; 3133 break;
3110 case 6: /* lower window */ 3134 case 6: /* lower window */
3111 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3112 break; 3136 break;
3113 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3114 scr_touch (true); 3138 scr_touch (true);
3115 break; 3139 break;
3116 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3127 3151
3128 /* 3152 /*
3129 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3130 */ 3154 */
3131 case 11: /* report window state */ 3155 case 11: /* report window state */
3132 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3134 break; 3158 break;
3135 case 13: /* report window position */ 3159 case 13: /* report window position */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3137 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3138 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3139 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3140 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3141 break; 3165 break;
3142 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3145 break; 3169 break;
3146 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3147 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3148 break; 3172 break;
… …
3150 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3151 break; 3175 break;
3152 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3153 { 3177 {
3154 char *s; 3178 char *s;
3155 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3157 XFree (s); 3181 XFree (s);
3158 } 3182 }
3159 break; 3183 break;
3160 case 21: /* report window title */ 3184 case 21: /* report window title */
3161 { 3185 {
3162 char *s; 3186 char *s;
3163 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s); 3189 XFree (s);
3166 } 3190 }
3167 break; 3191 break;
3168 } 3192 }
… …
3224 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3225 */ 3249 */
3226void 3250void
3227rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3228{ 3252{
3229 char *s;
3230 unicode_t eh;
3231
3232 /* 3253 /*
3233 * Not handled yet 3254 * Not handled yet
3234 */ 3255 */
3256
3257 unicode_t eh;
3235 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3236 if (s) 3259 if (s)
3237 free (s); 3260 free (s);
3238 3261
3239 return; 3262 return;
3240} 3263}
… …
3244 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3245 */ 3268 */
3246void 3269void
3247rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3248{ 3271{
3249 unicode_t ch, eh;
3250 int arg; 3272 int arg;
3251 3273
3252 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3253 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3254 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3255 3277
3256 if (ch == ';') 3278 if (ch == ';')
3257 { 3279 {
3280 unicode_t eh;
3258 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3259 3282
3260 if (s) 3283 if (s)
3261 { 3284 {
3262 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3323 unsigned long bytes_after; 3346 unsigned long bytes_after;
3324 unsigned char *value = 0; 3347 unsigned char *value = 0;
3325 const char *str = ""; 3348 const char *str = "";
3326 3349
3327 if (prop 3350 if (prop
3328 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3329 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3330 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3331 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3332 && actual_type != None 3355 && actual_type != None
3333 && actual_format == 8) 3356 && actual_format == 8)
… …
3345 { 3368 {
3346 *eq = 0; 3369 *eq = 0;
3347 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3348 } 3371 }
3349 else 3372 else
3350 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3351 display->atom (str)); 3374 display->atom (str));
3352 } 3375 }
3353 break; 3376 break;
3354 3377
3355 case XTerm_Color: 3378 case XTerm_Color:
… …
3387 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3388 break; 3411 break;
3389 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3390 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3391 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3392#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#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: 3424 case URxvt_Color_BD:
3398 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3399 break; 3426 break;
3400 case Rxvt_Color_UL:
3401 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3402 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3403 break; 3429 break;
3404 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3405 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
… …
3413 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3414 { 3440 {
3415 bool changed = false; 3441 bool changed = false;
3416 3442
3417 if (ISSET_PIXCOLOR (Color_tint)) 3443 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421 3445
3422 if (changed) 3446 if (changed)
3423 update_background (); 3447 update_background ();
3424 } 3448 }
3425 3449
… …
3430 case Rxvt_Pixmap: 3454 case Rxvt_Pixmap:
3431 if (!strcmp (str, "?")) 3455 if (!strcmp (str, "?"))
3432 { 3456 {
3433 char str[256]; 3457 char str[256];
3434 3458
3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3459 sprintf (str, "[%dx%d+%d+%d]",
3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3460 min (h_scale, 32767), min (v_scale, 32767),
3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3461 min (h_align, 32767), min (v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST); 3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3439 } 3463 }
3440 else 3464 else
3441 { 3465 {
3442 int changed = 0; 3466 int changed = 0;
3443 3467
3444 if (*str != ';') 3468 if (*str != ';')
3445 { 3469 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */ 3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3449 changed++; 3472 changed++;
3450 str = strchr (str, ';'); 3473 str = strchr (str, ';');
3451 if (str == NULL) 3474 if (str == NULL)
3452 bgPixmap.set_defaultGeometry (); 3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3453 } 3479 }
3454 3480 else
3455 while (str)
3456 { 3481 {
3457 str++; 3482 str++;
3458 if (bgPixmap.set_geometry (str)) 3483 if (bg_set_geometry (str, true))
3459 changed++; 3484 changed++;
3460 str = strchr (str, ';');
3461 } 3485 }
3462 3486
3463 if (changed) 3487 if (changed)
3488 {
3489 if (bg_window_position_sensitive ())
3490 {
3491 int x, y;
3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3464 update_background (); 3495 update_background ();
3496 }
3465 } 3497 }
3466 break; 3498 break;
3467#endif 3499#endif
3468 3500
3469 case XTerm_logfile: 3501 case XTerm_logfile:
… …
3572 { 3604 {
3573 if (mode == 'r') 3605 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3607 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609
3577 set_privmode (bit, state); 3610 set_privmode (bit, state);
3578 } 3611 }
3579 3612
3580 return state; 3613 return state;
3581} 3614}
… …
3600 { 6, PrivMode_relOrigin }, // DECOM 3633 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, // DECAWM 3634 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, auto-repeat keys // DECARM 3635 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
3604 // 18 end FF to printer after print screen 3637 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region 3638 // 19 Print screen prints full screen/scroll region
3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3607#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3608 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3609#endif 3642#endif
3610 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3619 { 67, PrivMode_BackSpace }, // DECBKM 3652 { 67, PrivMode_BackSpace }, // DECBKM
3620#endif 3653#endif
3621 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
3622 { 1002, PrivMode_MouseBtnEvent }, 3655 { 1002, PrivMode_MouseBtnEvent },
3623 { 1003, PrivMode_MouseAnyEvent }, 3656 { 1003, PrivMode_MouseAnyEvent },
3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3625 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
3626 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
3627 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
3628 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
3629 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
3630 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste }, 3672 { 2004, PrivMode_BracketPaste },
3634 }; 3673 };
3635 3674
… …
3645 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
3646 { 3685 {
3647 state = -1; 3686 state = -1;
3648 3687
3649 /* basic handling */ 3688 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
3652 { 3691 {
3653 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
3654 break; 3693 break;
3655 } 3694 }
… …
3733 case 1003: 3772 case 1003:
3734 if (state) 3773 if (state)
3735 { 3774 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3738 vt_emask_mouse = PointerMotionMask; 3778 vt_emask_mouse = PointerMotionMask;
3739 } 3779 }
3740 else 3780 else
3741 vt_emask_mouse = NoEventMask; 3781 vt_emask_mouse = NoEventMask;
3742 3782
… …
3927 } 3967 }
3928 } 3968 }
3929} 3969}
3930/*}}} */ 3970/*}}} */
3931 3971
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/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
3952 3973
3953/* 3974/*
3954 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
3955 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
3968 3989
3969/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
3970/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* 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. 3992 * or generated by us in response to a query ESC sequence.
3972 */ 3993 */
3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3974 3995
3975void 3996void
3976rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
3977{ 3998{
3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3983 4004
3984 if (v_buflen == 0) 4005 if (v_buflen == 0)
3985 { 4006 {
3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3987 4008
4009 max_it (written, 0);
4010
3988 if ((unsigned int)written == len) 4011 if (written == len)
3989 return; 4012 return;
3990 4013
3991 data += written; 4014 data += written;
3992 len -= written; 4015 len -= written;
3993 } 4016 }
3994 4017
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996 4019
3997 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4021 v_buflen += len;
3999 4022
4000 pty_ev.set (ev::READ | ev::WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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