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

Diff Legend

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