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.428 by root, Wed Nov 5 16:17:23 2008 UTC vs.
Revision 1.477 by root, Mon Feb 21 07:41:00 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-2007 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
… …
1243{ 1251{
1244 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1245 int x, y; 1253 int x, y;
1246 int code = 32; 1254 int code = 32;
1247 1255
1248 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1250 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1251 { 1260 {
1252 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1253 return; 1262 return;
1263
1254 mouse_row = x; 1264 mouse_row = x;
1255 mouse_col = y; 1265 mouse_col = y;
1256 code += 32; 1266 code += 32;
1257 } 1267 }
1258 1268
… …
1261 else 1271 else
1262 { 1272 {
1263 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1275 if (button_number >= 3)
1266 button_number += (64 - 3); 1276 button_number += 64 - 3;
1267 } 1277 }
1268 1278
1269 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1270 { 1280 {
1271 /* 1281 /*
… …
1303 fputc ('A', stderr); 1313 fputc ('A', stderr);
1304 if (key_state & 32) 1314 if (key_state & 32)
1305 fputc ('2', stderr); 1315 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1317 button_number,
1308 x + 1, 1318 x,
1309 y + 1); 1319 y);
1310#endif 1320#endif
1311 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1312 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1336 code + button_number + key_state,
1314 (32 + x + 1), 1337 32 + x,
1315 (32 + y + 1)); 1338 32 + y);
1316} 1339}
1317 1340
1318/*{{{ process an X event */ 1341/*{{{ process an X event */
1319void 1342void
1320rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1446 focus_out ();
1424 break; 1447 break;
1425 1448
1426 case ConfigureNotify: 1449 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]) 1450 if (ev.xconfigure.window == parent[0])
1431 { 1451 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1434 1473
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1475 {
1437 seen_resize = 1; 1476 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1478 }
1440 else 1479 else
1441 { 1480 {
1442#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1444 { 1483 {
1445 if (mapped) 1484 if (mapped)
1446 update_background (); 1485 update_background ();
1447 else 1486 else
1448 bgPixmap.invalidate (); 1487 bg_invalidate ();
1449 } 1488 }
1450#endif 1489#endif
1451 } 1490 }
1452 1491
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1493 }
1455 break; 1494 break;
1456 1495
1457 case PropertyNotify: 1496 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1464 1499
1465 case SelectionClear: 1500 case SelectionClear:
1466 selection_clear (); 1501 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; 1502 break;
1473 1503
1474 case SelectionRequest: 1504 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1476 break; 1506 break;
1477 1507
1478 case MapNotify: 1508 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1510 /* 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 1511 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1514 * reparenting.
1485 * We should not render background immidiately, as there could be several 1515 * 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 1516 * 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 1517 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1491 */ 1521 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1494#endif 1524#endif
1495 mapped = 1; 1525 mapped = 1;
1496#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1513 { 1543 {
1514 do 1544 do
1515 { 1545 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1548 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1550
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1552
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1554 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1557 }
1528 1558
1529 want_refresh = 1; 1559 want_refresh = 1;
1530 } 1560 }
1531 else 1561 else
… …
1684#endif 1714#endif
1685 1715
1686 refresh_check (); 1716 refresh_check ();
1687} 1717}
1688 1718
1719#if ENABLE_FRILLS
1689void 1720void
1690rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1691{ 1722{
1692 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1693 return; 1724 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1730 urgency_hint = enable;
1700 } 1731 }
1701} 1732}
1733#endif
1702 1734
1703void 1735void
1704rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1705{ 1737{
1706 if (!focus) 1738 if (!focus)
… …
1810 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1811 */ 1843 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1846 {
1815 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1816 update_background (); 1848 update_background ();
1817 } 1849 }
1818 1850
1819 break; 1851 break;
1820 } 1852 }
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1863 { 1895 {
1864 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1865 MEvent.clicks++; 1897 MEvent.clicks++;
1866 1898
1867 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1868 { 1900 {
1869 /* only report double clicks */ 1901 /* only report double clicks */
… …
2140 selection_make (ev.time); 2172 selection_make (ev.time);
2141 break; 2173 break;
2142 2174
2143 case Button2: 2175 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 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); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2178 break;
2147 2179
2148#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2149 case Button4: 2181 case Button4:
2150 case Button5: 2182 case Button5:
… …
2334 break; 2366 break;
2335 } 2367 }
2336 2368
2337 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2338 { 2370 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2371 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2373 }
2342 2374
2343 // assume wchar == unicode 2375 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
… …
2653 2685
2654 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2656 { 2688 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2659 } 2691 }
2660 break; 2692 break;
2661 2693
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 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 , 2765 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 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2767};
2736 2768
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2774
2743const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2744 { 2776 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 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, */ 2778 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, */ 2779 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, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2837 { 2869 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2871 scr_soft_reset ();
2840 2872
2841 static const int pm_h[] = { 7, 25 }; 2873 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2875
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2846 } 2878 }
2847 break; 2879 break;
2848 } 2880 }
2849 2881
2850 return; 2882 return;
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3254 */
3223void 3255void
3224rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3225{ 3257{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3258 /*
3230 * Not handled yet 3259 * Not handled yet
3231 */ 3260 */
3261
3262 unicode_t eh;
3232 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3233 if (s) 3264 if (s)
3234 free (s); 3265 free (s);
3235 3266
3236 return; 3267 return;
3237} 3268}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3273 */
3243void 3274void
3244rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3245{ 3276{
3246 unicode_t ch, eh;
3247 int arg; 3277 int arg;
3248 3278
3249 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3252 3282
3253 if (ch == ';') 3283 if (ch == ';')
3254 { 3284 {
3285 unicode_t eh;
3255 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3256 3287
3257 if (s) 3288 if (s)
3258 { 3289 {
3259 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3283 3314
3284/* 3315/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3317 */
3287void 3318void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3320{
3290 int color; 3321 int color;
3291 char *buf, *name; 3322 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3324 int saveop = op;
… …
3334 3365
3335 XFree (value); 3366 XFree (value);
3336 } 3367 }
3337 else 3368 else
3338 { 3369 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3340 3371
3341 if (eq) 3372 if (eq)
3342 { 3373 {
3343 *eq = 0; 3374 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3416 break;
3386 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3396 break; 3431 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3400 break; 3434 break;
3401 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
… …
3410 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3411 { 3445 {
3412 bool changed = false; 3446 bool changed = false;
3413 3447
3414 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3416 else
3417 changed = bgPixmap.unset_tint ();
3418 3450
3419 if (changed) 3451 if (changed)
3420 update_background (); 3452 update_background ();
3421 } 3453 }
3422 3454
… …
3427 case Rxvt_Pixmap: 3459 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3429 { 3461 {
3430 char str[256]; 3462 char str[256];
3431 3463
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3464 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3468 }
3437 else 3469 else
3438 { 3470 {
3439 int changed = 0; 3471 int changed = 0;
3440 3472
3441 if (*str != ';') 3473 if (*str != ';')
3442 { 3474 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3446 changed++; 3477 changed++;
3447 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3448 if (str == NULL) 3479 if (str == NULL)
3449 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3450 } 3484 }
3451 3485 else
3452 while (str)
3453 { 3486 {
3454 str++; 3487 str++;
3455 if (bgPixmap.set_geometry (str)) 3488 if (bg_set_geometry (str, true))
3456 changed++; 3489 changed++;
3457 str = strchr (str, ';');
3458 } 3490 }
3459 3491
3460 if (changed) 3492 if (changed)
3493 {
3494 if (bg_window_position_sensitive ())
3495 {
3496 int x, y;
3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3461 update_background (); 3500 update_background ();
3501 }
3462 } 3502 }
3463 break; 3503 break;
3464#endif 3504#endif
3465 3505
3466 case XTerm_logfile: 3506 case XTerm_logfile:
… …
3569 { 3609 {
3570 if (mode == 'r') 3610 if (mode == 'r')
3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3572 else 3612 else
3573 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614
3574 set_privmode (bit, state); 3615 set_privmode (bit, state);
3575 } 3616 }
3576 3617
3577 return state; 3618 return state;
3578} 3619}
… …
3597 { 6, PrivMode_relOrigin }, // DECOM 3638 { 6, PrivMode_relOrigin }, // DECOM
3598 { 7, PrivMode_Autowrap }, // DECAWM 3639 { 7, PrivMode_Autowrap }, // DECAWM
3599 // 8, auto-repeat keys // DECARM 3640 // 8, auto-repeat keys // DECARM
3600 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
3601 // 18 end FF to printer after print screen 3642 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region 3643 // 19 Print screen prints full screen/scroll region
3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3604#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
3605 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
3606#endif 3647#endif
3607 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3616 { 67, PrivMode_BackSpace }, // DECBKM 3657 { 67, PrivMode_BackSpace }, // DECBKM
3617#endif 3658#endif
3618 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3619 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3620 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3622 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
3623 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3624 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3625 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3626 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3627 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste }, 3677 { 2004, PrivMode_BracketPaste },
3631 }; 3678 };
3632 3679
… …
3642 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3643 { 3690 {
3644 state = -1; 3691 state = -1;
3645 3692
3646 /* basic handling */ 3693 /* basic handling */
3647 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3648 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3649 { 3696 {
3650 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3651 break; 3698 break;
3652 } 3699 }
… …
3730 case 1003: 3777 case 1003:
3731 if (state) 3778 if (state)
3732 { 3779 {
3733 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3734 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3735 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3736 } 3784 }
3737 else 3785 else
3738 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3739 3787
… …
3751 scr_erase_screen (2); 3799 scr_erase_screen (2);
3752 3800
3753 scr_change_screen (state); 3801 scr_change_screen (state);
3754 break; 3802 break;
3755 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3756 if (state) 3805 if (state)
3757 scr_cursor (SAVE); 3806 scr_cursor (SAVE);
3758 3807
3759 scr_change_screen (state); 3808 scr_change_screen (state);
3760 3809
3810 if (option (Opt_secondaryScreen))
3761 if (state) 3811 if (state)
3762 scr_erase_screen (2); 3812 scr_erase_screen (2);
3763 else 3813 else
3764 scr_cursor (RESTORE); 3814 scr_cursor (RESTORE);
3765 break; 3815 break;
3766 default: 3816 default:
3767 break; 3817 break;
3768 } 3818 }
3769 } 3819 }
… …
3963 4013
3964/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
3965/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
3966 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
3967 */ 4017 */
3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3969 4019
3970void 4020void
3971rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
3972{ 4022{
3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3985 4035
3986 data += written; 4036 data += written;
3987 len -= written; 4037 len -= written;
3988 } 4038 }
3989 4039
3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3991 4041
3992 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
3993 v_buflen += len; 4043 v_buflen += len;
3994 4044
3995 pty_ev.set (ev::READ | ev::WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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