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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.233 by root, Wed Jan 4 01:16:34 2006 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
… …
113 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 125 XK_Print, 0x2399,
116 126
117 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
119 0, 137 0,
120}; 138};
121 139
122void 140void
123rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
124{ 142{
125 x = Pixel2Col (x); 143 x = Pixel2Col (x);
126 y = Pixel2Row (y); 144 y = Pixel2Row (y);
127 145
128 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 148 return;
131 149
132 for (;;) 150 for (;;)
133 { 151 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
135 155
136 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
137 { 157 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
140 break; 160 break;
141 } 161 }
142 162
143 x--; 163 x--;
144 } 164 }
145
146} 165}
147#endif
148 166
149#if ENABLE_OVERLAY
150void 167void
151rxvt_term::iso14755_51 (wchar_t ch) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 172 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 173 int len;
155 174
175 fname = rxvt_utf8towcs (f->name);
176
156#if ENABLE_COMBINING 177# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
158 { 179 {
159 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
162 } 183 }
163 else 184 else
164#endif 185# endif
165 { 186 {
187 ch2 = ch;
188
166 alloc = 0; 189 alloc = 0;
167 chr = &ch; 190 chr = &ch2;
168 len = 1; 191 len = 1;
169 } 192 }
170 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
171 scr_overlay_new (0, -1, 8 + 5, len); 217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 220
173 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
174 { 222 {
175 char buf[9]; 223 char buf[9];
176 224
177 ch = *chr++; 225 ch = *chr++;
178 226
179 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
182#if !UNICODE3 230# if !UNICODE3
183 if (ch >= 0x10000) 231 if (ch >= 0x10000)
184 ch = 0xfffd; 232 ch = 0xfffd;
185#endif 233# endif
186 scr_overlay_set (11, y, ch); 234 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 235 scr_overlay_set (12, y, NOCHAR, r);
188 } 236 }
189 237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
190#if ENABLE_COMBINING 243# if ENABLE_COMBINING
191 if (alloc) 244 if (alloc)
192 delete [] alloc; 245 delete [] alloc;
193#endif 246# endif
194} 247}
195#endif 248#endif
196 249
197void 250void
198rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
263 * 316 *
264 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
265 */ 318 */
266 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
269 322
270 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
271 { 324 {
272 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 346
294 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
298 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
301 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 357 SET_LOCALE (locale);
303 358
304 if (status_return == XLookupChars 359 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
332 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
333 } 388 }
334 389
335 if (valid_keysym) 390 if (valid_keysym)
336 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
337 if (TermWin.saveLines) 397 if (saveLines)
338 { 398 {
339#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 400 if (!ctrl && !meta)
341#else 401#else
342 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
343#endif 403#endif
344 { 404 {
345 int lnsppg; 405 int lnsppg;
346 406
347#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 409#else
350 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
351#endif 411#endif
352 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
353 { 413 {
354 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
355 return; 415 return;
… …
406 { 466 {
407 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
410 return; 470 return;
411#if TODO // TODO 471#if TODO
412 /* rxvt extras */ 472 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 474 change_font (FONT_UP);
415 return; 475 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 535 }
476#endif 536#endif
477 537
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 539 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 540 {
506 newlen = 1; 541 newlen = 1;
507 switch (keysym) 542 switch (keysym)
508 { 543 {
509#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
517 else 552 else
518 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
519 break; 554 break;
520#endif 555#endif
521#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
522 case XK_Delete: 567 case XK_Delete:
523 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
524 break; 569 break;
525#endif 570#endif
526 case XK_Tab: 571 case XK_Tab:
… …
629#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
630 case XK_KP_Begin: 675 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
632 break; 677 break;
633 678
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 679#endif
642 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
677 break; 715 break;
678 716
679 case XK_Find: 717 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
681 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
682 case XK_Insert: 731 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
684 break; 733 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 735 case DXK_Remove:
… …
776#undef FKEY 825#undef FKEY
777 default: 826 default:
778 newlen = 0; 827 newlen = 0;
779 break; 828 break;
780 } 829 }
830
781 if (newlen) 831 if (newlen)
782 len = strlen (kbuf); 832 len = strlen (kbuf);
783 } 833 }
784 834
785 /* 835 /*
… …
794 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
795 { 845 {
796 len = 1; 846 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
799 else 854 else
800 { 855 {
801#ifdef META8_OPTION 856#ifdef META8_OPTION
802 /* set 8-bit on */ 857 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
… …
815 } 870 }
816 871
817 if (len <= 0) 872 if (len <= 0)
818 return; /* not mapped */ 873 return; /* not mapped */
819 874
820 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 876 if (view_start)
822 { 877 {
823 TermWin.view_start = 0; 878 view_start = 0;
824 want_refresh = 1; 879 want_refresh = 1;
825 } 880 }
826 881
827 /* 882 /*
828 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
861#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
863} 918}
864/*}}} */ 919/*}}} */
865 920
866#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
869unsigned int 924unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871{ 926{
… …
894 949
895 cmd_parse (); 950 cmd_parse ();
896 951
897 return 0; 952 return 0;
898} 953}
899#endif /* MENUBAR_MAX */ 954#endif
900 955
901void 956void
902rxvt_term::flush () 957rxvt_term::flush ()
903{ 958{
959 flush_ev.stop ();
960
904#ifdef TRANSPARENT 961#ifdef TRANSPARENT
905 if (want_full_refresh) 962 if (want_full_refresh)
906 { 963 {
907 want_full_refresh = 0; 964 want_full_refresh = 0;
908 scr_clear (); 965 scr_clear ();
… …
918 IMSendSpot (); 975 IMSendSpot ();
919#endif 976#endif
920 } 977 }
921 978
922 display->flush (); 979 display->flush ();
923
924 flush_ev.stop ();
925} 980}
926 981
927void 982void
928rxvt_term::check_cb (check_watcher &w) 983rxvt_term::check_cb (check_watcher &w)
929{ 984{
… …
931 SET_LOCALE (locale); 986 SET_LOCALE (locale);
932 987
933 display->flush (); 988 display->flush ();
934 989
935 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
937} 992}
938 993
939void 994void
940rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
941{ 996{
… …
1005{ 1060{
1006 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1064 {
1065 if (view_start == nsaved ||
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0;
1068
1010 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1070 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1072 }
1014} 1073}
1015#endif 1074#endif
1016 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1017bool 1094bool
1018rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1019{ 1096{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1098
1022 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1023 { 1100 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1102 n = 0;
1026 } 1103 }
1027 1104
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1031 1108
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1033 1110
1034 if (n > 0) 1111 if (r > 0)
1035 { 1112 {
1036 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1037 return true; 1114 return true;
1038 } 1115 }
1039 else if (n < 0 && errno != EAGAIN) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1124 {
1125 pty_ev.stop ();
1126
1127 if (!OPTION (Opt_hold))
1040 destroy (); 1128 destroy ();
1129 }
1041 1130
1042 return false; 1131 return false;
1043} 1132}
1044 1133
1045void 1134void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1135rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1136{
1048 SET_R (this); 1137 SET_R (this);
1049 SET_LOCALE (locale); 1138 SET_LOCALE (locale);
1050 1139
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1142 while (pty_fill ())
1056 if (cmd_parse ()) 1143 if (cmd_parse ())
1057 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
1058} 1148}
1059 1149
1060void 1150void
1061rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1062{ 1152{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1154 recolour_cursor ();
1065 1155
1066#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1157 hidden_pointer = 0;
1068 1158
1069 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1161#endif
1072} 1162}
1073 1163
1074#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1075void 1165void
1076rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1077{ 1167{
1078 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1079 return; 1169 return;
1080 1170
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1172 XFlush (display->display);
1083 1173
1084 hidden_pointer = 1; 1174 hidden_pointer = 1;
1085} 1175}
1086 1176
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1227 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1228 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1229#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1230 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1231#endif
1142
1143 } 1232 }
1144 1233
1145#ifdef DEBUG_MOUSEREPORT 1234#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1235 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1236 if (key_state & 16)
1148 fputc ('C', stderr); 1237 fputc ('C', stderr);
1149 if (key_state & 4) 1238 if (key_state & 4)
1150 fputc ('S', stderr); 1239 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1243 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1244 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1245 button_number,
1157 x + 1, 1246 x + 1,
1158 y + 1); 1247 y + 1);
1159#else 1248#endif
1249
1160 tt_printf ("\033[M%c%c%c", 1250 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1251 (32 + button_number + key_state),
1162 (32 + x + 1), 1252 (32 + x + 1),
1163 (32 + y + 1)); 1253 (32 + y + 1));
1164#endif
1165} 1254}
1166 1255
1167#ifdef USING_W11LIB 1256#ifdef USING_W11LIB
1168void 1257void
1169rxvt_W11_process_x_event (XEvent *ev) 1258rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1265
1177/*{{{ process an X event */ 1266/*{{{ process an X event */
1178void 1267void
1179rxvt_term::x_cb (XEvent &ev) 1268rxvt_term::x_cb (XEvent &ev)
1180{ 1269{
1270 dDisp;
1271
1181 SET_R (this); 1272 SET_R (this);
1182 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1183 1274
1184#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1186 { 1277 {
1187 if (hidden_cursor) 1278 if (hidden_cursor)
1188 { 1279 {
1189 hidden_cursor = 0; 1280 hidden_cursor = 0;
1190 want_refresh = 1; 1281 want_refresh = 1;
… …
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1194 } 1285 }
1195#endif 1286#endif
1196 1287
1197#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1199 { 1290 {
1200 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1203 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1206 if (ev.type == KeyPress && hidden_pointer == 0) 1297 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank (); 1298 pointer_blank ();
1208 } 1299 }
1209#endif 1300#endif
1210 1301
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return;
1214#endif
1215
1216 Window unused_root, unused_child; 1302 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1303 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1304 unsigned int unused_mask;
1219 1305
1220 switch (ev.type) 1306 switch (ev.type)
1221 { 1307 {
1222 case KeyPress: 1308 case KeyPress:
1223#if ISO_14755 1309#if ISO_14755
… …
1227 1313
1228 break; 1314 break;
1229 1315
1230 case KeyRelease: 1316 case KeyRelease:
1231 { 1317 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233 KeySym ks; 1319 KeySym ks;
1234 1320
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1322#endif
1237 1323
… …
1306 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1307 break; 1393 break;
1308 1394
1309 case ClientMessage: 1395 case ClientMessage:
1310 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1400 destroy ();
1401#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev);
1406#endif
1407 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1313#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1319 { 1423 {
1320 /* Get Dnd data */ 1424 /* Get Dnd data */
1321 Atom ActualType; 1425 Atom ActualType;
1322 int ActualFormat; 1426 int ActualFormat;
1323 unsigned char *data; 1427 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1428 unsigned long Size, RemainingBytes;
1325 1429
1326 XGetWindowProperty (display->display, display->root, 1430 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1431 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1432 0L, 1000000L,
1329 False, AnyPropertyType, 1433 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1434 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1435 &Size, &RemainingBytes,
1332 &data); 1436 &data);
1333 XChangeProperty (display->display, display->root, 1437 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1438 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1441 }
1341#endif /* OFFIX_DND */ 1442#endif /* OFFIX_DND */
1342 break; 1443 break;
1343 1444
1344 case MappingNotify: 1445 case MappingNotify:
… …
1369 break; 1470 break;
1370 } 1471 }
1371 break; 1472 break;
1372 1473
1373 case FocusIn: 1474 case FocusIn:
1374 if (!TermWin.focus) 1475 focus_in ();
1476 break;
1477
1478 case FocusOut:
1479 focus_out ();
1480 break;
1481
1482 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0])
1375 { 1484 {
1376 TermWin.focus = 1; 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1486 ;
1378#ifdef USE_XIM 1487
1379 if (Input_Context != NULL) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1489 {
1381 IMSetStatusPosition (); 1490 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1492 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1493
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1447 {
1448 check_our_parents (); 1496 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1497#endif
1453 } 1498 }
1454 break; 1499 break;
1455 1500
1456 case PropertyNotify: 1501 case PropertyNotify:
… …
1464 selection_clear (); 1509 selection_clear ();
1465 break; 1510 break;
1466 1511
1467 case SelectionNotify: 1512 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1513 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1515 break;
1472 1516
1473 case SelectionRequest: 1517 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1475 break; 1519 break;
1476 1520
1477 case UnmapNotify: 1521 case UnmapNotify:
1478 TermWin.mapped = 0; 1522 mapped = 0;
1479#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1481#endif 1525#endif
1482 break; 1526 break;
1483 1527
1484 case MapNotify: 1528 case MapNotify:
1485 TermWin.mapped = 1; 1529 mapped = 1;
1486#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1532#endif
1489 break; 1533 break;
1490 1534
… …
1494 break; 1538 break;
1495#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1496 1540
1497 case GraphicsExpose: 1541 case GraphicsExpose:
1498 case Expose: 1542 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1500 { 1544 {
1501 do 1545 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1549
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1551
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1511 1555
1512 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1513 } 1557 }
1514 else 1558 else
1515 { 1559 {
1516 XEvent unused_event; 1560 XEvent unused_event;
1517 1561
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1563 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1565 ;
1522 1566
1523 if (isScrollbarWindow (ev.xany.window)) 1567 if (isScrollbarWindow (ev.xany.window))
1524 { 1568 {
1525 scrollBar.setIdle (); 1569 scrollBar.setIdle ();
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1574 menubar_expose ();
1531#endif 1575#endif
1532 1576
1533#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1536#endif 1580#endif
1537 } 1581 }
1538 break; 1582 break;
1539 1583
1540 case MotionNotify: 1584 case MotionNotify:
… …
1547 { 1591 {
1548 menubar_control (ev.xbutton); 1592 menubar_control (ev.xbutton);
1549 break; 1593 break;
1550 } 1594 }
1551#endif 1595#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1597 break;
1554 1598
1555 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1556 { 1600 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1602 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1604 ;
1561 1605
1562 XQueryPointer (display->display, TermWin.vt, 1606 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1609 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1610 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1612 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1613 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1614 {
1571#endif 1615#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1620 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1621 break;
1578 } 1622 }
1579#endif 1623#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1626
1582#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1630 {
1586 int dist; 1631 int dist;
1587 1632
1588 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1645
1601 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1603 { 1648 {
1604 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1606 } 1651 }
1607 else 1652 else
1608 { 1653 {
1609 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1656 }
1612 1657
1613 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1660 + 1;
1616 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1618 } 1663 }
1619 else 1664 else
1620 { 1665 {
1621 /* we are within the text window, so we 1666 /* we are within the text window, so we
… …
1630#endif 1675#endif
1631 } 1676 }
1632 } 1677 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1679 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1680 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1681 MotionNotify, &ev))
1682 ;
1683
1637 XQueryPointer (display->display, scrollBar.win, 1684 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1687 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1688 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1690 scrollbar_size ());
1644 scr_refresh (refresh_type); 1691 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1692 refresh_limit = 0;
… …
1647 } 1694 }
1648 break; 1695 break;
1649 } 1696 }
1650} 1697}
1651 1698
1699void
1700rxvt_term::focus_in ()
1701{
1702 if (!focus)
1703 {
1704 focus = 1;
1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1709#if USE_XIM
1710 if (Input_Context != NULL)
1711 {
1712 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context);
1714 }
1715#endif
1716#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719#endif
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 pix_colors = pix_colors_focused;
1724 scr_recolour ();
1725 }
1726#endif
1727 }
1728}
1729
1730void
1731rxvt_term::focus_out ()
1732{
1733 if (focus)
1734 {
1735 focus = 0;
1736 want_refresh = 1;
1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1743 iso14755buf = 0;
1744# if ENABLE_OVERLAY
1745 scr_overlay_off ();
1746# endif
1747 }
1748#endif
1749#if USE_XIM
1750 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context);
1752#endif
1753#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink))
1755 cursor_blink_ev.stop ();
1756 hidden_cursor = 0;
1757#endif
1758#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade])
1760 {
1761 pix_colors = pix_colors_unfocused;
1762 scr_recolour ();
1763 }
1764#endif
1765 }
1766}
1767
1652#if TRANSPARENT 1768#if TRANSPARENT
1653void 1769void
1654rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1771{
1656 SET_R (this); 1772 SET_R (this);
… …
1661 case PropertyNotify: 1777 case PropertyNotify:
1662 /* 1778 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1665 */ 1781 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1782 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1784 return;
1671 1785
1672 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1673 case ReparentNotify: 1787 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1676 break; 1790 break;
1677 } 1791 }
1678} 1792}
1679#endif 1793#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1683{ 1797{
1684 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1685 1799
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1687 if (!bypass_keystate) 1802 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1804
1690 /* 1805 /*
1691 * VT window processing of button press 1806 * VT window processing of button press
1692 */ 1807 */
1693 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1694 { 1809 {
1695#if ISO_14755 1810#if ISO_14755
1696 // 5.4 1811 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1813 {
… …
1700 return; 1815 return;
1701 } 1816 }
1702#endif 1817#endif
1703 1818
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1705 if (reportmode) 1821 if (reportmode)
1706 { 1822 {
1707 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
… …
1738 } 1854 }
1739 else 1855 else
1740 { 1856 {
1741 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1743 switch (ev.button) 1861 switch (ev.button)
1744 { 1862 {
1745 case Button1: 1863 case Button1:
1864 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */
1866#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask);
1868#else
1869 selection.rect = false;
1870#endif
1871
1746 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748 { 1874 {
1749 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1751 else 1877 else
1752 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1753 } 1879 }
1754 else 1880 else
1755 { 1881 {
1756 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1757 MEvent.clicks++; 1883 MEvent.clicks++;
1758 else 1884 else
1759 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1760 1886
1761 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1762 } 1888 }
1763 1889
1764 MEvent.button = Button1; 1890 MEvent.button = Button1;
1765 break; 1891 break;
1766 1892
1767 case Button3: 1893 case Button3:
1768 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1769 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1770 else 1896 else
1771 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1772 1898
1773 MEvent.button = Button3; 1899 MEvent.button = Button3;
1774 break; 1900 break;
1775 } 1901 }
1776 } 1902 }
1777 1903
1778 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1779 return; 1905 return;
1780 } 1906 }
1781 1907
… …
1893 case Button3: 2019 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1895 { 2021 {
1896 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1899# else 2025# else
1900 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1901# endif 2027# endif
1902 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1905# else 2031# else
1906 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1907# endif 2033# endif
1908 else 2034 else
1909 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1910 } 2036 }
1911 else 2037 else
1912 { 2038 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2040 (nrow
1915 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2042 / scrollbar_size ()));
1917 } 2043 }
1918 2044
1919 break; 2045 break;
… …
1951#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
1954#endif 2080#endif
1955 2081
1956 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1957 { 2083 {
1958#if ISO_14755 2084#if ISO_14755
1959 // 5.4 2085 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2087 return;
… …
2011 2137
2012 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2013 2139
2014 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2015 i = 1; 2141 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2018 else 2144 else
2019 i = 5; 2145 i = 5;
2020 2146
2021# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2023 { 2149 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2153
2028 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2156
2031 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2201 int i;
2076 2202
2077 Visual* visual = display->visual; 2203 Visual *visual = display->visual;
2078 2204
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2206
2081 /* for convenience */ 2207 /* for convenience */
2082 mask_r = visual->red_mask; 2208 mask_r = visual->red_mask;
… …
2303 Atom atype; 2429 Atom atype;
2304 unsigned char *prop = NULL; 2430 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2431 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2432 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2308 2435
2309 pchanged = 0; 2436 pchanged = 0;
2310 2437
2311 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2313 2440
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2316 2443
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2445
2319 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2320 { 2447 {
2321 if (am_transparent) 2448 if (am_transparent)
2322 { 2449 {
2323 pchanged = 1; 2450 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2326 } 2453 }
2327 2454
2328 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2329 } 2456 }
2330 2457
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2458 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2459 XSync (disp, False);
2333 2460
2334 /* 2461 /*
2335 * Make the frame window set by the window manager have 2462 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2463 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2464 * windows for each client, so we have to take care about that.
2338 */ 2465 */
2339 i = (xa[XA_XROOTPMAPID] 2466 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2343 2470
2344 if (!i || prop == NULL) 2471 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2472 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2475 &nitems, &bytes_after, &prop) == Success);
2349 2476
2350 if (!i || prop == NULL 2477 if (!i || prop == NULL
2351#if TINTING 2478#if TINTING
… …
2370 Window cr; 2497 Window cr;
2371 XImage *image; 2498 XImage *image;
2372 GC gc; 2499 GC gc;
2373 XGCValues gcvalue; 2500 XGCValues gcvalue;
2374 2501
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2506 nx = ny = 0;
2380 2507
… …
2390 nh += sy; 2517 nh += sy;
2391 ny = -sy; 2518 ny = -sy;
2392 sy = 0; 2519 sy = 0;
2393 } 2520 }
2394 2521
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2397 allowedxerror = -1; 2526 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2528
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2531 allowedxerror = 0;
2403 2532
2404 if (image == NULL) 2533 if (image == NULL)
2405 { 2534 {
2406 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2407 { 2536 {
2408 pchanged = 1; 2537 pchanged = 1;
2409 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2410 { 2539 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2541 pixmap = None;
2413 } 2542 }
2414 } 2543 }
2415 2544
2416 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2417 } 2546 }
2418 else 2547 else
2419 { 2548 {
2420 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2422 2551
2423#if TINTING 2552#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2554 {
2426 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
… …
2430 2559
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2561 }
2433#endif 2562#endif
2434 2563
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2570 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2444 2573
2445 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2575 pchanged = 1;
2447 2576
2448 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2449 } 2578 }
2450 } 2579 }
2451 2580
2452 if (!am_pixmap_trans) 2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2453 { 2584 {
2454 unsigned int n; 2585 unsigned int n;
2455 /* 2586 /*
2456 * InheritPixmap transparency 2587 * InheritPixmap transparency
2457 */ 2588 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2590 {
2460 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2463 XFree (list); 2594 XFree (list);
2464 2595
2465 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2466 { 2597 {
2467 if (oldp != None) 2598 if (oldp != None)
2468 pchanged = 1; 2599 pchanged = 1;
2469 2600
2470 break; 2601 break;
2471 } 2602 }
2472 2603
2473 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2474 pchanged = 1; 2605 pchanged = 1;
2475 } 2606 }
2476 2607
2477 n = 0; 2608 n = 0;
2478 2609
2479 if (pchanged) 2610 if (pchanged)
2480 { 2611 {
2481 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2482 { 2613 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2616 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2618 break;
2488 } 2619 }
2489 } 2620 }
2490 } 2621 }
2491 2622
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2624 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2627 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2498 } 2629 }
2499 else 2630 else
2500 { 2631 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2635 sleep (1);
2505#endif 2636#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2507 { 2638 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2510 } 2641 }
2511 2642
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2644 am_transparent = 1;
2514 } 2645 }
2515 2646
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2648 parent[i] = None;
2518 } 2649 }
2519 2650
2520 // this is experimental
2521 if (scrollBar.win) 2651 if (scrollBar.win)
2522 { 2652 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2654 scrollBar.setIdle ();
2526 scrollbar_show (0); 2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2527 } 2663 }
2528 2664
2529 return pchanged; 2665 return pchanged;
2530} 2666}
2531#endif 2667#endif
… …
2557 seen_input = 1; 2693 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2694 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2695 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2698 // unfortunately other programs are even more buggy and dislike
2699 // being sent SIGWINCH, so only do it when we were in fact being
2700 // resized.
2701 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2563 } 2703 }
2564 2704
2565 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2707 bool refreshnow = false;
2568 int nlines = 0; 2708 int nlines = 0;
2569 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2570 2711
2571 for (;;) 2712 for (;;)
2572 { 2713 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2715 break;
2575 2716
2576 *str++ = ch; 2717 *str++ = ch;
2577 2718
2578 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2579 { 2720 {
2721 if (ch == C0_LF)
2580 nlines++; 2722 nlines++;
2723
2581 refresh_count++; 2724 refresh_count++;
2582 2725
2583 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2728 {
2586 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2587 ch = NOCHAR; 2731 ch = NOCHAR;
2588 break; 2732 break;
2589 } 2733 }
2590 2734
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2593 { 2737 {
2594 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2595 nlines = 0; 2739 nlines = 0;
2596 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2597 } 2742 }
2598 }
2599 2743
2600 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2601 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2602 ch = NOCHAR; 2748 ch = NOCHAR;
2603 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2604 } 2755 }
2605 2756
2606 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2758 ch = next_char ();
2608 } 2759 }
… …
2615 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2768 */
2618 if (refreshnow) 2769 if (refreshnow)
2619 { 2770 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2772 refresh_limit++;
2622 else 2773 else
2623 { 2774 {
2624 flag = true; 2775 flag = true;
2625 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2626 } 2778 }
2627 } 2779 }
2628 2780
2629 } 2781 }
2630 else 2782 else
… …
2679 if (len == (size_t)-1) 2831 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2833
2682 // assume wchar == unicode 2834 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2835 cmdbuf_ptr += len;
2684 return wc; 2836 return wc & UNICODE_MASK;
2685 } 2837 }
2686 2838
2687 return NOCHAR; 2839 return NOCHAR;
2688} 2840}
2689 2841
… …
3152 { 3304 {
3153 switch (priv) 3305 switch (priv)
3154 { 3306 {
3155 case '>': 3307 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3308 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3310 break;
3159 case '?': 3311 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3313 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3314 break;
… …
3267 3419
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3420 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3421 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3422 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3425 break;
3274 3426
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3428 tt_write ((const unsigned char *)VT100_ANS,
3277 (unsigned int) (sizeof (VT100_ANS) - 1)); 3429 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3289 break; 3441 break;
3290 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3291 scr_report_position (); 3443 scr_report_position ();
3292 break; 3444 break;
3293 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3448 break;
3297 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3451 break;
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3543rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3544{
3393 int x, y; 3545 int x, y;
3394 XWindowAttributes wattr; 3546 XWindowAttributes wattr;
3395 Window wdummy; 3547 Window wdummy;
3548 dDisp;
3396 3549
3397 if (nargs == 0) 3550 if (nargs == 0)
3398 return; 3551 return;
3399 3552
3400 switch (args[0]) 3553 switch (args[0])
3401 { 3554 {
3402 /* 3555 /*
3403 * commands 3556 * commands
3404 */ 3557 */
3405 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3407 break; 3560 break;
3408 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3562 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3563 break;
3412 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3566 break;
3415 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3569 break;
3418 case 5: /* raise window */ 3570 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3420 break; 3572 break;
3421 case 6: /* lower window */ 3573 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3423 break; 3575 break;
3424 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3425 scr_touch (true); 3577 scr_touch (true);
3426 break; 3578 break;
3427 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3430 break; 3582 break;
3431 3583
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3585 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3437 break; 3589 break;
3438 3590
3439 3591
3440 /* 3592 /*
3441 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3442 */ 3594 */
3443 case 11: /* report window state */ 3595 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3598 break;
3447 case 13: /* report window position */ 3599 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3605 break;
3454 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3609 break;
3458 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3612 break;
3461 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3615 break;
3464 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3465 { 3617 {
3466 char *s; 3618 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3621 XFree (s);
3470 } 3622 }
3471 break; 3623 break;
3472 case 21: /* report window title */ 3624 case 21: /* report window title */
3473 { 3625 {
3474 char *s; 3626 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3629 XFree (s);
3478 } 3630 }
3479 break; 3631 break;
3480 } 3632 }
3481} 3633}
… …
3487 * ends_how is terminator used. returned input must be free()'d 3639 * ends_how is terminator used. returned input must be free()'d
3488 */ 3640 */
3489unsigned char * 3641unsigned char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3643{
3492 unicode_t prev = 0, ch; 3644 unicode_t ch;
3645 bool seen_esc = false;
3493 unsigned int n = 0; 3646 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3647 wchar_t string[STRING_MAX];
3496 3648
3497 while ((ch = cmd_getc ()) != NOCHAR) 3649 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3650 {
3499 if (prev == C0_ESC) 3651 if (seen_esc)
3500 { 3652 {
3501 if (ch == 0x5c) /* 7bit ST */ 3653 if (ch == 0x5c) /* 7bit ST */
3502 break; 3654 break;
3503 else 3655 else
3504 return NULL; 3656 return NULL;
3505 } 3657 }
3658 else if (ch == C0_ESC)
3659 {
3660 seen_esc = true;
3661 continue;
3662 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3663 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3664 break;
3508 else if (ch < 0x20) 3665 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3510 3667
3511 if (n >= sizeof (string) - 1) 3668 seen_esc = false;
3669
3670 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3671 // stop at some sane length
3513 return NULL; 3672 return NULL;
3514 3673
3515 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3676 else
3521 string[n++] = prev = ch; 3677 string[n++] = ch;
3522 } 3678 }
3523 3679
3524 string[n++] = '\0'; 3680 string[n++] = '\0';
3525 3681
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3683
3531 return s; 3684 return (unsigned char *)rxvt_wcstombs (string);
3532} 3685}
3533 3686
3534/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3535/* 3688/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3590 set_window_color (color, str); 3743 set_window_color (color, str);
3591} 3744}
3592 3745
3593/* 3746/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3748 */
3618void 3749void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3620{ 3751{
3621 int changed = 0; 3752 int changed = 0;
3622 int color; 3753 int color;
3623 char *buf, *name; 3754 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3756 int saveop = op;
3757 dDisp;
3625 3758
3626 assert (str != NULL); 3759 assert (str != NULL);
3627 switch (op) 3760 switch (op)
3628 { 3761 {
3629 case XTerm_name: 3762 case XTerm_name:
… …
3636 set_title (str); 3769 set_title (str);
3637 break; 3770 break;
3638 case XTerm_property: 3771 case XTerm_property:
3639 if (str[0] == '?') 3772 if (str[0] == '?')
3640 { 3773 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3774 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3775 Atom actual_type;
3643 int actual_format; 3776 int actual_format;
3644 unsigned long nitems; 3777 unsigned long nitems;
3645 unsigned long bytes_after; 3778 unsigned long bytes_after;
3646 unsigned char *value = 0; 3779 unsigned char *value = 0;
3647 const char *str = ""; 3780 const char *str = "";
3648 3781
3649 if (prop 3782 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3783 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3787 && actual_type != None
3655 && actual_format == 8) 3788 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3797 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3798
3666 if (eq) 3799 if (eq)
3667 { 3800 {
3668 *eq = 0; 3801 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3802 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3803 }
3674 else 3804 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3805 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3806 display->atom (str));
3677 } 3807 }
3678 break; 3808 break;
3679 3809
3680 case XTerm_Color: 3810 case XTerm_Color:
… …
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break; 3858 break;
3729 case XTerm_Color_RV: 3859 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3861 break;
3862 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break;
3865#endif
3866#if TRANSPARENT && TINTING
3867 case URxvt_Color_tint:
3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3869 check_our_parents ();
3870 if (am_transparent)
3871 want_full_refresh = want_refresh = 1;
3872 break;
3732#endif 3873#endif
3733 3874
3734 case XTerm_Pixmap: 3875 case XTerm_Pixmap:
3735 if (*str != ';') 3876 if (*str != ';')
3736 { 3877 {
… …
3744 { 3885 {
3745 str++; 3886 str++;
3746#if XPM_BACKGROUND 3887#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3888 changed += scale_pixmap (str);
3748#endif 3889#endif
3749
3750 } 3890 }
3891
3751 if (changed) 3892 if (changed)
3752 { 3893 {
3753#ifdef XPM_BACKGROUND 3894#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3895 resize_pixmap ();
3755#endif 3896#endif
… …
3766 3907
3767 case XTerm_logfile: 3908 case XTerm_logfile:
3768 // TODO, when secure mode? 3909 // TODO, when secure mode?
3769 break; 3910 break;
3770 3911
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR 3912#ifdef MENUBAR
3806 case XTerm_Menu: 3913 case URxvt_Menu:
3807 if (options & Opt_insecure) 3914 if (OPTION (Opt_insecure))
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break; 3916 break;
3810#endif 3917#endif
3811#if 0 3918#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3919 case XTerm_dumpscreen: /* no error notices */
… …
3816 { 3923 {
3817 scr_dump (fd); 3924 scr_dump (fd);
3818 close (fd); 3925 close (fd);
3819 } 3926 }
3820 } 3927 }
3928 break;
3929#endif
3930 case XTerm_font:
3931 op = URxvt_font;
3932 case URxvt_font:
3933#if ENABLE_STYLES
3934 case URxvt_boldFont:
3935 case URxvt_italicFont:
3936 case URxvt_boldItalicFont:
3937#endif
3938 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp);
3943 else
3944 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3946
3947 res = strdup (str);
3948 allocated.push_back ((void *)res);
3949 set_fonts ();
3950 }
3951 break;
3952
3953#if ENABLE_FRILLS
3954 case URxvt_locale:
3955 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3957 else
3958 {
3959 set_locale (str);
3960 pty.set_utf8_mode (enc_utf8);
3961 init_xlocale ();
3962 }
3963 break;
3964
3965 case URxvt_view_up:
3966 case URxvt_view_down:
3967 {
3968 int lines = atoi (str);
3969
3970 if (lines)
3971 scr_page (op == URxvt_view_up ? UP : DN, lines);
3972 else
3973 scr_erase_savelines ();
3974 }
3975
3976 break;
3977#endif
3978
3979#if ENABLE_PERL
3980 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3982 ; // no responses yet
3821 break; 3983 break;
3822#endif 3984#endif
3823 } 3985 }
3824} 3986}
3825/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3934 } 4096 }
3935 4097
3936 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4099 switch (arg[i])
3938 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 if (mode)
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107
4108 scr_touch (true);
4109 break;
4110#endif
3939 case 1048: /* alternative cursor save */ 4111 case 1048: /* alternative cursor save */
4112 case 1049:
3940 if (options & Opt_secondaryScreen) 4113 if (OPTION (Opt_secondaryScreen))
3941 if (mode == 0) 4114 if (mode == 0)
3942 scr_cursor (RESTORE); 4115 scr_cursor (RESTORE);
3943 else if (mode == 1) 4116 else if (mode == 1)
3944 scr_cursor (SAVE); 4117 scr_cursor (SAVE);
3945 break; 4118 break;
… …
3957 */ 4130 */
3958 PrivMode (1, PrivMode_vt52); 4131 PrivMode (1, PrivMode_vt52);
3959 break; 4132 break;
3960 case 3: /* 80/132 */ 4133 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4134 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4135 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4136 break;
3964 case 4: /* smooth scrolling */ 4137 case 4: /* smooth scrolling */
3965 if (state) 4138 if (!state)
3966 options &= ~Opt_jumpScroll; 4139 SET_OPTION (Opt_jumpScroll);
3967 else 4140 else
3968 options |= Opt_jumpScroll; 4141 CLR_OPTION (Opt_jumpScroll);
3969 break; 4142 break;
3970 case 5: /* reverse video */ 4143 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4144 scr_rvideo_mode (state);
3972 break; 4145 break;
3973 case 6: /* relative/absolute origins */ 4146 case 6: /* relative/absolute origins */
… …
4014#if 0 4187#if 0
4015 case 1001: 4188 case 1001:
4016 break; /* X11 mouse highlighting */ 4189 break; /* X11 mouse highlighting */
4017#endif 4190#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4191 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state) 4192 if (!state)
4020 options &= ~Opt_scrollTtyOutput; 4193 SET_OPTION (Opt_scrollTtyOutput);
4021 else 4194 else
4022 options |= Opt_scrollTtyOutput; 4195 CLR_OPTION (Opt_scrollTtyOutput);
4023 break; 4196 break;
4024 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4025 if (state) 4198 if (state)
4026 options |= Opt_scrollTtyKeypress; 4199 SET_OPTION (Opt_scrollTtyKeypress);
4027 else 4200 else
4028 options &= ~Opt_scrollTtyKeypress; 4201 CLR_OPTION (Opt_scrollTtyKeypress);
4029 break; 4202 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4203 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4204 if (OPTION (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4205 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4206 scr_erase_screen (2);
4034 scr_change_screen (state); 4207 scr_change_screen (state);
4035 break; 4208 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4209 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4210 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4211 if (OPTION (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4212 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4213 scr_erase_screen (2);
4041 break; 4214 break;
4042 default: 4215 default:
4043 break; 4216 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4242 rendset = 0, rendstyle = ~RS_None;
4070 break; 4243 break;
4071 case 1: 4244 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4245 rendset = 1, rendstyle = RS_Bold;
4073 break; 4246 break;
4074 //case 2: // faint or second colour 4247 //case 2: // low intensity
4075 //case 3: // italic 4248 case 3:
4249 rendset = 1, rendstyle = RS_Italic;
4250 break;
4076 case 4: 4251 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4252 rendset = 1, rendstyle = RS_Uline;
4078 break; 4253 break;
4079 case 5: // slowly blinking 4254 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4255 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4267 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4268 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4269 //...
4095 //case 19: // ninth alt font 4270 //case 19: // ninth alt font
4096 //case 20: // gothic 4271 //case 20: // gothic
4097 case 21: // disable bold, faint 4272 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4273 rendset = 0, rendstyle = RS_Bold;
4099 break; 4274 break;
4100 case 22: 4275 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4276 rendset = 0, rendstyle = RS_Bold;
4102 break; 4277 break;
4103 //case 23: disable italic 4278 case 23: // disable italic
4279 rendset = 0, rendstyle = RS_Italic;
4280 break;
4104 case 24: 4281 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4282 rendset = 0, rendstyle = RS_Uline;
4106 break; 4283 break;
4107 case 25: 4284 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4285 rendset = 0, rendstyle = RS_Blink;
4109 break; 4286 break;
4110 case 26: 4287 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4288 rendset = 0, rendstyle = RS_Blink;
4112 break; 4289 break;
4113 case 27: 4290 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4291 rendset = 0, rendstyle = RS_RVid;
4115 break; 4292 break;
… …
4133 case 35: 4310 case 35:
4134 case 36: 4311 case 36:
4135 case 37: 4312 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4313 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4314 break;
4138#ifdef TTY_256COLOR 4315 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4316 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4317 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4318 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4319 i += 2;
4144 } 4320 }
4145 break; 4321 break;
4146#endif
4147 case 39: /* default fg */ 4322 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4323 scr_color (Color_fg, Color_fg);
4149 break; 4324 break;
4150 4325
4151 case 40: 4326 case 40:
… …
4156 case 45: 4331 case 45:
4157 case 46: 4332 case 46:
4158 case 47: 4333 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4334 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4335 break;
4161#ifdef TTY_256COLOR 4336 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4337 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4338 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4339 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4340 i += 2;
4167 } 4341 }
4168 break; 4342 break;
4169#endif
4170 case 49: /* default bg */ 4343 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4344 scr_color (Color_bg, Color_bg);
4172 break; 4345 break;
4346
4347 //case 50: // not variable spacing
4173 4348
4174#ifndef NO_BRIGHTCOLOR 4349#ifndef NO_BRIGHTCOLOR
4175 case 90: 4350 case 90:
4176 case 91: /* set bright fg color */ 4351 case 91: /* set bright fg color */
4177 case 92: 4352 case 92:
4178 case 93: 4353 case 93:
4179 case 94: 4354 case 94:
4180 case 95: 4355 case 95:
4181 case 96: 4356 case 96:
4182 case 97: 4357 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4359 break;
4186 case 100: 4360 case 100:
4187 case 101: /* set bright bg color */ 4361 case 101: /* set bright bg color */
4188 case 102: 4362 case 102:
4189 case 103: 4363 case 103:
4190 case 104: 4364 case 104:
4191 case 105: 4365 case 105:
4192 case 106: 4366 case 106:
4193 case 107: 4367 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4368 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4369 break;
4197#endif 4370#endif
4198
4199 } 4371 }
4200 } 4372 }
4201} 4373}
4202/*}}} */ 4374/*}}} */
4203 4375
… …
4239 4411
4240/* ---------------------------------------------------------------------- */ 4412/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4413/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4414 * or generated by us in response to a query ESC sequence.
4243 */ 4415 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417
4244void 4418void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4419rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246{ 4420{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4421 if (v_buflen == 0)
4422 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4248 4424
4249 if (len) 4425 if ((unsigned int)written == len)
4426 return;
4427
4428 data += written;
4429 len -= written;
4250 { 4430 }
4431
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4433
4434 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len;
4436
4437 pty_ev.set (EVENT_READ | EVENT_WRITE);
4438}
4439
4440void rxvt_term::pty_write ()
4441{
4442 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4443
4444 if (written > 0)
4445 {
4446 v_buflen -= written;
4447
4251 if (v_buflen == 0) 4448 if (v_buflen == 0)
4252 { 4449 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4450 free (v_buffer);
4280 v_buffer = 0; 4451 v_buffer = 0;
4281 v_buflen = 0; 4452 v_buflen = 0;
4282 4453
4283 pty_ev.set (EVENT_READ); 4454 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4455 return;
4296 } 4456 }
4457
4458 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4459 }
4460 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4461 pty_ev.set (EVENT_READ);
4298} 4462}
4299 4463
4300/*----------------------- end-of-file (C source) -----------------------*/ 4464/*----------------------- end-of-file (C source) -----------------------*/
4301 4465

Diff Legend

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