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.175 by root, Sat Dec 11 17:18:29 2004 UTC vs.
Revision 1.203 by root, Sat Jun 18 09:02:37 2005 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <signal.h> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 62
… …
114 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 119 XK_Print, 0x2399,
117 120
118 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
120 0, 131 0,
121}; 132};
122 133
123void 134void
124rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
159 172
160#if ENABLE_COMBINING 173#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 193
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 195
… …
195#endif 208#endif
196 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
198 } 211 }
199 212
200 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
201 216
202#if ENABLE_COMBINING 217#if ENABLE_COMBINING
203 if (alloc) 218 if (alloc)
204 delete [] alloc; 219 delete [] alloc;
205#endif 220#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
275 * 290 *
276 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
277 */ 292 */
278 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
281 296
282 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
283 { 298 {
284 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 320
306 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
310 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
313 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 331 SET_LOCALE (locale);
315 332
316 if (status_return == XLookupChars 333 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
345 } 362 }
346 363
347 if (valid_keysym) 364 if (valid_keysym)
348 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
349 if (TermWin.saveLines) 371 if (TermWin.saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
… …
487 } 509 }
488#endif 510#endif
489 511
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 513 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 514 {
518 newlen = 1; 515 newlen = 1;
519 switch (keysym) 516 switch (keysym)
520 { 517 {
521#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
529 else 526 else
530 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
531 break; 528 break;
532#endif 529#endif
533#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
534 case XK_Delete: 541 case XK_Delete:
535 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
536 break; 543 break;
537#endif 544#endif
538 case XK_Tab: 545 case XK_Tab:
… …
641#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
642 case XK_KP_Begin: 649 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
644 break; 651 break;
645 652
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 653#endif
654 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
689 break; 689 break;
690 690
691 case XK_Find: 691 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
693 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
694 case XK_Insert: 705 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
696 break; 707 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 709 case DXK_Remove:
… …
788#undef FKEY 799#undef FKEY
789 default: 800 default:
790 newlen = 0; 801 newlen = 0;
791 break; 802 break;
792 } 803 }
804
793 if (newlen) 805 if (newlen)
794 len = strlen (kbuf); 806 len = strlen (kbuf);
795 } 807 }
796 808
797 /* 809 /*
… …
805 } 817 }
806 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
807 { 819 {
808 len = 1; 820 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
810 } 827 }
811 else 828 else
812 { 829 {
813#ifdef META8_OPTION 830#ifdef META8_OPTION
814 /* set 8-bit on */ 831 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
875} 892}
876/*}}} */ 893/*}}} */
877 894
878#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
881unsigned int 898unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 900{
… …
906 923
907 cmd_parse (); 924 cmd_parse ();
908 925
909 return 0; 926 return 0;
910} 927}
911#endif /* MENUBAR_MAX */ 928#endif
912 929
913void 930void
914rxvt_term::flush () 931rxvt_term::flush ()
915{ 932{
916 flush_ev.stop (); 933 flush_ev.stop ();
… …
1017{ 1034{
1018 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1022 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1044 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1046 }
1026} 1047}
… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1080{
1060 SET_R (this); 1081 SET_R (this);
1061 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
1062 1083
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1086 while (pty_fill ())
1068 if (cmd_parse ()) 1087 if (cmd_parse ())
1069 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1070} 1092}
1071 1093
1072void 1094void
1073rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1074{ 1096{
… …
1088rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1089{ 1111{
1090 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1091 return; 1113 return;
1092 1114
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094 XFlush (display->display); 1116 XFlush (display->display);
1095 1117
1096 hidden_pointer = 1; 1118 hidden_pointer = 1;
1097} 1119}
1098 1120
… …
1187 1209
1188/*{{{ process an X event */ 1210/*{{{ process an X event */
1189void 1211void
1190rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1191{ 1213{
1214 dDisp;
1215
1192 SET_R (this); 1216 SET_R (this);
1193 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1194 1218
1195#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1312 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1313 break; 1337 break;
1314 1338
1315 case ClientMessage: 1339 case ClientMessage:
1316 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1319#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1325 { 1367 {
1326 /* Get Dnd data */ 1368 /* Get Dnd data */
1327 Atom ActualType; 1369 Atom ActualType;
1328 int ActualFormat; 1370 int ActualFormat;
1329 unsigned char *data; 1371 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1331 1373
1332 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1376 0L, 1000000L,
1335 False, AnyPropertyType, 1377 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1338 &data); 1380 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1381 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1382 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1385 }
1344#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1345 break; 1387 break;
1346 1388
1347 case MappingNotify: 1389 case MappingNotify:
… …
1372 break; 1414 break;
1373 } 1415 }
1374 break; 1416 break;
1375 1417
1376 case FocusIn: 1418 case FocusIn:
1377 if (!TermWin.focus) 1419 focus_in ();
1378 {
1379 TermWin.focus = 1;
1380 want_refresh = 1;
1381#ifdef USE_XIM
1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1385 XSetICFocus (Input_Context);
1386 }
1387#endif
1388#ifdef CURSOR_BLINK
1389 if (options & Opt_cursorBlink)
1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1398#endif
1399
1400 }
1401 break; 1420 break;
1402 1421
1403 case FocusOut: 1422 case FocusOut:
1404 if (TermWin.focus) 1423 focus_out ();
1405 {
1406 TermWin.focus = 0;
1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1415#ifdef USE_XIM
1416 if (Input_Context != NULL)
1417 XUnsetICFocus (Input_Context);
1418#endif
1419#ifdef CURSOR_BLINK
1420 if (options & Opt_cursorBlink)
1421 cursor_blink_ev.stop ();
1422 hidden_cursor = 0;
1423#endif
1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1431 }
1432 break; 1424 break;
1433 1425
1434 case ConfigureNotify: 1426 case ConfigureNotify:
1435 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1436 { 1428 {
… …
1440 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 } 1436 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1446 1438
1447 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1448 { 1440 {
1449 seen_resize = 1; 1441 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
… …
1468 selection_clear (); 1460 selection_clear ();
1469 break; 1461 break;
1470 1462
1471 case SelectionNotify: 1463 case SelectionNotify:
1472 if (selection_wait == Sel_normal) 1464 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, 1465 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 ev.xselection.property, True);
1475 break; 1466 break;
1476 1467
1477 case SelectionRequest: 1468 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1469 selection_send (ev.xselectionrequest);
1479 break; 1470 break;
… …
1503 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1504 { 1495 {
1505 do 1496 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1509 1500
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1502
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1515 1506
1516 scr_refresh (refresh_type); 1507 scr_refresh (refresh_type);
1517 } 1508 }
1518 else 1509 else
1519 { 1510 {
1520 XEvent unused_event; 1511 XEvent unused_event;
1521 1512
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1514 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1516 ;
1526 1517
1527 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1528 { 1519 {
1529 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1534 menubar_expose (); 1525 menubar_expose ();
1535#endif 1526#endif
1536 1527
1537#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1530 XClearWindow (disp, ev.xany.window);
1540#endif 1531#endif
1541 } 1532 }
1542 break; 1533 break;
1543 1534
1544 case MotionNotify: 1535 case MotionNotify:
… …
1558 1549
1559 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1560 { 1551 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1553 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1564 ; 1555 ;
1565 1556
1566 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1567 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1561 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1635#endif 1626#endif
1636 } 1627 }
1637 } 1628 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1630 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1642 ; 1633 ;
1643 1634
1644 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1639 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1654 } 1645 }
1655 break; 1646 break;
1656 } 1647 }
1657} 1648}
1658 1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#ifdef USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#ifdef CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#ifdef OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#ifdef USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#ifdef CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#ifdef OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1708 }
1709}
1710
1659#if TRANSPARENT 1711#if TRANSPARENT
1660void 1712void
1661rxvt_term::rootwin_cb (XEvent &ev) 1713rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1714{
1663 SET_R (this); 1715 SET_R (this);
… …
1668 case PropertyNotify: 1720 case PropertyNotify:
1669 /* 1721 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1722 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1723 * use the property to determine the pixmap. We use it later on.
1672 */ 1724 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1727 return;
1678 1728
1679 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1680 case ReparentNotify: 1730 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1753 { 1803 {
1754 case Button1: 1804 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1805 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1806 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1807#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1808 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1809#else
1760 selection.rect = false; 1810 selection.rect = false;
1761#endif 1811#endif
1762 1812
1763 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2142 int i;
2093 2143
2094 Visual* visual = display->visual; 2144 Visual *visual = display->visual;
2095 2145
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2147
2098 /* for convenience */ 2148 /* for convenience */
2099 mask_r = visual->red_mask; 2149 mask_r = visual->red_mask;
… …
2320 Atom atype; 2370 Atom atype;
2321 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2372 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2325 2376
2326 pchanged = 0; 2377 pchanged = 0;
2327 2378
2328 if (!(options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
2330 2381
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
2333 2384
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2335 2386
2336 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2337 { 2388 {
2338 if (am_transparent) 2389 if (am_transparent)
2339 { 2390 {
2340 pchanged = 1; 2391 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2343 } 2394 }
2344 2395
2345 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2346 } 2397 }
2347 2398
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2400 XSync (disp, False);
2350 2401
2351 /* 2402 /*
2352 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2355 */ 2406 */
2356 i = (xa[XA_XROOTPMAPID] 2407 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2360 2411
2361 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2366 2417
2367 if (!i || prop == NULL 2418 if (!i || prop == NULL
2368#if TINTING 2419#if TINTING
… …
2387 Window cr; 2438 Window cr;
2388 XImage *image; 2439 XImage *image;
2389 GC gc; 2440 GC gc;
2390 XGCValues gcvalue; 2441 XGCValues gcvalue;
2391 2442
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2447 nx = ny = 0;
2397 2448
… …
2410 } 2461 }
2411 2462
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414 2465
2415 XSync (display->display, False); 2466 XSync (disp, False);
2416 allowedxerror = -1; 2467 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2469
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2472 allowedxerror = 0;
2422 2473
… …
2425 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2426 { 2477 {
2427 pchanged = 1; 2478 pchanged = 1;
2428 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2429 { 2480 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2431 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2432 } 2483 }
2433 } 2484 }
2434 2485
2435 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2436 } 2487 }
2437 else 2488 else
2438 { 2489 {
2439 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2441 2492
2442#if TINTING 2493#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2495 {
2445 unsigned short rm, gm, bm; 2496 unsigned short rm, gm, bm;
… …
2449 2500
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2502 }
2452#endif 2503#endif
2453 2504
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2455 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2511 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2513 XClearWindow (disp, TermWin.parent[0]);
2463 2514
2464 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2516 pchanged = 1;
2466 2517
2467 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2468 } 2519 }
2469 } 2520 }
2470 2521
2471 if (am_pixmap_trans) 2522 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2473 else 2524 else
2474 { 2525 {
2475 unsigned int n; 2526 unsigned int n;
2476 /* 2527 /*
2477 * InheritPixmap transparency 2528 * InheritPixmap transparency
2478 */ 2529 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2480 { 2531 {
2481 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2484 XFree (list); 2535 XFree (list);
2485 2536
2486 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2487 { 2538 {
… …
2499 2550
2500 if (pchanged) 2551 if (pchanged)
2501 { 2552 {
2502 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2503 { 2554 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2557 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2508 break; 2559 break;
2509 } 2560 }
2510 } 2561 }
2511 } 2562 }
2512 2563
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2514 { 2565 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2568 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2519 } 2570 }
2520 else 2571 else
2521 { 2572 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2576 sleep (1);
2526#endif 2577#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2528 { 2579 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2581 XClearWindow (disp, TermWin.parent[n]);
2531 } 2582 }
2532 2583
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2534 am_transparent = 1; 2585 am_transparent = 1;
2535 } 2586 }
2536 2587
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2539 } 2590 }
2540 2591
2541 if (scrollBar.win) 2592 if (scrollBar.win)
2542 { 2593 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2595 scrollBar.setIdle ();
2545 scrollbar_show (0); 2596 scrollbar_show (0);
2546 } 2597 }
2547 2598
2548 if (am_transparent) 2599 if (am_transparent)
… …
2586 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2641 // resized.
2591 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2593 } 2644 }
2594 2645
2595 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
… …
2709 if (len == (size_t)-1) 2760 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2761 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2762
2712 // assume wchar == unicode 2763 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2764 cmdbuf_ptr += len;
2714 return wc; 2765 return wc & UNICODE_MASK;
2715 } 2766 }
2716 2767
2717 return NOCHAR; 2768 return NOCHAR;
2718} 2769}
2719 2770
… …
3182 { 3233 {
3183 switch (priv) 3234 switch (priv)
3184 { 3235 {
3185 case '>': 3236 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3237 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3238 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3239 break;
3189 case '?': 3240 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3241 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3242 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3243 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3472rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3473{
3423 int x, y; 3474 int x, y;
3424 XWindowAttributes wattr; 3475 XWindowAttributes wattr;
3425 Window wdummy; 3476 Window wdummy;
3477 dDisp;
3426 3478
3427 if (nargs == 0) 3479 if (nargs == 0)
3428 return; 3480 return;
3429 3481
3430 switch (args[0]) 3482 switch (args[0])
3431 { 3483 {
3432 /* 3484 /*
3433 * commands 3485 * commands
3434 */ 3486 */
3435 case 1: /* deiconify window */ 3487 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3488 XMapWindow (disp, TermWin.parent[0]);
3437 break; 3489 break;
3438 case 2: /* iconify window */ 3490 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3491 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3492 break;
3442 case 3: /* set position (pixels) */ 3493 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3494 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3444 break; 3495 break;
3445 case 4: /* set size (pixels) */ 3496 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3497 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3498 break;
3448 case 5: /* raise window */ 3499 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3500 XRaiseWindow (disp, TermWin.parent[0]);
3450 break; 3501 break;
3451 case 6: /* lower window */ 3502 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3503 XLowerWindow (disp, TermWin.parent[0]);
3453 break; 3504 break;
3454 case 7: /* refresh window */ 3505 case 7: /* refresh window */
3455 scr_touch (true); 3506 scr_touch (true);
3456 break; 3507 break;
3457 case 8: /* set size (chars) */ 3508 case 8: /* set size (chars) */
… …
3469 3520
3470 /* 3521 /*
3471 * reports - some output format copied from XTerm 3522 * reports - some output format copied from XTerm
3472 */ 3523 */
3473 case 11: /* report window state */ 3524 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3526 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3527 break;
3477 case 13: /* report window position */ 3528 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3530 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3531 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3532 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3533 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3534 break;
3484 case 14: /* report window size (pixels) */ 3535 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3536 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3537 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3538 break;
3488 case 18: /* report text area size (chars) */ 3539 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3540 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3490 break; 3541 break;
… …
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3493 break; 3544 break;
3494 case 20: /* report icon label */ 3545 case 20: /* report icon label */
3495 { 3546 {
3496 char *s; 3547 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3548 XGetIconName (disp, TermWin.parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3549 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3550 XFree (s);
3500 } 3551 }
3501 break; 3552 break;
3502 case 21: /* report window title */ 3553 case 21: /* report window title */
3503 { 3554 {
3504 char *s; 3555 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3556 XFetchName (disp, TermWin.parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3558 XFree (s);
3508 } 3559 }
3509 break; 3560 break;
3510 } 3561 }
… …
3543 else if (ch < 0x20) 3594 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3595 return NULL; /* other control character - exit */
3545 3596
3546 seen_esc = false; 3597 seen_esc = false;
3547 3598
3548 if (n >= sizeof (string) - 1) 3599 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3600 // stop at some sane length
3550 return NULL; 3601 return NULL;
3551 3602
3552 if (ch == C0_SYN) 3603 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3604 string[n++] = cmd_get8 ();
… …
3621 set_window_color (color, str); 3672 set_window_color (color, str);
3622} 3673}
3623 3674
3624/* 3675/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3676 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3677 */
3649void 3678void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3679rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3651{ 3680{
3652 int changed = 0; 3681 int changed = 0;
3653 int color; 3682 int color;
3654 char *buf, *name; 3683 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3684 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3685 int saveop = op;
3686 dDisp;
3657 3687
3658 assert (str != NULL); 3688 assert (str != NULL);
3659 switch (op) 3689 switch (op)
3660 { 3690 {
3661 case XTerm_name: 3691 case XTerm_name:
… …
3677 unsigned long bytes_after; 3707 unsigned long bytes_after;
3678 unsigned char *value = 0; 3708 unsigned char *value = 0;
3679 const char *str = ""; 3709 const char *str = "";
3680 3710
3681 if (prop 3711 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3712 && XGetWindowProperty (disp, TermWin.parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3713 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3714 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3715 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3716 && actual_type != None
3687 && actual_format == 8) 3717 && actual_format == 8)
… …
3699 { 3729 {
3700 *eq = 0; 3730 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3731 set_utf8_property (display->atom (str), eq + 1);
3702 } 3732 }
3703 else 3733 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3734 XDeleteProperty (disp, TermWin.parent[0],
3705 display->atom (str)); 3735 display->atom (str));
3706 } 3736 }
3707 break; 3737 break;
3708 3738
3709 case XTerm_Color: 3739 case XTerm_Color:
… …
3750 break; 3780 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3781#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD: 3782 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3783 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break; 3784 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL: 3785 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3786 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break; 3787 break;
3761 case XTerm_Color_RV: 3788 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3789 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3790 break;
3791 case URxvt_Color_IT:
3792 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3793 break;
3764#endif 3794#endif
3765#if TRANSPARENT && TINTING 3795#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3796 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3797 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3798 check_our_parents ();
3769 if (am_transparent) 3799 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3800 want_full_refresh = want_refresh = 1;
3771 break; 3801 break;
3772#endif 3802#endif
… …
3784 { 3814 {
3785 str++; 3815 str++;
3786#if XPM_BACKGROUND 3816#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3817 changed += scale_pixmap (str);
3788#endif 3818#endif
3789
3790 } 3819 }
3820
3791 if (changed) 3821 if (changed)
3792 { 3822 {
3793#ifdef XPM_BACKGROUND 3823#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3824 resize_pixmap ();
3795#endif 3825#endif
… …
3806 3836
3807 case XTerm_logfile: 3837 case XTerm_logfile:
3808 // TODO, when secure mode? 3838 // TODO, when secure mode?
3809 break; 3839 break;
3810 3840
3841#ifdef MENUBAR
3842 case URxvt_Menu:
3843 if (options & Opt_insecure)
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3845 break;
3846#endif
3847#if 0
3848 case XTerm_dumpscreen: /* no error notices */
3849 {
3850 int fd;
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break;
3858#endif
3811 case XTerm_font: 3859 case XTerm_font:
3812 op = URxvt_font; 3860 op = URxvt_font;
3813 case URxvt_font: 3861 case URxvt_font:
3814#if ENABLE_STYLES 3862#if ENABLE_STYLES
3815 case URxvt_boldFont: 3863 case URxvt_boldFont:
… …
3830 set_fonts (); 3878 set_fonts ();
3831 } 3879 }
3832 break; 3880 break;
3833 3881
3834#if ENABLE_FRILLS 3882#if ENABLE_FRILLS
3835 case XTerm_locale: 3883 case URxvt_locale:
3836 if (query) 3884 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3885 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3838 else 3886 else
3839 { 3887 {
3840 set_locale (str); 3888 set_locale (str);
3841# ifdef USE_XIM 3889 pty.set_utf8_mode (enc_utf8);
3842 im_cb (); 3890 init_xlocale ();
3843# endif
3844 } 3891 }
3845 break; 3892 break;
3846#endif
3847 3893
3848#ifdef MENUBAR 3894 case URxvt_view_up:
3849 case XTerm_Menu: 3895 case URxvt_view_down:
3850 if (options & Opt_insecure) 3896 int lines = atoi (str);
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3897
3852 break; 3898 if (lines)
3853#endif 3899 scr_page (op == URxvt_view_up ? UP : DN, lines);
3854#if 0
3855 case XTerm_dumpscreen: /* no error notices */
3856 { 3900 else
3857 int fd;
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3859 { 3901 {
3860 scr_dump (fd); 3902 scr_erase_savelines ();
3861 close (fd);
3862 } 3903 }
3863 } 3904
3864 break; 3905 break;
3865#endif 3906#endif
3866 } 3907 }
3867} 3908}
3868/*----------------------------------------------------------------------*/ 3909/*----------------------------------------------------------------------*/
… …
4283 4324
4284/* ---------------------------------------------------------------------- */ 4325/* ---------------------------------------------------------------------- */
4285/* Write data to the pty as typed by the user, pasted with the mouse, 4326/* Write data to the pty as typed by the user, pasted with the mouse,
4286 * or generated by us in response to a query ESC sequence. 4327 * or generated by us in response to a query ESC sequence.
4287 */ 4328 */
4329const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4330
4288void 4331void
4289rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4332rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4290{ 4333{
4291 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4334 if (v_buflen == 0)
4335 {
4336 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4292 4337
4293 if (len) 4338 if ((unsigned int)written == len)
4339 return;
4340
4341 data += written;
4342 len -= written;
4294 { 4343 }
4344
4345 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4346
4347 memcpy (v_buffer + v_buflen, data, len);
4348 v_buflen += len;
4349
4350 pty_ev.set (EVENT_READ | EVENT_WRITE);
4351}
4352
4353void rxvt_term::pty_write ()
4354{
4355 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4356
4357 if (written > 0)
4358 {
4359 v_buflen -= written;
4360
4295 if (v_buflen == 0) 4361 if (v_buflen == 0)
4296 { 4362 {
4297 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4298
4299 if ((unsigned int)written == len)
4300 return;
4301
4302 data += written;
4303 len -= written;
4304 }
4305
4306
4307 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4308
4309 memcpy (v_buffer + v_buflen, data, len);
4310 v_buflen += len;
4311 }
4312
4313 for (;;)
4314 {
4315 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4316
4317 if (written > 0)
4318 {
4319 v_buflen -= written;
4320
4321 if (v_buflen == 0)
4322 {
4323 free (v_buffer); 4363 free (v_buffer);
4324 v_buffer = 0; 4364 v_buffer = 0;
4325 v_buflen = 0; 4365 v_buflen = 0;
4326 4366
4327 pty_ev.set (EVENT_READ); 4367 pty_ev.set (EVENT_READ);
4328 return;
4329 }
4330
4331 memmove (v_buffer, v_buffer + written, v_buflen);
4332 }
4333 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4334 // original code just ignores this...
4335 destroy ();
4336 else
4337 {
4338 pty_ev.set (EVENT_READ | EVENT_WRITE);
4339 return; 4368 return;
4340 } 4369 }
4370
4371 memmove (v_buffer, v_buffer + written, v_buflen);
4341 } 4372 }
4373 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4374 // original code just ignores this...
4375 destroy ();
4342} 4376}
4343 4377
4344/*----------------------- end-of-file (C source) -----------------------*/ 4378/*----------------------- end-of-file (C source) -----------------------*/
4345 4379

Diff Legend

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