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.422 by root, Tue Oct 28 04:45:59 2008 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
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 }
… …
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
973 { 981 {
974// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 983 scr_touch (false);
976 } 984 }
977#endif 985#endif
978 986
979 if (want_refresh) 987 if (want_refresh)
… …
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1140 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1141 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1142 // we just nanosleep a bit and hope for the best.
1135 1143
1136 struct timespec ts = { 0, 1000 }; 1144 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1138 1146
… …
1150rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1151{ 1159{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1153 1161
1154 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1155 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1157 n = 0;
1158 }
1159 1164
1160 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1163 1168
… …
1243{ 1248{
1244 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1245 int x, y; 1250 int x, y;
1246 int code = 32; 1251 int code = 32;
1247 1252
1248 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1250 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1251 { 1257 {
1252 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1253 return; 1259 return;
1260
1254 mouse_row = x; 1261 mouse_row = x;
1255 mouse_col = y; 1262 mouse_col = y;
1256 code += 32; 1263 code += 32;
1257 } 1264 }
1258 1265
… …
1261 else 1268 else
1262 { 1269 {
1263 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1272 if (button_number >= 3)
1266 button_number += (64 - 3); 1273 button_number += 64 - 3;
1267 } 1274 }
1268 1275
1269 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1270 { 1277 {
1271 /* 1278 /*
… …
1303 fputc ('A', stderr); 1310 fputc ('A', stderr);
1304 if (key_state & 32) 1311 if (key_state & 32)
1305 fputc ('2', stderr); 1312 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1314 button_number,
1308 x + 1, 1315 x,
1309 y + 1); 1316 y);
1310#endif 1317#endif
1311 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1312 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1333 code + button_number + key_state,
1314 (32 + x + 1), 1334 32 + x,
1315 (32 + y + 1)); 1335 32 + y);
1316} 1336}
1317 1337
1318/*{{{ process an X event */ 1338/*{{{ process an X event */
1319void 1339void
1320rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1443 focus_out ();
1424 break; 1444 break;
1425 1445
1426 case ConfigureNotify: 1446 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1431 { 1448 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1434 1470
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1472 {
1437 seen_resize = 1; 1473 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1475 }
1440 else 1476 else
1441 { 1477 {
1442#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1444 { 1480 {
1445 if (mapped) 1481 if (mapped)
1446 update_background (); 1482 update_background ();
1447 else 1483 else
1448 bgPixmap.invalidate (); 1484 bg_invalidate ();
1449 } 1485 }
1450#endif 1486#endif
1451 } 1487 }
1452 1488
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1490 }
1455 break; 1491 break;
1456 1492
1457 case PropertyNotify: 1493 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1495 break;
1464 1496
1465 case SelectionClear: 1497 case SelectionClear:
1466 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1499 break;
1473 1500
1474 case SelectionRequest: 1501 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1476 break; 1503 break;
1477 1504
1478 case MapNotify: 1505 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1507 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1508 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1511 * reparenting.
1485 * We should not render background immidiately, as there could be several 1512 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1514 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1491 */ 1518 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1494#endif 1521#endif
1495 mapped = 1; 1522 mapped = 1;
1496#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1524 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1513 { 1540 {
1514 do 1541 do
1515 { 1542 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1545 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1547
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1549
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1551 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1554 }
1528 1555
1529 want_refresh = 1; 1556 want_refresh = 1;
1530 } 1557 }
1531 else 1558 else
… …
1684#endif 1711#endif
1685 1712
1686 refresh_check (); 1713 refresh_check ();
1687} 1714}
1688 1715
1716#if ENABLE_FRILLS
1689void 1717void
1690rxvt_term::set_urgency (bool enable) 1718rxvt_term::set_urgency (bool enable)
1691{ 1719{
1692 if (enable == urgency_hint) 1720 if (enable == urgency_hint)
1693 return; 1721 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1726 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1727 urgency_hint = enable;
1700 } 1728 }
1701} 1729}
1730#endif
1702 1731
1703void 1732void
1704rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1705{ 1734{
1706 if (!focus) 1735 if (!focus)
… …
1810 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1811 */ 1840 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1843 {
1815 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1816 update_background (); 1845 update_background ();
1817 } 1846 }
1818 1847
1819 break; 1848 break;
1820 } 1849 }
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1863 { 1892 {
1864 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1865 MEvent.clicks++; 1894 MEvent.clicks++;
1866 1895
1867 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1868 { 1897 {
1869 /* only report double clicks */ 1898 /* only report double clicks */
… …
2140 selection_make (ev.time); 2169 selection_make (ev.time);
2141 break; 2170 break;
2142 2171
2143 case Button2: 2172 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2175 break;
2147 2176
2148#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2149 case Button4: 2178 case Button4:
2150 case Button5: 2179 case Button5:
… …
2334 break; 2363 break;
2335 } 2364 }
2336 2365
2337 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2338 { 2367 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2368 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2370 }
2342 2371
2343 // assume wchar == unicode 2372 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
… …
2653 2682
2654 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2656 { 2685 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2659 } 2688 }
2660 break; 2689 break;
2661 2690
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2692 2721
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2724 process_csi_seq ();
2696 break; 2725 break;
2697 2726
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2729 process_osc_seq ();
2701 break; 2730 break;
2702 2731
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2733 case 'c':
2705 mbstate.reset (); 2734 mbstate.reset ();
2706 scr_poweron (); 2735 scr_poweron ();
2707 scrollBar.show (1); 2736 scrollBar.show (1);
2708 break; 2737 break;
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2764};
2736 2765
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2771
2743const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2744 { 2773 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2763 2792
2764 nargs = 0; 2793 nargs = 0;
2765 2794
2766 priv = 0; 2795 priv = 0;
2767 ch = cmd_getc (); 2796 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2798 {
2770 /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2800 priv = ch;
2772 ch = cmd_getc (); 2801 ch = cmd_getc ();
2773 } 2802 }
2774 2803
2775 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
2829 2858
2830 case '?': 2859 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2834 } 2875 }
2876 break;
2877 }
2878
2835 return; 2879 return;
2836 } 2880 }
2837 2881
2838 switch (ch) 2882 switch (ch)
2839 { 2883 {
… …
3206 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3207 */ 3251 */
3208void 3252void
3209rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3210{ 3254{
3211 char *s;
3212 unicode_t eh;
3213
3214 /* 3255 /*
3215 * Not handled yet 3256 * Not handled yet
3216 */ 3257 */
3258
3259 unicode_t eh;
3217 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3218 if (s) 3261 if (s)
3219 free (s); 3262 free (s);
3220 3263
3221 return; 3264 return;
3222} 3265}
… …
3226 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3227 */ 3270 */
3228void 3271void
3229rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3230{ 3273{
3231 unicode_t ch, eh;
3232 int arg; 3274 int arg;
3233 3275
3234 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3235 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3236 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3237 3279
3238 if (ch == ';') 3280 if (ch == ';')
3239 { 3281 {
3282 unicode_t eh;
3240 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3241 3284
3242 if (s) 3285 if (s)
3243 { 3286 {
3244 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3268 3311
3269/* 3312/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3314 */
3272void 3315void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3317{
3275 int color; 3318 int color;
3276 char *buf, *name; 3319 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3321 int saveop = op;
… …
3319 3362
3320 XFree (value); 3363 XFree (value);
3321 } 3364 }
3322 else 3365 else
3323 { 3366 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3325 3368
3326 if (eq) 3369 if (eq)
3327 { 3370 {
3328 *eq = 0; 3371 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3413 break;
3371 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3375 case XTerm_Color_RV:
3376 process_color_seq (op, Color_RV, str, resp);
3377 break;
3378 case Rxvt_Color_BD:
3379 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3381 break; 3428 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3385 break; 3431 break;
3386 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3388 break; 3434 break;
3389#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3390#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3393 { 3442 {
3394 bool changed = false; 3443 bool changed = false;
3395 3444
3396 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400 3447
3401 if (changed) 3448 if (changed)
3402 update_background (); 3449 update_background ();
3403 } 3450 }
3404 3451
… …
3409 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3411 { 3458 {
3412 char str[256]; 3459 char str[256];
3413 3460
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3465 }
3419 else 3466 else
3420 { 3467 {
3421 int changed = 0; 3468 int changed = 0;
3422 3469
3423 if (*str != ';') 3470 if (*str != ';')
3424 { 3471 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3428 changed++; 3474 changed++;
3429 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3430 if (str == NULL) 3476 if (str == NULL)
3431 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3432 } 3481 }
3433 3482 else
3434 while (str)
3435 { 3483 {
3436 str++; 3484 str++;
3437 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3438 changed++; 3486 changed++;
3439 str = strchr (str, ';');
3440 } 3487 }
3441 3488
3442 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3443 update_background (); 3497 update_background ();
3498 }
3444 } 3499 }
3445 break; 3500 break;
3446#endif 3501#endif
3447 3502
3448 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3551 { 3606 {
3552 if (mode == 'r') 3607 if (mode == 'r')
3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3554 else 3609 else
3555 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3556 set_privmode (bit, state); 3612 set_privmode (bit, state);
3557 } 3613 }
3558 3614
3559 return state; 3615 return state;
3560} 3616}
… …
3569 static const struct 3625 static const struct
3570 { 3626 {
3571 const int argval; 3627 const int argval;
3572 const unsigned long bit; 3628 const unsigned long bit;
3573 } argtopriv[] = { 3629 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3584 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3644#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3649 // 45 margin bell NYI
3592 // 46 start logging 3650 // 46 start logging
3593 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3655#endif
3598 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3602 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3603 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3604 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3605 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3606 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3607 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3608 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3609 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3610 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3611 }; 3675 };
3612 3676
… …
3622 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3623 { 3687 {
3624 state = -1; 3688 state = -1;
3625 3689
3626 /* basic handling */ 3690 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3629 { 3693 {
3630 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3631 break; 3695 break;
3632 } 3696 }
… …
3640 3704
3641 scr_touch (true); 3705 scr_touch (true);
3642 break; 3706 break;
3643#endif 3707#endif
3644 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3710 if (mode == 0)
3648 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3649 else if (mode == 1) 3712 else if (mode == 1)
3650 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
… …
3663 */ 3726 */
3664 set_privmode (PrivMode_vt52, 1); 3727 set_privmode (PrivMode_vt52, 1);
3665 break; 3728 break;
3666 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3732 break;
3673 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3675 break; 3735 break;
3676 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
3714 case 1003: 3774 case 1003:
3715 if (state) 3775 if (state)
3716 { 3776 {
3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3719 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3720 } 3781 }
3721 else 3782 else
3722 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3784
3723 vt_select_input (); 3785 vt_select_input ();
3724 break; 3786 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3789 break;
3728 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3792 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3795 if (!state)
3734 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3735 scr_change_screen (state); 3798 scr_change_screen (state);
3736 break; 3799 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3738 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3739 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3808 if (state)
3741 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3742 break; 3812 break;
3743 default: 3813 default:
3744 break; 3814 break;
3745 } 3815 }
3746 } 3816 }
… …
3940 4010
3941/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3942/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
3943 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
3944 */ 4014 */
3945const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3946 4016
3947void 4017void
3948rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3949{ 4019{
3950 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3962 4032
3963 data += written; 4033 data += written;
3964 len -= written; 4034 len -= written;
3965 } 4035 }
3966 4036
3967 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3968 4038
3969 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
3970 v_buflen += len; 4040 v_buflen += len;
3971 4041
3972 pty_ev.set (ev::READ | ev::WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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