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.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
973 { 981 {
974// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 983 scr_touch (false);
976 } 984 }
977#endif 985#endif
978 986
979 if (want_refresh) 987 if (want_refresh)
… …
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1140 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1141 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1142 // we just nanosleep a bit and hope for the best.
1135 1143
1136 struct timespec ts = { 0, 1000 }; 1144 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1138 1146
… …
1150rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1151{ 1159{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1153 1161
1154 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1155 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1157 n = 0;
1158 }
1159 1164
1160 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1163 1168
… …
1243{ 1248{
1244 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1245 int x, y; 1250 int x, y;
1246 int code = 32; 1251 int code = 32;
1247 1252
1248 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1250 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1251 { 1257 {
1252 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1253 return; 1259 return;
1260
1254 mouse_row = x; 1261 mouse_row = x;
1255 mouse_col = y; 1262 mouse_col = y;
1256 code += 32; 1263 code += 32;
1257 } 1264 }
1258 1265
… …
1261 else 1268 else
1262 { 1269 {
1263 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1272 if (button_number >= 3)
1266 button_number += (64 - 3); 1273 button_number += 64 - 3;
1267 } 1274 }
1268 1275
1269 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1270 { 1277 {
1271 /* 1278 /*
… …
1303 fputc ('A', stderr); 1310 fputc ('A', stderr);
1304 if (key_state & 32) 1311 if (key_state & 32)
1305 fputc ('2', stderr); 1312 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1314 button_number,
1308 x + 1, 1315 x,
1309 y + 1); 1316 y);
1310#endif 1317#endif
1311 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1312 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1333 code + button_number + key_state,
1314 (32 + x + 1), 1334 32 + x,
1315 (32 + y + 1)); 1335 32 + y);
1316} 1336}
1317 1337
1318/*{{{ process an X event */ 1338/*{{{ process an X event */
1319void 1339void
1320rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1443 focus_out ();
1424 break; 1444 break;
1425 1445
1426 case ConfigureNotify: 1446 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1431 { 1448 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1434 1470
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1472 {
1437 seen_resize = 1; 1473 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1475 }
1440 else 1476 else
1441 { 1477 {
1442#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1444 { 1480 {
1445 if (mapped) 1481 if (mapped)
1446 update_background (); 1482 update_background ();
1447 else 1483 else
1448 bgPixmap.invalidate (); 1484 bg_invalidate ();
1449 } 1485 }
1450#endif 1486#endif
1451 } 1487 }
1452 1488
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1490 }
1455 break; 1491 break;
1456 1492
1457 case PropertyNotify: 1493 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1495 break;
1464 1496
1465 case SelectionClear: 1497 case SelectionClear:
1466 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1499 break;
1473 1500
1474 case SelectionRequest: 1501 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1476 break; 1503 break;
1477 1504
1478 case MapNotify: 1505 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1507 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1508 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1511 * reparenting.
1485 * We should not render background immidiately, as there could be several 1512 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1514 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1491 */ 1518 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1494#endif 1521#endif
1495 mapped = 1; 1522 mapped = 1;
1496#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1524 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1513 { 1540 {
1514 do 1541 do
1515 { 1542 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1545 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1547
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1549
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1551 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1554 }
1528 1555
1529 want_refresh = 1; 1556 want_refresh = 1;
1530 } 1557 }
1531 else 1558 else
… …
1812 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1813 */ 1840 */
1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816 { 1843 {
1817 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1818 update_background (); 1845 update_background ();
1819 } 1846 }
1820 1847
1821 break; 1848 break;
1822 } 1849 }
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1865 { 1892 {
1866 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1867 MEvent.clicks++; 1894 MEvent.clicks++;
1868 1895
1869 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1870 { 1897 {
1871 /* only report double clicks */ 1898 /* only report double clicks */
… …
2142 selection_make (ev.time); 2169 selection_make (ev.time);
2143 break; 2170 break;
2144 2171
2145 case Button2: 2172 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2175 break;
2149 2176
2150#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2151 case Button4: 2178 case Button4:
2152 case Button5: 2179 case Button5:
… …
2655 2682
2656 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2658 { 2685 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2661 } 2688 }
2662 break; 2689 break;
2663 2690
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2666 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2696 break;
2668 2697
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2700 scr_set_tab (1);
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2766};
2738 2767
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2773
2745const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2746 { 2775 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2839 { 2868 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset (); 2870 scr_soft_reset ();
2842 2871
2843 static const int pm_h[] = { 7, 25 }; 2872 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845 2874
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2848 } 2877 }
2849 break; 2878 break;
2850 } 2879 }
2851 2880
2852 return; 2881 return;
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3253 */
3225void 3254void
3226rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3227{ 3256{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3257 /*
3232 * Not handled yet 3258 * Not handled yet
3233 */ 3259 */
3260
3261 unicode_t eh;
3234 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3235 if (s) 3263 if (s)
3236 free (s); 3264 free (s);
3237 3265
3238 return; 3266 return;
3239} 3267}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3272 */
3245void 3273void
3246rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3247{ 3275{
3248 unicode_t ch, eh;
3249 int arg; 3276 int arg;
3250 3277
3251 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3254 3281
3255 if (ch == ';') 3282 if (ch == ';')
3256 { 3283 {
3284 unicode_t eh;
3257 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3258 3286
3259 if (s) 3287 if (s)
3260 { 3288 {
3261 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3415 break;
3388 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3428 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3429 process_color_seq (op, Color_BD, str, resp);
3398 break; 3430 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3431 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3432 process_color_seq (op, Color_UL, str, resp);
3402 break; 3433 break;
3403 case URxvt_Color_IT: 3434 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3435 process_color_seq (op, Color_IT, str, resp);
… …
3412 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3413 { 3444 {
3414 bool changed = false; 3445 bool changed = false;
3415 3446
3416 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420 3449
3421 if (changed) 3450 if (changed)
3422 update_background (); 3451 update_background ();
3423 } 3452 }
3424 3453
… …
3429 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3431 { 3460 {
3432 char str[256]; 3461 char str[256];
3433 3462
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3463 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3467 }
3439 else 3468 else
3440 { 3469 {
3441 int changed = 0; 3470 int changed = 0;
3442 3471
3443 if (*str != ';') 3472 if (*str != ';')
3444 { 3473 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3475 {
3448 changed++; 3476 changed++;
3449 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3450 if (str == NULL) 3478 if (str == NULL)
3451 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3452 } 3483 }
3453 3484 else
3454 while (str)
3455 { 3485 {
3456 str++; 3486 str++;
3457 if (bgPixmap.set_geometry (str)) 3487 if (bg_set_geometry (str, true))
3458 changed++; 3488 changed++;
3459 str = strchr (str, ';');
3460 } 3489 }
3461 3490
3462 if (changed) 3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3463 update_background (); 3499 update_background ();
3500 }
3464 } 3501 }
3465 break; 3502 break;
3466#endif 3503#endif
3467 3504
3468 case XTerm_logfile: 3505 case XTerm_logfile:
… …
3571 { 3608 {
3572 if (mode == 'r') 3609 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3611 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613
3576 set_privmode (bit, state); 3614 set_privmode (bit, state);
3577 } 3615 }
3578 3616
3579 return state; 3617 return state;
3580} 3618}
… …
3599 { 6, PrivMode_relOrigin }, // DECOM 3637 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3638 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3639 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3641 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3642 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3646#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3618 { 67, PrivMode_BackSpace }, // DECBKM 3656 { 67, PrivMode_BackSpace }, // DECBKM
3619#endif 3657#endif
3620 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
3621 { 1002, PrivMode_MouseBtnEvent }, 3659 { 1002, PrivMode_MouseBtnEvent },
3622 { 1003, PrivMode_MouseAnyEvent }, 3660 { 1003, PrivMode_MouseAnyEvent },
3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste }, 3676 { 2004, PrivMode_BracketPaste },
3633 }; 3677 };
3634 3678
… …
3644 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3645 { 3689 {
3646 state = -1; 3690 state = -1;
3647 3691
3648 /* basic handling */ 3692 /* basic handling */
3649 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3650 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3651 { 3695 {
3652 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3653 break; 3697 break;
3654 } 3698 }
… …
3732 case 1003: 3776 case 1003:
3733 if (state) 3777 if (state)
3734 { 3778 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3737 vt_emask_mouse = PointerMotionMask; 3782 vt_emask_mouse = PointerMotionMask;
3738 } 3783 }
3739 else 3784 else
3740 vt_emask_mouse = NoEventMask; 3785 vt_emask_mouse = NoEventMask;
3741 3786
… …
3926 } 3971 }
3927 } 3972 }
3928} 3973}
3929/*}}} */ 3974/*}}} */
3930 3975
3931/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3932void
3933rxvt_term::process_graphics ()
3934{
3935 unicode_t ch, cmd = cmd_getc ();
3936
3937 if (cmd == 'Q')
3938 {
3939 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
3951 3977
3952/* 3978/*
3953 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
… …
3967 3993
3968/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
3970 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
3971 */ 3997 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973 3999
3974void 4000void
3975rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 4002{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3989 4015
3990 data += written; 4016 data += written;
3991 len -= written; 4017 len -= written;
3992 } 4018 }
3993 4019
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4021
3996 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4023 v_buflen += len;
3998 4024
3999 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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