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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 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
… …
415 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
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
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 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)
… …
569 selection_request (ev.time); 569 selection_request (ev.time);
570 return; 570 return;
571#if TODO 571#if TODO
572 /* rxvt extras */ 572 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 574 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 576 return;
579#endif 577#endif
580 } 578 }
581 } 579 }
582 } 580 }
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 646 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 648 unsigned int newlen = 1;
651 649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
652 switch (translate_keypad (keysym, kp)) 653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
653 { 656 {
654#ifndef NO_BACKSPACE_KEY 657#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 658 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 659 if (priv_modes & PrivMode_HaveBackSpace)
657 { 660 {
… …
884 commit_iso14755 (); 887 commit_iso14755 ();
885 888
886 return; 889 return;
887 } 890 }
888 891
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym) 893 if (i[0] == keysym)
891 { 894 {
892 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 (); 896 commit_iso14755 ();
894 897
… …
931 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
933#endif 936#endif
934} 937}
935 938
936#if defined (KEYSYM_RESOURCE)
937unsigned int
938rxvt_term::cmd_write (const char *str, unsigned int count)
939{
940 unsigned int n, s;
941
942 n = cmdbuf_ptr - cmdbuf_base;
943 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
944
945 if (n > 0 && s < count)
946 {
947 memmove (cmdbuf_base, cmdbuf_ptr,
948 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
949 cmdbuf_ptr = cmdbuf_base;
950 cmdbuf_endp -= n;
951 s += n;
952 }
953
954 if (count > s)
955 {
956 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
957 count = s;
958 }
959
960 for (; count--;)
961 *cmdbuf_endp++ = *str++;
962
963 cmd_parse ();
964
965 return 0;
966}
967#endif
968
969void 939void
970rxvt_term::flush () 940rxvt_term::flush ()
971{ 941{
972 flush_ev.stop (); 942 flush_ev.stop ();
973 943
974#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
975 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
976 { 946 {
977// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
978 scr_touch (false); 948 scr_touch (false);
979 } 949 }
980#endif 950#endif
981 951
982 if (want_refresh) 952 if (want_refresh)
… …
1027 } 997 }
1028 998
1029 display->flush (); 999 display->flush ();
1030} 1000}
1031 1001
1032/* checks wether a refresh is requested and starts the refresh timer */ 1002/* checks whether a refresh is requested and starts the refresh timer */
1033void 1003void
1034rxvt_term::refresh_check () 1004rxvt_term::refresh_check ()
1035{ 1005{
1036 if (want_refresh && !flush_ev.is_active ()) 1006 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1103 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1105 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1106 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1107 // we just nanosleep a bit and hope for the best.
1138 1108
1139 struct timespec ts = { 0, 1000 }; 1109 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1141 1111
… …
1147 { 1117 {
1148 } 1118 }
1149} event_handler; 1119} event_handler;
1150#endif 1120#endif
1151 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1152bool 1155bool
1153rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1154{ 1157{
1155 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1156 1159
1157 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1158 { 1161
1159 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1160 n = 0;
1161 } 1163 {
1162 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1163 memmove (cmdbuf_base, cmdbuf_ptr, n);
1164 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1166 1169
1167 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1168 1171
1169 if (r > 0) 1172 if (r > 0)
1170 { 1173 {
1171 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1172 return true; 1175 return true;
… …
1246{ 1249{
1247 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1248 int x, y; 1251 int x, y;
1249 int code = 32; 1252 int code = 32;
1250 1253
1251 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1252 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1253 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1254 { 1258 {
1255 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1256 return; 1260 return;
1261
1257 mouse_row = x; 1262 mouse_row = x;
1258 mouse_col = y; 1263 mouse_col = y;
1259 code += 32; 1264 code += 32;
1260 } 1265 }
1261 1266
… …
1264 else 1269 else
1265 { 1270 {
1266 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1267 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1268 if (button_number >= 3) 1273 if (button_number >= 3)
1269 button_number += (64 - 3); 1274 button_number += 64 - 3;
1270 } 1275 }
1271 1276
1272 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1273 { 1278 {
1274 /* 1279 /*
… …
1306 fputc ('A', stderr); 1311 fputc ('A', stderr);
1307 if (key_state & 32) 1312 if (key_state & 32)
1308 fputc ('2', stderr); 1313 fputc ('2', stderr);
1309 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1310 button_number, 1315 button_number,
1311 x + 1, 1316 x,
1312 y + 1); 1317 y);
1313#endif 1318#endif
1314 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1315 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1316 (code + button_number + key_state), 1334 code + button_number + key_state,
1317 (32 + x + 1), 1335 32 + x,
1318 (32 + y + 1)); 1336 32 + y);
1319} 1337}
1320 1338
1321/*{{{ process an X event */ 1339/*{{{ process an X event */
1322void 1340void
1323rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1425 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1426 focus_out (); 1444 focus_out ();
1427 break; 1445 break;
1428 1446
1429 case ConfigureNotify: 1447 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1433 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1434 { 1449 {
1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1437 1471
1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439 { 1473 {
1440 seen_resize = 1; 1474 seen_resize = 1;
1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442 } 1476 }
1443 else 1477 else
1444 { 1478 {
1445#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1447 { 1481 {
1448 if (mapped) 1482 if (mapped)
1449 update_background (); 1483 update_background ();
1450 else 1484 else
1451 bgPixmap.invalidate (); 1485 bg_invalidate ();
1452 } 1486 }
1453#endif 1487#endif
1454 } 1488 }
1455 1489
1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 } 1491 }
1458 break; 1492 break;
1459 1493
1460 case PropertyNotify: 1494 case PropertyNotify:
1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1466 break; 1496 break;
1467 1497
1468 case SelectionClear: 1498 case SelectionClear:
1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1470 break; 1500 break;
1471 1501
1472 case SelectionNotify:
1473 if (selection_wait == Sel_normal)
1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1475 break;
1476
1477 case SelectionRequest: 1502 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1479 break; 1504 break;
1480 1505
1481 case MapNotify: 1506 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1507#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1508 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1509 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1512 * reparenting.
1488 * We should not render background immidiately, as there could be several 1513 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1515 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1517 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1494 */ 1519 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1496 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1497#endif 1522#endif
1498 mapped = 1; 1523 mapped = 1;
1499#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1500 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1515 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1516 { 1541 {
1517 do 1542 do
1518 { 1543 {
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1521 } 1546 }
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1523 1548
1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1525 1550
1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 { 1552 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1530 } 1555 }
1531 1556
1532 want_refresh = 1; 1557 want_refresh = 1;
1533 } 1558 }
1534 else 1559 else
… …
1694rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1695{ 1720{
1696 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1697 return; 1722 return;
1698 1723
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1700 { 1725 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1703 urgency_hint = enable; 1728 urgency_hint = enable;
1704 } 1729 }
1705} 1730}
1706#endif 1731#endif
1707 1732
… …
1815 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1816 */ 1841 */
1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 { 1844 {
1820 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1821 update_background (); 1846 update_background ();
1822 } 1847 }
1823 1848
1824 break; 1849 break;
1825 } 1850 }
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1868 { 1893 {
1869 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1870 MEvent.clicks++; 1895 MEvent.clicks++;
1871 1896
1872 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1873 { 1898 {
1874 /* only report double clicks */ 1899 /* only report double clicks */
… …
2145 selection_make (ev.time); 2170 selection_make (ev.time);
2146 break; 2171 break;
2147 2172
2148 case Button2: 2173 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2176 break;
2152 2177
2153#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2154 case Button4: 2179 case Button4:
2155 case Button5: 2180 case Button5:
… …
2362 : NOCHAR; 2387 : NOCHAR;
2363} 2388}
2364 2389
2365static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2366 2391
2367/* rxvt_cmd_getc () - Return next input character */
2368/*
2369 * Return the next input character after first passing any keyboard input
2370 * to the command.
2371 */
2372wchar_t 2392wchar_t
2373rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2374{ 2394{
2375 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2376 2396
… …
2469 pclose_printer (fd); 2489 pclose_printer (fd);
2470} 2490}
2471#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2472/*}}} */ 2492/*}}} */
2473 2493
2474/* *INDENT-OFF* */
2475enum { 2494enum {
2476 C1_40 = 0x40, 2495 C1_40 = 0x40,
2477 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2478 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2479 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2480 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2481}; 2500};
2482/* *INDENT-ON* */
2483 2501
2484/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2485void 2503void
2486rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2487{ 2505{
… …
2658 2676
2659 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2660 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2661 { 2679 {
2662 wchar_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2664 } 2682 }
2665 break; 2683 break;
2666 2684
2667 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2668 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2669 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2670 break; 2690 break;
2671 2691
2672 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2673 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2674 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2724 } 2744 }
2725} 2745}
2726/*}}} */ 2746/*}}} */
2727 2747
2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2729/* *INDENT-OFF* */
2730enum { 2749enum {
2731 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2732 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2733 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2734 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740}; 2759};
2741 2760
2742#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2746 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747 2766
2748const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2749 { 2768 {
2750 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2754 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2755 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2756 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2758 }; 2777 };
2759/* *INDENT-ON* */
2760 2778
2761void 2779void
2762rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2763{ 2781{
2764 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
2842 { 2860 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset (); 2862 scr_soft_reset ();
2845 2863
2846 static const int pm_h[] = { 7, 25 }; 2864 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2848 2866
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2851 } 2869 }
2852 break; 2870 break;
2853 } 2871 }
2854 2872
2855 return; 2873 return;
… …
3074 } 3092 }
3075} 3093}
3076/*}}} */ 3094/*}}} */
3077 3095
3078#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3079/* ARGSUSED */
3080void 3097void
3081rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3082{ 3099{
3083 int x, y; 3100 int x, y;
3084 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3093 { 3110 {
3094 /* 3111 /*
3095 * commands 3112 * commands
3096 */ 3113 */
3097 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3098 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3099 break; 3116 break;
3100 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3101 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3102 break; 3119 break;
3103 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3104 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3105 break; 3122 break;
3106 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3107 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3108 break; 3125 break;
3109 case 5: /* raise window */ 3126 case 5: /* raise window */
3110 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3111 break; 3128 break;
3112 case 6: /* lower window */ 3129 case 6: /* lower window */
3113 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3114 break; 3131 break;
3115 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3116 scr_touch (true); 3133 scr_touch (true);
3117 break; 3134 break;
3118 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3129 3146
3130 /* 3147 /*
3131 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3132 */ 3149 */
3133 case 11: /* report window state */ 3150 case 11: /* report window state */
3134 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3135 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3136 break; 3153 break;
3137 case 13: /* report window position */ 3154 case 13: /* report window position */
3138 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3139 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3140 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3141 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3142 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3143 break; 3160 break;
3144 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3145 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3146 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3147 break; 3164 break;
3148 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3149 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3150 break; 3167 break;
… …
3152 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3153 break; 3170 break;
3154 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3155 { 3172 {
3156 char *s; 3173 char *s;
3157 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3158 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3159 XFree (s); 3176 XFree (s);
3160 } 3177 }
3161 break; 3178 break;
3162 case 21: /* report window title */ 3179 case 21: /* report window title */
3163 { 3180 {
3164 char *s; 3181 char *s;
3165 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3166 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3167 XFree (s); 3184 XFree (s);
3168 } 3185 }
3169 break; 3186 break;
3170 } 3187 }
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3244 */
3228void 3245void
3229rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3230{ 3247{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3248 /*
3235 * Not handled yet 3249 * Not handled yet
3236 */ 3250 */
3251
3252 unicode_t eh;
3237 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3238 if (s) 3254 if (s)
3239 free (s); 3255 free (s);
3240 3256
3241 return; 3257 return;
3242} 3258}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3263 */
3248void 3264void
3249rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3250{ 3266{
3251 unicode_t ch, eh;
3252 int arg; 3267 int arg;
3253 3268
3254 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3257 3272
3258 if (ch == ';') 3273 if (ch == ';')
3259 { 3274 {
3275 unicode_t eh;
3260 char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3261 3277
3262 if (s) 3278 if (s)
3263 { 3279 {
3264 process_xterm_seq (arg, s, eh); 3280 process_xterm_seq (arg, s, eh);
… …
3325 unsigned long bytes_after; 3341 unsigned long bytes_after;
3326 unsigned char *value = 0; 3342 unsigned char *value = 0;
3327 const char *str = ""; 3343 const char *str = "";
3328 3344
3329 if (prop 3345 if (prop
3330 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3331 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3332 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3333 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3334 && actual_type != None 3350 && actual_type != None
3335 && actual_format == 8) 3351 && actual_format == 8)
… …
3347 { 3363 {
3348 *eq = 0; 3364 *eq = 0;
3349 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3350 } 3366 }
3351 else 3367 else
3352 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3353 display->atom (str)); 3369 display->atom (str));
3354 } 3370 }
3355 break; 3371 break;
3356 3372
3357 case XTerm_Color: 3373 case XTerm_Color:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3405 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3406 break;
3391 case XTerm_Color_pointer_bg: 3407 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3408 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3419 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3420 process_color_seq (op, Color_BD, str, resp);
3401 break; 3421 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3422 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3423 process_color_seq (op, Color_UL, str, resp);
3405 break; 3424 break;
3406 case URxvt_Color_IT: 3425 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3426 process_color_seq (op, Color_IT, str, resp);
… …
3415 process_color_seq (op, Color_tint, str, resp); 3434 process_color_seq (op, Color_tint, str, resp);
3416 { 3435 {
3417 bool changed = false; 3436 bool changed = false;
3418 3437
3419 if (ISSET_PIXCOLOR (Color_tint)) 3438 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423 3440
3424 if (changed) 3441 if (changed)
3425 update_background (); 3442 update_background ();
3426 } 3443 }
3427 3444
… …
3433 if (!strcmp (str, "?")) 3450 if (!strcmp (str, "?"))
3434 { 3451 {
3435 char str[256]; 3452 char str[256];
3436 3453
3437 sprintf (str, "[%dx%d+%d+%d]", 3454 sprintf (str, "[%dx%d+%d+%d]",
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3455 min (h_scale, 32767), min (v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3456 min (h_align, 32767), min (v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST); 3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 } 3458 }
3442 else 3459 else
3443 { 3460 {
3444 int changed = 0; 3461 int changed = 0;
3445 3462
3446 if (*str != ';') 3463 if (*str != ';')
3447 { 3464 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3465 if (bg_set_file (str)) /* change pixmap */
3466 {
3451 changed++; 3467 changed++;
3452 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3453 if (str == NULL) 3469 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3455 } 3474 }
3456 3475 else
3457 while (str)
3458 { 3476 {
3459 str++; 3477 str++;
3460 if (bgPixmap.set_geometry (str)) 3478 if (bg_set_geometry (str, true))
3461 changed++; 3479 changed++;
3462 str = strchr (str, ';');
3463 } 3480 }
3464 3481
3465 if (changed) 3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3466 update_background (); 3490 update_background ();
3491 }
3467 } 3492 }
3468 break; 3493 break;
3469#endif 3494#endif
3470 3495
3471 case XTerm_logfile: 3496 case XTerm_logfile:
… …
3574 { 3599 {
3575 if (mode == 'r') 3600 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3602 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604
3579 set_privmode (bit, state); 3605 set_privmode (bit, state);
3580 } 3606 }
3581 3607
3582 return state; 3608 return state;
3583} 3609}
… …
3602 { 6, PrivMode_relOrigin }, // DECOM 3628 { 6, PrivMode_relOrigin }, // DECOM
3603 { 7, PrivMode_Autowrap }, // DECAWM 3629 { 7, PrivMode_Autowrap }, // DECAWM
3604 // 8, auto-repeat keys // DECARM 3630 // 8, auto-repeat keys // DECARM
3605 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3606 // 18 end FF to printer after print screen 3632 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region 3633 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3637#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3621 { 67, PrivMode_BackSpace }, // DECBKM 3647 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3648#endif
3623 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3650 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3651 { 1003, PrivMode_MouseAnyEvent },
3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste }, 3667 { 2004, PrivMode_BracketPaste },
3636 }; 3668 };
3637 3669
… …
3647 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3648 { 3680 {
3649 state = -1; 3681 state = -1;
3650 3682
3651 /* basic handling */ 3683 /* basic handling */
3652 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3653 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3654 { 3686 {
3655 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3656 break; 3688 break;
3657 } 3689 }
… …
3735 case 1003: 3767 case 1003:
3736 if (state) 3768 if (state)
3737 { 3769 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3740 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3741 } 3774 }
3742 else 3775 else
3743 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3744 3777
… …
3929 } 3962 }
3930 } 3963 }
3931} 3964}
3932/*}}} */ 3965/*}}} */
3933 3966
3934/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3935void
3936rxvt_term::process_graphics ()
3937{
3938 unicode_t ch, cmd = cmd_getc ();
3939
3940 if (cmd == 'Q')
3941 {
3942 /* query graphics */
3943 tt_printf ("\033G0\012"); /* no graphics */
3944 return;
3945 }
3946 /* swallow other graphics sequences until terminating ':' */
3947 do
3948 ch = cmd_getc ();
3949 while (ch != ':');
3950}
3951/*}}} */
3952
3953/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3954 3968
3955/* 3969/*
3956 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3957 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3970 3984
3971/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3972/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3973 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3974 */ 3988 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976 3990
3977void 3991void
3978rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3979{ 3993{
3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3985 3999
3986 if (v_buflen == 0) 4000 if (v_buflen == 0)
3987 { 4001 {
3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989 4003
4004 max_it (written, 0);
4005
3990 if ((unsigned int)written == len) 4006 if (written == len)
3991 return; 4007 return;
3992 4008
3993 data += written; 4009 data += written;
3994 len -= written; 4010 len -= written;
3995 } 4011 }
3996 4012
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3998 4014
3999 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len; 4016 v_buflen += len;
4001 4017
4002 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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