ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.467 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

… …
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 (bgPixmap.flags & bgPixmap_t::hasChanged)
973 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
975 scr_touch (false); 984 scr_touch (false);
976 } 985 }
977#endif 986#endif
978 987
… …
1024 } 1033 }
1025 1034
1026 display->flush (); 1035 display->flush ();
1027} 1036}
1028 1037
1029/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1030void 1039void
1031rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1032{ 1041{
1033 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1136 {
1128 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1132 1144
1133 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1135 1147
1136 w.stop (); 1148 w.stop ();
1137 } 1149 }
1138 1150
… …
1188{ 1200{
1189 make_current (); 1201 make_current ();
1190 1202
1191 if (revents & ev::READ) 1203 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1206 cmd_parse ();
1195 break;
1196 1207
1197 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1198 pty_write (); 1209 pty_write ();
1199 1210
1200 refresh_check (); 1211 refresh_check ();
… …
1241{ 1252{
1242 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1243 int x, y; 1254 int x, y;
1244 int code = 32; 1255 int code = 32;
1245 1256
1246 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1248 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1249 { 1261 {
1250 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1251 return; 1263 return;
1264
1252 mouse_row = x; 1265 mouse_row = x;
1253 mouse_col = y; 1266 mouse_col = y;
1254 code += 32; 1267 code += 32;
1255 } 1268 }
1256 1269
… …
1259 else 1272 else
1260 { 1273 {
1261 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1276 if (button_number >= 3)
1264 button_number += (64 - 3); 1277 button_number += 64 - 3;
1265 } 1278 }
1266 1279
1267 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1268 { 1281 {
1269 /* 1282 /*
… …
1301 fputc ('A', stderr); 1314 fputc ('A', stderr);
1302 if (key_state & 32) 1315 if (key_state & 32)
1303 fputc ('2', stderr); 1316 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1318 button_number,
1306 x + 1, 1319 x,
1307 y + 1); 1320 y);
1308#endif 1321#endif
1309 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1310 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1337 code + button_number + key_state,
1312 (32 + x + 1), 1338 32 + x,
1313 (32 + y + 1)); 1339 32 + y);
1314} 1340}
1315 1341
1316/*{{{ process an X event */ 1342/*{{{ process an X event */
1317void 1343void
1318rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1420 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1447 focus_out ();
1422 break; 1448 break;
1423 1449
1424 case ConfigureNotify: 1450 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1429 { 1452 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1432 1474
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1476 {
1435 seen_resize = 1; 1477 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1479 }
1438 else 1480 else
1439 { 1481 {
1440#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1442 { 1484 {
1443 if (mapped) 1485 if (mapped)
1444 update_background (); 1486 update_background ();
1445 else 1487 else
1446 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1502
1461 break; 1503 break;
1462 1504
1463 case SelectionClear: 1505 case SelectionClear:
1464 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1507 break;
1466 1508
1467 case SelectionNotify: 1509 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1473 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1474 break; 1516 break;
1475 1517
1476 case MapNotify: 1518 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1519#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1520 /* This is needed specifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first 1521 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1524 * reparenting.
1483 * We should not render background immidiately, as there could be several 1525 * We should not render background immediately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short 1527 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1528 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1529 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1530 * of ConfigureNotifys for the best results.
… …
1682#endif 1724#endif
1683 1725
1684 refresh_check (); 1726 refresh_check ();
1685} 1727}
1686 1728
1729#if ENABLE_FRILLS
1687void 1730void
1688rxvt_term::set_urgency (bool enable) 1731rxvt_term::set_urgency (bool enable)
1689{ 1732{
1690 if (enable == urgency_hint) 1733 if (enable == urgency_hint)
1691 return; 1734 return;
… …
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1739 XSetWMHints (dpy, parent[0], h);
1697 urgency_hint = enable; 1740 urgency_hint = enable;
1698 } 1741 }
1699} 1742}
1743#endif
1700 1744
1701void 1745void
1702rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1703{ 1747{
1704 if (!focus) 1748 if (!focus)
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1861 { 1905 {
1862 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1863 MEvent.clicks++; 1907 MEvent.clicks++;
1864 1908
1865 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1866 { 1910 {
1867 /* only report double clicks */ 1911 /* only report double clicks */
… …
2138 selection_make (ev.time); 2182 selection_make (ev.time);
2139 break; 2183 break;
2140 2184
2141 case Button2: 2185 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2188 break;
2145 2189
2146#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2147 case Button4: 2191 case Button4:
2148 case Button5: 2192 case Button5:
… …
2182 } 2226 }
2183} 2227}
2184 2228
2185/*}}} */ 2229/*}}} */
2186 2230
2187bool 2231void
2188rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2189{ 2233{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2193 2236
2194 for (;;) 2237 for (;;)
2195 { 2238 {
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2291 */ 2334 */
2292 if (refreshnow) 2335 if (refreshnow)
2293 { 2336 {
2294 flag = true;
2295 scr_refresh (); 2337 scr_refresh ();
2296 want_refresh = 1; 2338 want_refresh = 1;
2297 } 2339 }
2298
2299 } 2340 }
2300 else 2341 else
2301 { 2342 {
2302 try 2343 try
2303 { 2344 {
… …
2311 } 2352 }
2312 2353
2313 ch = NOCHAR; 2354 ch = NOCHAR;
2314 } 2355 }
2315 } 2356 }
2316
2317 return flag;
2318} 2357}
2319 2358
2320// read the next character 2359// read the next character
2321wchar_t 2360wchar_t
2322rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
… …
2337 break; 2376 break;
2338 } 2377 }
2339 2378
2340 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2341 { 2380 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2381 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2383 }
2345 2384
2346 // assume wchar == unicode 2385 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
… …
2656 2695
2657 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2659 { 2698 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2662 } 2701 }
2663 break; 2702 break;
2664 2703
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2695 2734
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2737 process_csi_seq ();
2699 break; 2738 break;
2700 2739
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2742 process_osc_seq ();
2704 break; 2743 break;
2705 2744
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2746 case 'c':
2708 mbstate.reset (); 2747 mbstate.reset ();
2709 scr_poweron (); 2748 scr_poweron ();
2710 scrollBar.show (1); 2749 scrollBar.show (1);
2711 break; 2750 break;
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 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 , 2775 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 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2777};
2739 2778
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2784
2746const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2747 { 2786 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 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, */ 2788 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, */ 2789 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, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2766 2805
2767 nargs = 0; 2806 nargs = 0;
2768 2807
2769 priv = 0; 2808 priv = 0;
2770 ch = cmd_getc (); 2809 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2811 {
2773 /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2813 priv = ch;
2775 ch = cmd_getc (); 2814 ch = cmd_getc ();
2776 } 2815 }
2777 2816
2778 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
2832 2871
2833 case '?': 2872 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2837 } 2888 }
2889 break;
2890 }
2891
2838 return; 2892 return;
2839 } 2893 }
2840 2894
2841 switch (ch) 2895 switch (ch)
2842 { 2896 {
… …
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3264 */
3211void 3265void
3212rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3213{ 3267{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3268 /*
3218 * Not handled yet 3269 * Not handled yet
3219 */ 3270 */
3271
3272 unicode_t eh;
3220 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3221 if (s) 3274 if (s)
3222 free (s); 3275 free (s);
3223 3276
3224 return; 3277 return;
3225} 3278}
… …
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3283 */
3231void 3284void
3232rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3233{ 3286{
3234 unicode_t ch, eh;
3235 int arg; 3287 int arg;
3236 3288
3237 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3240 3292
3241 if (ch == ';') 3293 if (ch == ';')
3242 { 3294 {
3295 unicode_t eh;
3243 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3244 3297
3245 if (s) 3298 if (s)
3246 { 3299 {
3247 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3322 3375
3323 XFree (value); 3376 XFree (value);
3324 } 3377 }
3325 else 3378 else
3326 { 3379 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3328 3381
3329 if (eq) 3382 if (eq)
3330 { 3383 {
3331 *eq = 0; 3384 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
… …
3372 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3373 break; 3426 break;
3374 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3375 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3376 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3377#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3378 case XTerm_Color_RV:
3379 process_color_seq (op, Color_RV, str, resp);
3380 break;
3381 case Rxvt_Color_BD:
3382 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3383 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3384 break; 3441 break;
3385 case Rxvt_Color_UL:
3386 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3387 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3388 break; 3444 break;
3389 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3391 break; 3447 break;
3392#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3393#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3396 { 3455 {
3397 bool changed = false; 3456 bool changed = false;
… …
3412 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3414 { 3473 {
3415 char str[256]; 3474 char str[256];
3416 3475
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3480 }
3422 else 3481 else
3423 { 3482 {
3424 int changed = 0; 3483 int changed = 0;
3425 3484
3426 if (*str != ';') 3485 if (*str != ';')
3427 { 3486 {
3428 /* reset to default scaling :*/
3429 bgPixmap.unset_geometry ();
3430 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3431 changed++; 3489 changed++;
3432 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3433 if (str == NULL) 3491 if (str == NULL)
3434 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3435 } 3496 }
3436 3497 else
3437 while (str)
3438 { 3498 {
3439 str++; 3499 str++;
3440 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3441 changed++; 3501 changed++;
3442 str = strchr (str, ';');
3443 } 3502 }
3444 3503
3445 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3446 update_background (); 3512 update_background ();
3513 }
3447 } 3514 }
3448 break; 3515 break;
3449#endif 3516#endif
3450 3517
3451 case XTerm_logfile: 3518 case XTerm_logfile:
… …
3554 { 3621 {
3555 if (mode == 'r') 3622 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3624 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626
3559 set_privmode (bit, state); 3627 set_privmode (bit, state);
3560 } 3628 }
3561 3629
3562 return state; 3630 return state;
3563} 3631}
… …
3572 static const struct 3640 static const struct
3573 { 3641 {
3574 const int argval; 3642 const int argval;
3575 const unsigned long bit; 3643 const unsigned long bit;
3576 } argtopriv[] = { 3644 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3587 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3659#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3664 // 45 margin bell NYI
3595 // 46 start logging 3665 // 46 start logging
3596 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3670#endif
3601 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3613 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3614 }; 3690 };
3615 3691
… …
3625 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3626 { 3702 {
3627 state = -1; 3703 state = -1;
3628 3704
3629 /* basic handling */ 3705 /* basic handling */
3630 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3631 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3632 { 3708 {
3633 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3634 break; 3710 break;
3635 } 3711 }
… …
3643 3719
3644 scr_touch (true); 3720 scr_touch (true);
3645 break; 3721 break;
3646#endif 3722#endif
3647 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3725 if (mode == 0)
3651 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3652 else if (mode == 1) 3727 else if (mode == 1)
3653 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
… …
3666 */ 3741 */
3667 set_privmode (PrivMode_vt52, 1); 3742 set_privmode (PrivMode_vt52, 1);
3668 break; 3743 break;
3669 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3747 break;
3676 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3678 break; 3750 break;
3679 case 5: /* reverse video */ 3751 case 5: /* reverse video */
… …
3717 case 1003: 3789 case 1003:
3718 if (state) 3790 if (state)
3719 { 3791 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3722 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3723 } 3796 }
3724 else 3797 else
3725 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3799
3726 vt_select_input (); 3800 vt_select_input ();
3727 break; 3801 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3804 break;
3731 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3807 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3810 if (!state)
3737 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
3738 scr_change_screen (state); 3813 scr_change_screen (state);
3739 break; 3814 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
3741 scr_change_screen (state); 3820 scr_change_screen (state);
3821
3742 if (option (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3823 if (state)
3744 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
3745 break; 3827 break;
3746 default: 3828 default:
3747 break; 3829 break;
3748 } 3830 }
3749 } 3831 }
… …
3943 4025
3944/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
3945/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
3946 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
3947 */ 4029 */
3948const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3949 4031
3950void 4032void
3951rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
3952{ 4034{
3953 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))

Diff Legend

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