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.421 by root, Wed Oct 15 17:16:47 2008 UTC vs.
Revision 1.461 by root, Tue Nov 23 22:58:08 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 {
… …
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
… …
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.
1132 // since the linux guys additionally thought that breaking the only 1141 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1142 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1143 // we just nanosleep a bit and hope for the best.
1135 1144
1136 struct timespec ts = { 0, 1000 }; 1145 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1138 1147
… …
1191{ 1200{
1192 make_current (); 1201 make_current ();
1193 1202
1194 if (revents & ev::READ) 1203 if (revents & ev::READ)
1195 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1196 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1197 if (cmd_parse ()) 1206 cmd_parse ();
1198 break;
1199 1207
1200 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1201 pty_write (); 1209 pty_write ();
1202 1210
1203 refresh_check (); 1211 refresh_check ();
… …
1244{ 1252{
1245 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1246 int x, y; 1254 int x, y;
1247 int code = 32; 1255 int code = 32;
1248 1256
1249 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1251 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1252 { 1261 {
1253 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1254 return; 1263 return;
1264
1255 mouse_row = x; 1265 mouse_row = x;
1256 mouse_col = y; 1266 mouse_col = y;
1257 code += 32; 1267 code += 32;
1258 } 1268 }
1259 1269
… …
1262 else 1272 else
1263 { 1273 {
1264 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1276 if (button_number >= 3)
1267 button_number += (64 - 3); 1277 button_number += 64 - 3;
1268 } 1278 }
1269 1279
1270 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1271 { 1281 {
1272 /* 1282 /*
… …
1304 fputc ('A', stderr); 1314 fputc ('A', stderr);
1305 if (key_state & 32) 1315 if (key_state & 32)
1306 fputc ('2', stderr); 1316 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1318 button_number,
1309 x + 1, 1319 x,
1310 y + 1); 1320 y);
1311#endif 1321#endif
1312 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
1313 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1337 code + button_number + key_state,
1315 (32 + x + 1), 1338 32 + x,
1316 (32 + y + 1)); 1339 32 + y);
1317} 1340}
1318 1341
1319/*{{{ process an X event */ 1342/*{{{ process an X event */
1320void 1343void
1321rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1423 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1447 focus_out ();
1425 break; 1448 break;
1426 1449
1427 case ConfigureNotify: 1450 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]) 1451 if (ev.xconfigure.window == parent[0])
1432 { 1452 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 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
1435 1474
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1476 {
1438 seen_resize = 1; 1477 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1479 }
1441 else 1480 else
1442 { 1481 {
1443#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1445 { 1484 {
1446 if (mapped) 1485 if (mapped)
1447 update_background (); 1486 update_background ();
1448 else 1487 else
1449 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
1462 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463 1502
1464 break; 1503 break;
1465 1504
1466 case SelectionClear: 1505 case SelectionClear:
1467 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break; 1507 break;
1469 1508
1470 case SelectionNotify: 1509 case SelectionNotify:
1471 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1476 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1477 break; 1516 break;
1478 1517
1479 case MapNotify: 1518 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1519#ifdef HAVE_BG_PIXMAP
1481 /* 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
1482 * non-reparenting window manager. In those cases we never get first 1521 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1485 * reparenting. 1524 * reparenting.
1486 * We should not render background immidiately, as there could be several 1525 * 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 1526 * 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 1527 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive. 1528 * bit of time for ConfigureNotifies to arrive.
1490 * 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
1491 * of ConfigureNotifys for the best results. 1530 * of ConfigureNotifys for the best results.
… …
1685#endif 1724#endif
1686 1725
1687 refresh_check (); 1726 refresh_check ();
1688} 1727}
1689 1728
1729#if ENABLE_FRILLS
1690void 1730void
1691rxvt_term::set_urgency (bool enable) 1731rxvt_term::set_urgency (bool enable)
1692{ 1732{
1693 if (enable == urgency_hint) 1733 if (enable == urgency_hint)
1694 return; 1734 return;
… …
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1739 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable; 1740 urgency_hint = enable;
1701 } 1741 }
1702} 1742}
1743#endif
1703 1744
1704void 1745void
1705rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1706{ 1747{
1707 if (!focus) 1748 if (!focus)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1864 { 1905 {
1865 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1866 MEvent.clicks++; 1907 MEvent.clicks++;
1867 1908
1868 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1869 { 1910 {
1870 /* only report double clicks */ 1911 /* only report double clicks */
… …
2141 selection_make (ev.time); 2182 selection_make (ev.time);
2142 break; 2183 break;
2143 2184
2144 case Button2: 2185 case Button2:
2145 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?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2188 break;
2148 2189
2149#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2150 case Button4: 2191 case Button4:
2151 case Button5: 2192 case Button5:
… …
2185 } 2226 }
2186} 2227}
2187 2228
2188/*}}} */ 2229/*}}} */
2189 2230
2190bool 2231void
2191rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2192{ 2233{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2196 2236
2197 for (;;) 2237 for (;;)
2198 { 2238 {
… …
2292 * 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.
2293 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2294 */ 2334 */
2295 if (refreshnow) 2335 if (refreshnow)
2296 { 2336 {
2297 flag = true;
2298 scr_refresh (); 2337 scr_refresh ();
2299 want_refresh = 1; 2338 want_refresh = 1;
2300 } 2339 }
2301
2302 } 2340 }
2303 else 2341 else
2304 { 2342 {
2305 try 2343 try
2306 { 2344 {
… …
2314 } 2352 }
2315 2353
2316 ch = NOCHAR; 2354 ch = NOCHAR;
2317 } 2355 }
2318 } 2356 }
2319
2320 return flag;
2321} 2357}
2322 2358
2323// read the next character 2359// read the next character
2324wchar_t 2360wchar_t
2325rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
… …
2340 break; 2376 break;
2341 } 2377 }
2342 2378
2343 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2344 { 2380 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2381 mbstate.reset (); // reset now undefined conversion state
2346 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
2347 } 2383 }
2348 2384
2349 // assume wchar == unicode 2385 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
… …
2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2698 2734
2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2701 process_csi_seq (); 2737 process_csi_seq ();
2702 break; 2738 break;
2703 2739
2704 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2706 process_osc_seq (); 2742 process_osc_seq ();
2707 break; 2743 break;
2708 2744
2709 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710 case 'c': 2746 case 'c':
2711 mbstate.reset (); 2747 mbstate.reset ();
2712 scr_poweron (); 2748 scr_poweron ();
2713 scrollBar.show (1); 2749 scrollBar.show (1);
2714 break; 2750 break;
… …
2769 2805
2770 nargs = 0; 2806 nargs = 0;
2771 2807
2772 priv = 0; 2808 priv = 0;
2773 ch = cmd_getc (); 2809 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2775 { 2811 {
2776 /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2777 priv = ch; 2813 priv = ch;
2778 ch = cmd_getc (); 2814 ch = cmd_getc ();
2779 } 2815 }
2780 2816
2781 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
2835 2871
2836 case '?': 2872 case '?':
2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2838 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2839 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, 1049 };
2885
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2840 } 2888 }
2889 break;
2890 }
2891
2841 return; 2892 return;
2842 } 2893 }
2843 2894
2844 switch (ch) 2895 switch (ch)
2845 { 2896 {
… …
3212 * 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)'
3213 */ 3264 */
3214void 3265void
3215rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3216{ 3267{
3217 char *s;
3218 unicode_t eh;
3219
3220 /* 3268 /*
3221 * Not handled yet 3269 * Not handled yet
3222 */ 3270 */
3271
3272 unicode_t eh;
3223 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3224 if (s) 3274 if (s)
3225 free (s); 3275 free (s);
3226 3276
3227 return; 3277 return;
3228} 3278}
… …
3232 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3233 */ 3283 */
3234void 3284void
3235rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3236{ 3286{
3237 unicode_t ch, eh;
3238 int arg; 3287 int arg;
3239 3288
3240 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3241 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3242 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3243 3292
3244 if (ch == ';') 3293 if (ch == ';')
3245 { 3294 {
3295 unicode_t eh;
3246 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3247 3297
3248 if (s) 3298 if (s)
3249 { 3299 {
3250 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3274 3324
3275/* 3325/*
3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3277 */ 3327 */
3278void 3328void
3279rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3280{ 3330{
3281 int color; 3331 int color;
3282 char *buf, *name; 3332 char *buf, *name;
3283 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3284 int saveop = op; 3334 int saveop = op;
… …
3325 3375
3326 XFree (value); 3376 XFree (value);
3327 } 3377 }
3328 else 3378 else
3329 { 3379 {
3330 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3331 3381
3332 if (eq) 3382 if (eq)
3333 { 3383 {
3334 *eq = 0; 3384 *eq = 0;
3335 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
… …
3375 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3376 break; 3426 break;
3377 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3378 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3379 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
3380#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3381 case XTerm_Color_RV:
3382 process_color_seq (op, Color_RV, str, resp);
3383 break;
3384 case Rxvt_Color_BD:
3385 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3386 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3387 break; 3441 break;
3388 case Rxvt_Color_UL:
3389 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3390 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3391 break; 3444 break;
3392 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3393 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3394 break; 3447 break;
3395#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3396#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3397 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3398 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3399 { 3455 {
3400 bool changed = false; 3456 bool changed = false;
… …
3415 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3416 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3417 { 3473 {
3418 char str[256]; 3474 char str[256];
3419 3475
3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3424 } 3480 }
3425 else 3481 else
3426 { 3482 {
3427 int changed = 0; 3483 int changed = 0;
3428 3484
3429 if (*str != ';') 3485 if (*str != ';')
3430 { 3486 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3434 changed++; 3489 changed++;
3435 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3436 if (str == NULL) 3491 if (str == NULL)
3437 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3438 } 3496 }
3439 3497 else
3440 while (str)
3441 { 3498 {
3442 str++; 3499 str++;
3443 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3444 changed++; 3501 changed++;
3445 str = strchr (str, ';');
3446 } 3502 }
3447 3503
3448 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 }
3449 update_background (); 3512 update_background ();
3513 }
3450 } 3514 }
3451 break; 3515 break;
3452#endif 3516#endif
3453 3517
3454 case XTerm_logfile: 3518 case XTerm_logfile:
… …
3557 { 3621 {
3558 if (mode == 'r') 3622 if (mode == 'r')
3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3560 else 3624 else
3561 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626
3562 set_privmode (bit, state); 3627 set_privmode (bit, state);
3563 } 3628 }
3564 3629
3565 return state; 3630 return state;
3566} 3631}
… …
3575 static const struct 3640 static const struct
3576 { 3641 {
3577 const int argval; 3642 const int argval;
3578 const unsigned long bit; 3643 const unsigned long bit;
3579 } argtopriv[] = { 3644 } argtopriv[] = {
3580 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3581 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3582 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3583 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3584 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3585 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3586 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3587 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3588 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3589 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3590 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3591#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3592 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3593#endif 3659#endif
3594 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3595 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3596 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3597 // 45 margin bell NYI 3664 // 45 margin bell NYI
3598 // 46 start logging 3665 // 46 start logging
3599 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3600 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3601#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3602 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3603#endif 3670#endif
3604 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3605 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3606 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3608 { 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
3609 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3610 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3611 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3612 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3613 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3614 { 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 */
3615 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3616 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3617 }; 3690 };
3618 3691
… …
3646 3719
3647 scr_touch (true); 3720 scr_touch (true);
3648 break; 3721 break;
3649#endif 3722#endif
3650 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3651 case 1049:
3652 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3653 if (mode == 0) 3725 if (mode == 0)
3654 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3655 else if (mode == 1) 3727 else if (mode == 1)
3656 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
… …
3669 */ 3741 */
3670 set_privmode (PrivMode_vt52, 1); 3742 set_privmode (PrivMode_vt52, 1);
3671 break; 3743 break;
3672 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3673 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 }
3678 break; 3747 break;
3679 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3681 break; 3750 break;
3682 case 5: /* reverse video */ 3751 case 5: /* reverse video */
… …
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask; 3794 vt_emask_mouse = PointerMotionMask;
3726 } 3795 }
3727 else 3796 else
3728 vt_emask_mouse = NoEventMask; 3797 vt_emask_mouse = NoEventMask;
3798
3729 vt_select_input (); 3799 vt_select_input ();
3730 break; 3800 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3801 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3802 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3803 break;
3734 case 1011: /* scroll to bottom on key press */ 3804 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3805 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3806 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3807 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3808 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3809 if (!state)
3740 scr_erase_screen (2); 3810 scr_erase_screen (2);
3811
3741 scr_change_screen (state); 3812 scr_change_screen (state);
3742 break; 3813 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3814 case 1049: /* secondary screen w/ clearing first */
3815 if (option (Opt_secondaryScreen))
3816 if (state)
3817 scr_cursor (SAVE);
3818
3744 scr_change_screen (state); 3819 scr_change_screen (state);
3820
3745 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3822 if (state)
3747 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824 else
3825 scr_cursor (RESTORE);
3748 break; 3826 break;
3749 default: 3827 default:
3750 break; 3828 break;
3751 } 3829 }
3752 } 3830 }

Diff Legend

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