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.163 by root, Wed Aug 25 03:47:20 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 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
141 break; 160 break;
142 } 161 }
143 162
144 x--; 163 x--;
145 } 164 }
146
147} 165}
148#endif
149 166
150#if ENABLE_OVERLAY
151void 167void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 169{
154 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 173 int len;
158 174
175 fname = rxvt_utf8towcs (f->name);
176
159#if ENABLE_COMBINING 177# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
161 { 179 {
162 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
165 } 183 }
166 else 184 else
167#endif 185# endif
168 { 186 {
169 ch2 = ch; 187 ch2 = ch;
170 188
171 alloc = 0; 189 alloc = 0;
172 chr = &ch2; 190 chr = &ch2;
173 len = 1; 191 len = 1;
174 } 192 }
175 193
176 int width = strlen (f->name); 194 char attr[80]; // plenty
177 195
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
217 scr_overlay_new (x, y, width, len + 2);
179 218
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 220
182 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
183 { 222 {
… …
186 ch = *chr++; 225 ch = *chr++;
187 226
188 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
191#if !UNICODE3 230# if !UNICODE3
192 if (ch >= 0x10000) 231 if (ch >= 0x10000)
193 ch = 0xfffd; 232 ch = 0xfffd;
194#endif 233# endif
195 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
197 } 236 }
198 237
238 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
200 240
241 free (fname);
242
201#if ENABLE_COMBINING 243# if ENABLE_COMBINING
202 if (alloc) 244 if (alloc)
203 delete [] alloc; 245 delete [] alloc;
204#endif 246# endif
205} 247}
206#endif 248#endif
207 249
208void 250void
209rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
272 * 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
273 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
274 * 316 *
275 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
276 */ 318 */
277 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
280 322
281 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
282 { 324 {
283 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
304 346
305 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
309 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
312 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 357 SET_LOCALE (locale);
314 358
315 if (status_return == XLookupChars 359 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
343 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
344 } 388 }
345 389
346 if (valid_keysym) 390 if (valid_keysym)
347 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
348 if (TermWin.saveLines) 397 if (saveLines)
349 { 398 {
350#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 400 if (!ctrl && !meta)
352#else 401#else
353 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
354#endif 403#endif
355 { 404 {
356 int lnsppg; 405 int lnsppg;
357 406
358#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 409#else
361 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
362#endif 411#endif
363 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
364 { 413 {
365 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
366 return; 415 return;
… …
417 { 466 {
418 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
421 return; 470 return;
422#if TODO // TODO 471#if TODO
423 /* rxvt extras */ 472 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 474 change_font (FONT_UP);
426 return; 475 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 535 }
487#endif 536#endif
488 537
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 539 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 540 {
517 newlen = 1; 541 newlen = 1;
518 switch (keysym) 542 switch (keysym)
519 { 543 {
520#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
528 else 552 else
529 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
530 break; 554 break;
531#endif 555#endif
532#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
533 case XK_Delete: 567 case XK_Delete:
534 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
535 break; 569 break;
536#endif 570#endif
537 case XK_Tab: 571 case XK_Tab:
… …
640#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
641 case XK_KP_Begin: 675 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
643 break; 677 break;
644 678
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 679#endif
653 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
688 break; 715 break;
689 716
690 case XK_Find: 717 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
692 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
693 case XK_Insert: 731 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
695 break; 733 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 735 case DXK_Remove:
… …
787#undef FKEY 825#undef FKEY
788 default: 826 default:
789 newlen = 0; 827 newlen = 0;
790 break; 828 break;
791 } 829 }
830
792 if (newlen) 831 if (newlen)
793 len = strlen (kbuf); 832 len = strlen (kbuf);
794 } 833 }
795 834
796 /* 835 /*
… …
805 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
806 { 845 {
807 len = 1; 846 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
810 else 854 else
811 { 855 {
812#ifdef META8_OPTION 856#ifdef META8_OPTION
813 /* set 8-bit on */ 857 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
… …
826 } 870 }
827 871
828 if (len <= 0) 872 if (len <= 0)
829 return; /* not mapped */ 873 return; /* not mapped */
830 874
831 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 876 if (view_start)
833 { 877 {
834 TermWin.view_start = 0; 878 view_start = 0;
835 want_refresh = 1; 879 want_refresh = 1;
836 } 880 }
837 881
838 /* 882 /*
839 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
872#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
874} 918}
875/*}}} */ 919/*}}} */
876 920
877#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
880unsigned int 924unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882{ 926{
… …
905 949
906 cmd_parse (); 950 cmd_parse ();
907 951
908 return 0; 952 return 0;
909} 953}
910#endif /* MENUBAR_MAX */ 954#endif
911 955
912void 956void
913rxvt_term::flush () 957rxvt_term::flush ()
914{ 958{
959 flush_ev.stop ();
960
915#ifdef TRANSPARENT 961#ifdef TRANSPARENT
916 if (want_full_refresh) 962 if (want_full_refresh)
917 { 963 {
918 want_full_refresh = 0; 964 want_full_refresh = 0;
919 scr_clear (); 965 scr_clear ();
… …
929 IMSendSpot (); 975 IMSendSpot ();
930#endif 976#endif
931 } 977 }
932 978
933 display->flush (); 979 display->flush ();
934
935 flush_ev.stop ();
936} 980}
937 981
938void 982void
939rxvt_term::check_cb (check_watcher &w) 983rxvt_term::check_cb (check_watcher &w)
940{ 984{
… …
942 SET_LOCALE (locale); 986 SET_LOCALE (locale);
943 987
944 display->flush (); 988 display->flush ();
945 989
946 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
948} 992}
949 993
950void 994void
951rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
952{ 996{
… …
1016{ 1060{
1017 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1018 || 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)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1064 {
1065 if (view_start == nsaved ||
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0;
1068
1021 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1070 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1072 }
1025} 1073}
1026#endif 1074#endif
1027 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
1028bool 1094bool
1029rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1030{ 1096{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1098
1033 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1034 { 1100 {
1035 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");
1036 n = 0; 1102 n = 0;
1037 } 1103 }
1038 1104
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1042 1108
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1044 1110
1045 if (n > 0) 1111 if (r > 0)
1046 { 1112 {
1047 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1048 return true; 1114 return true;
1049 } 1115 }
1050 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))
1051 destroy (); 1128 destroy ();
1129 }
1052 1130
1053 return false; 1131 return false;
1054} 1132}
1055 1133
1056void 1134void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1135rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1136{
1059 SET_R (this); 1137 SET_R (this);
1060 SET_LOCALE (locale); 1138 SET_LOCALE (locale);
1061 1139
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1142 while (pty_fill ())
1067 if (cmd_parse ()) 1143 if (cmd_parse ())
1068 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
1069} 1148}
1070 1149
1071void 1150void
1072rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1073{ 1152{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1075 recolour_cursor (); 1154 recolour_cursor ();
1076 1155
1077#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1157 hidden_pointer = 0;
1079 1158
1080 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1161#endif
1083} 1162}
1084 1163
1085#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1086void 1165void
1087rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1088{ 1167{
1089 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1090 return; 1169 return;
1091 1170
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1093 XFlush (display->display); 1172 XFlush (display->display);
1094 1173
1095 hidden_pointer = 1; 1174 hidden_pointer = 1;
1096} 1175}
1097 1176
… …
1186 1265
1187/*{{{ process an X event */ 1266/*{{{ process an X event */
1188void 1267void
1189rxvt_term::x_cb (XEvent &ev) 1268rxvt_term::x_cb (XEvent &ev)
1190{ 1269{
1270 dDisp;
1271
1191 SET_R (this); 1272 SET_R (this);
1192 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1193 1274
1194#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1196 { 1277 {
1197 if (hidden_cursor) 1278 if (hidden_cursor)
1198 { 1279 {
1199 hidden_cursor = 0; 1280 hidden_cursor = 0;
1200 want_refresh = 1; 1281 want_refresh = 1;
… …
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1204 } 1285 }
1205#endif 1286#endif
1206 1287
1207#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1209 { 1290 {
1210 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1213 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1297 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1298 pointer_blank ();
1218 } 1299 }
1219#endif 1300#endif
1220 1301
1221#ifdef USE_XIM
1222 if (XFilterEvent (&ev, None))
1223 return;
1224#endif
1225
1226 Window unused_root, unused_child; 1302 Window unused_root, unused_child;
1227 int unused_root_x, unused_root_y; 1303 int unused_root_x, unused_root_y;
1228 unsigned int unused_mask; 1304 unsigned int unused_mask;
1229 1305
1230 switch (ev.type) 1306 switch (ev.type)
1231 { 1307 {
1232 case KeyPress: 1308 case KeyPress:
1233#if ISO_14755 1309#if ISO_14755
… …
1316 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1317 break; 1393 break;
1318 1394
1319 case ClientMessage: 1395 case ClientMessage:
1320 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1321 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1322 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
1323#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1324 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1325 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1327 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1328 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1329 { 1423 {
1330 /* Get Dnd data */ 1424 /* Get Dnd data */
1331 Atom ActualType; 1425 Atom ActualType;
1332 int ActualFormat; 1426 int ActualFormat;
1333 unsigned char *data; 1427 unsigned char *data;
1334 unsigned long Size, RemainingBytes; 1428 unsigned long Size, RemainingBytes;
1335 1429
1336 XGetWindowProperty (display->display, display->root, 1430 XGetWindowProperty (disp, display->root,
1337 xa[XA_DNDSELECTION], 1431 xa[XA_DNDSELECTION],
1338 0L, 1000000L, 1432 0L, 1000000L,
1339 False, AnyPropertyType, 1433 False, AnyPropertyType,
1340 &ActualType, &ActualFormat, 1434 &ActualType, &ActualFormat,
1341 &Size, &RemainingBytes, 1435 &Size, &RemainingBytes,
1342 &data); 1436 &data);
1343 XChangeProperty (display->display, display->root, 1437 set_string_property (XA_CUT_BUFFER0, data);
1344 XA_CUT_BUFFER0, XA_STRING,
1345 8, PropModeReplace,
1346 data, strlen (data));
1347 XFree (data); 1438 XFree (data);
1348 selection_paste (display->root, XA_CUT_BUFFER0, True); 1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350 } 1441 }
1351#endif /* OFFIX_DND */ 1442#endif /* OFFIX_DND */
1352 break; 1443 break;
1353 1444
1354 case MappingNotify: 1445 case MappingNotify:
… …
1379 break; 1470 break;
1380 } 1471 }
1381 break; 1472 break;
1382 1473
1383 case FocusIn: 1474 case FocusIn:
1384 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])
1385 { 1484 {
1386 TermWin.focus = 1;
1387 want_refresh = 1;
1388#ifdef USE_XIM
1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1392 XSetICFocus (Input_Context);
1393 }
1394#endif
1395#ifdef CURSOR_BLINK
1396 if (options & Opt_cursorBlink)
1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398#endif
1399#ifdef OFF_FOCUS_FADING
1400 if (rs[Rs_fade])
1401 {
1402 pix_colors = pix_colors_focused;
1403 scr_recolour ();
1404 }
1405#endif
1406
1407 }
1408 break;
1409
1410 case FocusOut:
1411 if (TermWin.focus)
1412 {
1413 TermWin.focus = 0;
1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1422#ifdef USE_XIM
1423 if (Input_Context != NULL)
1424 XUnsetICFocus (Input_Context);
1425#endif
1426#ifdef CURSOR_BLINK
1427 if (options & Opt_cursorBlink)
1428 cursor_blink_ev.stop ();
1429 hidden_cursor = 0;
1430#endif
1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1438 }
1439 break;
1440
1441 case ConfigureNotify:
1442 if (ev.xconfigure.window == TermWin.parent[0])
1443 {
1444 int height, width;
1445
1446 do
1447 { /* Wrap lots of configures into one */
1448 width = ev.xconfigure.width;
1449 height = ev.xconfigure.height;
1450 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451 }
1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ;
1453 1487
1454 if (szHint.width != width || szHint.height != height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1455 { 1489 {
1456 seen_resize = 1; 1490 seen_resize = 1;
1457 resize_all_windows (width, height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1458 } 1492 }
1459 1493
1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1462 {
1463 check_our_parents (); 1496 check_our_parents ();
1464 if (am_transparent)
1465 want_refresh = want_full_refresh = 1;
1466 }
1467#endif 1497#endif
1468 } 1498 }
1469 break; 1499 break;
1470 1500
1471 case PropertyNotify: 1501 case PropertyNotify:
… …
1479 selection_clear (); 1509 selection_clear ();
1480 break; 1510 break;
1481 1511
1482 case SelectionNotify: 1512 case SelectionNotify:
1483 if (selection_wait == Sel_normal) 1513 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, 1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 ev.xselection.property, True);
1486 break; 1515 break;
1487 1516
1488 case SelectionRequest: 1517 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1490 break; 1519 break;
1491 1520
1492 case UnmapNotify: 1521 case UnmapNotify:
1493 TermWin.mapped = 0; 1522 mapped = 0;
1494#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1496#endif 1525#endif
1497 break; 1526 break;
1498 1527
1499 case MapNotify: 1528 case MapNotify:
1500 TermWin.mapped = 1; 1529 mapped = 1;
1501#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif 1532#endif
1504 break; 1533 break;
1505 1534
… …
1509 break; 1538 break;
1510#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1511 1540
1512 case GraphicsExpose: 1541 case GraphicsExpose:
1513 case Expose: 1542 case Expose:
1514 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1515 { 1544 {
1516 do 1545 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1520 1549
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1551
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1526 1555
1527 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1528 } 1557 }
1529 else 1558 else
1530 { 1559 {
1531 XEvent unused_event; 1560 XEvent unused_event;
1532 1561
1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534 ; 1563 ;
1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1565 ;
1537 1566
1538 if (isScrollbarWindow (ev.xany.window)) 1567 if (isScrollbarWindow (ev.xany.window))
1539 { 1568 {
1540 scrollBar.setIdle (); 1569 scrollBar.setIdle ();
… …
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose (); 1574 menubar_expose ();
1546#endif 1575#endif
1547 1576
1548#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (display->display, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1551#endif 1580#endif
1552 } 1581 }
1553 break; 1582 break;
1554 1583
1555 case MotionNotify: 1584 case MotionNotify:
… …
1562 { 1591 {
1563 menubar_control (ev.xbutton); 1592 menubar_control (ev.xbutton);
1564 break; 1593 break;
1565 } 1594 }
1566#endif 1595#endif
1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1597 break;
1569 1598
1570 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1571 { 1600 {
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1602 {
1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1604 ;
1576 1605
1577 XQueryPointer (display->display, TermWin.vt, 1606 XQueryPointer (disp, vt,
1578 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1580 & (ev.xbutton.x), & (ev.xbutton.y), 1609 &ev.xbutton.x, &ev.xbutton.y,
1581 &unused_mask); 1610 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1583 /* deal with a `jumpy' mouse */ 1612 /* deal with a `jumpy' mouse */
1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1613 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585 { 1614 {
1586#endif 1615#endif
… …
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1620 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break; 1621 break;
1593 } 1622 }
1594#endif 1623#endif
1595 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1596 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1626
1597#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1598 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1600 { 1630 {
1601 int dist; 1631 int dist;
1602 1632
1603 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1604 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
… …
1612 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1613 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615 1645
1616 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1617 if (ev.xbutton.y<TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1618 { 1648 {
1619 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1620 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1621 } 1651 }
1622 else 1652 else
1623 { 1653 {
1624 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1626 } 1656 }
1627 1657
1628 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1629 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1; 1660 + 1;
1631 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1632 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1633 } 1663 }
1634 else 1664 else
1635 { 1665 {
1636 /* we are within the text window, so we 1666 /* we are within the text window, so we
… …
1645#endif 1675#endif
1646 } 1676 }
1647 } 1677 }
1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649 { 1679 {
1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1680 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651 MotionNotify, &ev)) ; 1681 MotionNotify, &ev))
1682 ;
1683
1652 XQueryPointer (display->display, scrollBar.win, 1684 XQueryPointer (disp, scrollBar.win,
1653 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1655 & (ev.xbutton.x), & (ev.xbutton.y), 1687 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1688 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658 scrollbar_size ()); 1690 scrollbar_size ());
1659 scr_refresh (refresh_type); 1691 scr_refresh (refresh_type);
1660 refresh_limit = 0; 1692 refresh_limit = 0;
… …
1662 } 1694 }
1663 break; 1695 break;
1664 } 1696 }
1665} 1697}
1666 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
1667#if TRANSPARENT 1768#if TRANSPARENT
1668void 1769void
1669rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1670{ 1771{
1671 SET_R (this); 1772 SET_R (this);
… …
1676 case PropertyNotify: 1777 case PropertyNotify:
1677 /* 1778 /*
1678 * 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,
1679 * 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.
1680 */ 1781 */
1681 if (xa[XA_XROOTPMAPID] == 0)
1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684 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])
1685 return; 1784 return;
1686 1785
1687 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1688 case ReparentNotify: 1787 case ReparentNotify:
1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1690 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1691 break; 1790 break;
1692 } 1791 }
1693} 1792}
1694#endif 1793#endif
… …
1697rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1698{ 1797{
1699 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1700 1799
1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1702 if (!bypass_keystate) 1802 if (!bypass_keystate)
1703 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704 1804
1705 /* 1805 /*
1706 * VT window processing of button press 1806 * VT window processing of button press
1707 */ 1807 */
1708 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1709 { 1809 {
1710#if ISO_14755 1810#if ISO_14755
1711 // 5.4 1811 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 { 1813 {
… …
1715 return; 1815 return;
1716 } 1816 }
1717#endif 1817#endif
1718 1818
1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1720 if (reportmode) 1821 if (reportmode)
1721 { 1822 {
1722 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
… …
1753 } 1854 }
1754 else 1855 else
1755 { 1856 {
1756 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1757 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1758 switch (ev.button) 1861 switch (ev.button)
1759 { 1862 {
1760 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
1761 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763 { 1874 {
1764 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1766 else 1877 else
1767 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1768 } 1879 }
1769 else 1880 else
1770 { 1881 {
1771 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1772 MEvent.clicks++; 1883 MEvent.clicks++;
1773 else 1884 else
1774 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1775 1886
1776 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1777 } 1888 }
1778 1889
1779 MEvent.button = Button1; 1890 MEvent.button = Button1;
1780 break; 1891 break;
1781 1892
1782 case Button3: 1893 case Button3:
1783 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1784 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1785 else 1896 else
1786 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1787 1898
1788 MEvent.button = Button3; 1899 MEvent.button = Button3;
1789 break; 1900 break;
1790 } 1901 }
1791 } 1902 }
1792 1903
1793 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1794 return; 1905 return;
1795 } 1906 }
1796 1907
… …
1908 case Button3: 2019 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1910 { 2021 {
1911 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1914# else 2025# else
1915 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1916# endif 2027# endif
1917 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1920# else 2031# else
1921 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1922# endif 2033# endif
1923 else 2034 else
1924 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1925 } 2036 }
1926 else 2037 else
1927 { 2038 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 2040 (nrow
1930 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 2042 / scrollbar_size ()));
1932 } 2043 }
1933 2044
1934 break; 2045 break;
… …
1966#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
1969#endif 2080#endif
1970 2081
1971 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1972 { 2083 {
1973#if ISO_14755 2084#if ISO_14755
1974 // 5.4 2085 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2087 return;
… …
2026 2137
2027 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2028 2139
2029 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2030 i = 1; 2141 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2032 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2033 else 2144 else
2034 i = 5; 2145 i = 5;
2035 2146
2036# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2038 { 2149 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2040 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;
2041 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;
2042 2153
2043 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2156
2046 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2201 int i;
2091 2202
2092 Visual* visual = display->visual; 2203 Visual *visual = display->visual;
2093 2204
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2206
2096 /* for convenience */ 2207 /* for convenience */
2097 mask_r = visual->red_mask; 2208 mask_r = visual->red_mask;
… …
2318 Atom atype; 2429 Atom atype;
2319 unsigned char *prop = NULL; 2430 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2431 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2432 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2323 2435
2324 pchanged = 0; 2436 pchanged = 0;
2325 2437
2326 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2328 2440
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2331 2443
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2333 2445
2334 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2335 { 2447 {
2336 if (am_transparent) 2448 if (am_transparent)
2337 { 2449 {
2338 pchanged = 1; 2450 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2341 } 2453 }
2342 2454
2343 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2344 } 2456 }
2345 2457
2346 /* 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. */
2347 XSync (display->display, False); 2459 XSync (disp, False);
2348 2460
2349 /* 2461 /*
2350 * Make the frame window set by the window manager have 2462 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2463 * the root background. Some window managers put multiple nested frame
2352 * 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.
2353 */ 2465 */
2354 i = (xa[XA_XROOTPMAPID] 2466 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2358 2470
2359 if (!i || prop == NULL) 2471 if (!i || prop == NULL)
2360 i = (xa[XA_XSETROOTID] 2472 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2475 &nitems, &bytes_after, &prop) == Success);
2364 2476
2365 if (!i || prop == NULL 2477 if (!i || prop == NULL
2366#if TINTING 2478#if TINTING
… …
2385 Window cr; 2497 Window cr;
2386 XImage *image; 2498 XImage *image;
2387 GC gc; 2499 GC gc;
2388 XGCValues gcvalue; 2500 XGCValues gcvalue;
2389 2501
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2506 nx = ny = 0;
2395 2507
… …
2405 nh += sy; 2517 nh += sy;
2406 ny = -sy; 2518 ny = -sy;
2407 sy = 0; 2519 sy = 0;
2408 } 2520 }
2409 2521
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2412 allowedxerror = -1; 2526 allowedxerror = -1;
2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414 2528
2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2416 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
2417 allowedxerror = 0; 2531 allowedxerror = 0;
2418 2532
2419 if (image == NULL) 2533 if (image == NULL)
2420 { 2534 {
2421 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2422 { 2536 {
2423 pchanged = 1; 2537 pchanged = 1;
2424 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2425 { 2539 {
2426 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2427 TermWin.pixmap = None; 2541 pixmap = None;
2428 } 2542 }
2429 } 2543 }
2430 2544
2431 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2432 } 2546 }
2433 else 2547 else
2434 { 2548 {
2435 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2436 XFreePixmap (display->display, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2437 2551
2438#if TINTING 2552#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2440 { 2554 {
2441 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
… …
2445 2559
2446 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2447 } 2561 }
2448#endif 2562#endif
2449 2563
2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2451 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2454 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2455 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
2456 XDestroyImage (image); 2570 XDestroyImage (image);
2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2458 XClearWindow (display->display, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2459 2573
2460 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2461 pchanged = 1; 2575 pchanged = 1;
2462 2576
2463 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2464 } 2578 }
2465 } 2579 }
2466 2580
2467 if (!am_pixmap_trans) 2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2468 { 2584 {
2469 unsigned int n; 2585 unsigned int n;
2470 /* 2586 /*
2471 * InheritPixmap transparency 2587 * InheritPixmap transparency
2472 */ 2588 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2590 {
2475 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2476 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2478 XFree (list); 2594 XFree (list);
2479 2595
2480 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2481 { 2597 {
2482 if (oldp != None) 2598 if (oldp != None)
2483 pchanged = 1; 2599 pchanged = 1;
2484 2600
2485 break; 2601 break;
2486 } 2602 }
2487 2603
2488 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2489 pchanged = 1; 2605 pchanged = 1;
2490 } 2606 }
2491 2607
2492 n = 0; 2608 n = 0;
2493 2609
2494 if (pchanged) 2610 if (pchanged)
2495 { 2611 {
2496 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2497 { 2613 {
2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2616 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2618 break;
2503 } 2619 }
2504 } 2620 }
2505 } 2621 }
2506 2622
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2624 {
2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2627 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2513 } 2629 }
2514 else 2630 else
2515 { 2631 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2635 sleep (1);
2520#endif 2636#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2522 { 2638 {
2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2525 } 2641 }
2526 2642
2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2644 am_transparent = 1;
2529 } 2645 }
2530 2646
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2648 parent[i] = None;
2533 } 2649 }
2534 2650
2535 if (scrollBar.win) 2651 if (scrollBar.win)
2536 { 2652 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle (); 2654 scrollBar.setIdle ();
2539 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 ();
2540 } 2663 }
2541 2664
2542 return pchanged; 2665 return pchanged;
2543} 2666}
2544#endif 2667#endif
… …
2573 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized. 2700 // resized.
2578 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2579 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2580 } 2703 }
2581 2704
2582 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2583 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2584 bool refreshnow = false; 2707 bool refreshnow = false;
2585 int nlines = 0; 2708 int nlines = 0;
2586 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2587 2711
2588 for (;;) 2712 for (;;)
2589 { 2713 {
2590 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))
2591 break; 2715 break;
2592 2716
2593 *str++ = ch; 2717 *str++ = ch;
2594 2718
2595 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2596 { 2720 {
2721 if (ch == C0_LF)
2597 nlines++; 2722 nlines++;
2723
2598 refresh_count++; 2724 refresh_count++;
2599 2725
2600 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2602 { 2728 {
2603 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2604 ch = NOCHAR; 2731 ch = NOCHAR;
2605 break; 2732 break;
2606 } 2733 }
2607 2734
2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2609 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2610 { 2737 {
2611 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2612 nlines = 0; 2739 nlines = 0;
2613 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2614 } 2742 }
2615 }
2616 2743
2617 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2618 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2619 ch = NOCHAR; 2748 ch = NOCHAR;
2620 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2621 } 2755 }
2622 2756
2623 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2758 ch = next_char ();
2625 } 2759 }
… …
2632 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2633 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2634 */ 2768 */
2635 if (refreshnow) 2769 if (refreshnow)
2636 { 2770 {
2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2638 refresh_limit++; 2772 refresh_limit++;
2639 else 2773 else
2640 { 2774 {
2641 flag = true; 2775 flag = true;
2642 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2643 } 2778 }
2644 } 2779 }
2645 2780
2646 } 2781 }
2647 else 2782 else
… …
2696 if (len == (size_t)-1) 2831 if (len == (size_t)-1)
2697 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
2698 2833
2699 // assume wchar == unicode 2834 // assume wchar == unicode
2700 cmdbuf_ptr += len; 2835 cmdbuf_ptr += len;
2701 return wc; 2836 return wc & UNICODE_MASK;
2702 } 2837 }
2703 2838
2704 return NOCHAR; 2839 return NOCHAR;
2705} 2840}
2706 2841
… …
3169 { 3304 {
3170 switch (priv) 3305 switch (priv)
3171 { 3306 {
3172 case '>': 3307 case '>':
3173 if (ch == CSI_DA) /* secondary device attributes */ 3308 if (ch == CSI_DA) /* secondary device attributes */
3174 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175 break; 3310 break;
3176 case '?': 3311 case '?':
3177 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178 process_terminal_mode (ch, priv, nargs, arg); 3313 process_terminal_mode (ch, priv, nargs, arg);
3179 break; 3314 break;
… …
3284 3419
3285 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3420 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3286 arg[0] = -arg[0]; 3421 arg[0] = -arg[0];
3287 /* FALLTHROUGH */ 3422 /* FALLTHROUGH */
3288 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3290 break; 3425 break;
3291 3426
3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3293 tt_write ((const unsigned char *)VT100_ANS, 3428 tt_write ((const unsigned char *)VT100_ANS,
3294 (unsigned int) (sizeof (VT100_ANS) - 1)); 3429 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3306 break; 3441 break;
3307 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3308 scr_report_position (); 3443 scr_report_position ();
3309 break; 3444 break;
3310 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3311 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3312 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3313 break; 3448 break;
3314 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3316 break; 3451 break;
… …
3408rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3543rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409{ 3544{
3410 int x, y; 3545 int x, y;
3411 XWindowAttributes wattr; 3546 XWindowAttributes wattr;
3412 Window wdummy; 3547 Window wdummy;
3548 dDisp;
3413 3549
3414 if (nargs == 0) 3550 if (nargs == 0)
3415 return; 3551 return;
3416 3552
3417 switch (args[0]) 3553 switch (args[0])
3418 { 3554 {
3419 /* 3555 /*
3420 * commands 3556 * commands
3421 */ 3557 */
3422 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3423 XMapWindow (display->display, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3424 break; 3560 break;
3425 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3426 XIconifyWindow (display->display, TermWin.parent[0], 3562 XIconifyWindow (disp, parent[0], display->screen);
3427 DefaultScreen (display->display));
3428 break; 3563 break;
3429 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3430 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3431 break; 3566 break;
3432 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3433 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434 break; 3569 break;
3435 case 5: /* raise window */ 3570 case 5: /* raise window */
3436 XRaiseWindow (display->display, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3437 break; 3572 break;
3438 case 6: /* lower window */ 3573 case 6: /* lower window */
3439 XLowerWindow (display->display, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3440 break; 3575 break;
3441 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3442 scr_touch (true); 3577 scr_touch (true);
3443 break; 3578 break;
3444 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3445 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3446 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3447 break; 3582 break;
3448 3583
3449 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3450 default: 3585 default:
3451 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3452 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3453 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3454 break; 3589 break;
3455 3590
3456 3591
3457 /* 3592 /*
3458 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3459 */ 3594 */
3460 case 11: /* report window state */ 3595 case 11: /* report window state */
3461 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463 break; 3598 break;
3464 case 13: /* report window position */ 3599 case 13: /* report window position */
3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3467 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3468 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3469 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3470 break; 3605 break;
3471 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474 break; 3609 break;
3475 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3477 break; 3612 break;
3478 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3480 break; 3615 break;
3481 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3482 { 3617 {
3483 char *s; 3618 char *s;
3484 XGetIconName (display->display, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3485 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 */
3486 XFree (s); 3621 XFree (s);
3487 } 3622 }
3488 break; 3623 break;
3489 case 21: /* report window title */ 3624 case 21: /* report window title */
3490 { 3625 {
3491 char *s; 3626 char *s;
3492 XFetchName (display->display, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3493 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 */
3494 XFree (s); 3629 XFree (s);
3495 } 3630 }
3496 break; 3631 break;
3497 } 3632 }
3498} 3633}
… …
3504 * ends_how is terminator used. returned input must be free()'d 3639 * ends_how is terminator used. returned input must be free()'d
3505 */ 3640 */
3506unsigned char * 3641unsigned char *
3507rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
3508{ 3643{
3509 unicode_t seen_esc = 0, ch; 3644 unicode_t ch;
3645 bool seen_esc = false;
3510 unsigned int n = 0; 3646 unsigned int n = 0;
3511 unsigned char *s;
3512 unsigned char string[STRING_MAX]; 3647 wchar_t string[STRING_MAX];
3513 3648
3514 while ((ch = cmd_getc ()) != NOCHAR) 3649 while ((ch = cmd_getc ()) != NOCHAR)
3515 { 3650 {
3516 if (seen_esc) 3651 if (seen_esc)
3517 { 3652 {
… …
3520 else 3655 else
3521 return NULL; 3656 return NULL;
3522 } 3657 }
3523 else if (ch == C0_ESC) 3658 else if (ch == C0_ESC)
3524 { 3659 {
3525 seen_esc = 1; 3660 seen_esc = true;
3526 continue; 3661 continue;
3527 } 3662 }
3528 else if (ch == C0_BEL || ch == CHAR_ST) 3663 else if (ch == C0_BEL || ch == CHAR_ST)
3529 break; 3664 break;
3530 else if (ch < 0x20) 3665 else if (ch < 0x20)
3531 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3532 3667
3533 seen_esc = 0; 3668 seen_esc = false;
3534 3669
3535 if (n >= sizeof (string) - 1) 3670 if (n >= STRING_MAX - 1)
3536 // stop at some sane length 3671 // stop at some sane length
3537 return NULL; 3672 return NULL;
3538 3673
3539 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
… …
3542 string[n++] = ch; 3677 string[n++] = ch;
3543 } 3678 }
3544 3679
3545 string[n++] = '\0'; 3680 string[n++] = '\0';
3546 3681
3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548 return NULL;
3549
3550 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
3551 strncpy (s, string, n); 3683
3552 return s; 3684 return (unsigned char *)rxvt_wcstombs (string);
3553} 3685}
3554 3686
3555/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3556/* 3688/*
3557 * 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)'
… …
3611 set_window_color (color, str); 3743 set_window_color (color, str);
3612} 3744}
3613 3745
3614/* 3746/*
3615 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3616 * 0 = change iconName/title
3617 * 1 = change iconName
3618 * 2 = change title
3619 * 4 = change color
3620 * 10 = change fg color
3621 * 11 = change bg color
3622 * 12 = change text color
3623 * 13 = change mouse foreground color
3624 * 17 = change highlight character colour
3625 * 18 = change bold character color
3626 * 19 = change underlined character color
3627 * 46 = change logfile (not implemented)
3628 * 50 = change font
3629 *
3630 * rxvt extensions:
3631 * 20 = bg pixmap
3632 * 39 = change default fg color
3633 * 49 = change default bg color
3634 * 55 = dump scrollback buffer and all of screen
3635 * 701 = change locale
3636 * 702 = find font
3637 * 703 = menu
3638 */ 3748 */
3639void 3749void
3640rxvt_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)
3641{ 3751{
3642 int changed = 0; 3752 int changed = 0;
3643 int color; 3753 int color;
3644 char *buf, *name; 3754 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3646 int saveop = op; 3756 int saveop = op;
3757 dDisp;
3647 3758
3648 assert (str != NULL); 3759 assert (str != NULL);
3649 switch (op) 3760 switch (op)
3650 { 3761 {
3651 case XTerm_name: 3762 case XTerm_name:
… …
3658 set_title (str); 3769 set_title (str);
3659 break; 3770 break;
3660 case XTerm_property: 3771 case XTerm_property:
3661 if (str[0] == '?') 3772 if (str[0] == '?')
3662 { 3773 {
3663 Atom prop = XInternAtom (display->display, str + 1, True); 3774 Atom prop = display->atom (str + 1);
3664 Atom actual_type; 3775 Atom actual_type;
3665 int actual_format; 3776 int actual_format;
3666 unsigned long nitems; 3777 unsigned long nitems;
3667 unsigned long bytes_after; 3778 unsigned long bytes_after;
3668 unsigned char *value = 0; 3779 unsigned char *value = 0;
3669 const char *str = ""; 3780 const char *str = "";
3670 3781
3671 if (prop 3782 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0], 3783 && XGetWindowProperty (disp, parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None 3787 && actual_type != None
3677 && actual_format == 8) 3788 && actual_format == 8)
… …
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3797 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687 3798
3688 if (eq) 3799 if (eq)
3689 { 3800 {
3690 *eq = 0; 3801 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0], 3802 set_utf8_property (display->atom (str), eq + 1);
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 } 3803 }
3696 else 3804 else
3697 XDeleteProperty (display->display, TermWin.parent[0], 3805 XDeleteProperty (disp, parent[0],
3698 display->atom (str)); 3806 display->atom (str));
3699 } 3807 }
3700 break; 3808 break;
3701 3809
3702 case XTerm_Color: 3810 case XTerm_Color:
… …
3743 break; 3851 break;
3744#ifndef NO_BOLD_UNDERLINE_REVERSE 3852#ifndef NO_BOLD_UNDERLINE_REVERSE
3745 case XTerm_Color_BD: 3853 case XTerm_Color_BD:
3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747 break; 3855 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3751 case XTerm_Color_UL: 3856 case XTerm_Color_UL:
3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3753 break; 3858 break;
3754 case XTerm_Color_RV: 3859 case XTerm_Color_RV:
3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break; 3861 break;
3862 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break;
3757#endif 3865#endif
3758#if TRANSPARENT || TINTING 3866#if TRANSPARENT && TINTING
3759 case XTerm_Color_tint: 3867 case URxvt_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3761 check_our_parents (); 3869 check_our_parents ();
3762 if (am_transparent) 3870 if (am_transparent)
3763 want_full_refresh = want_refresh = 1; 3871 want_full_refresh = want_refresh = 1;
3764 break; 3872 break;
3765#endif 3873#endif
… …
3777 { 3885 {
3778 str++; 3886 str++;
3779#if XPM_BACKGROUND 3887#if XPM_BACKGROUND
3780 changed += scale_pixmap (str); 3888 changed += scale_pixmap (str);
3781#endif 3889#endif
3782
3783 } 3890 }
3891
3784 if (changed) 3892 if (changed)
3785 { 3893 {
3786#ifdef XPM_BACKGROUND 3894#ifdef XPM_BACKGROUND
3787 resize_pixmap (); 3895 resize_pixmap ();
3788#endif 3896#endif
… …
3799 3907
3800 case XTerm_logfile: 3908 case XTerm_logfile:
3801 // TODO, when secure mode? 3909 // TODO, when secure mode?
3802 break; 3910 break;
3803 3911
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0
3919 case XTerm_dumpscreen: /* no error notices */
3920 {
3921 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 {
3924 scr_dump (fd);
3925 close (fd);
3926 }
3927 }
3928 break;
3929#endif
3804 case XTerm_font: 3930 case XTerm_font:
3805 op = URxvt_font; 3931 op = URxvt_font;
3806 case URxvt_font: 3932 case URxvt_font:
3807#if ENABLE_STYLES 3933#if ENABLE_STYLES
3808 case URxvt_boldFont: 3934 case URxvt_boldFont:
3809 case URxvt_italicFont: 3935 case URxvt_italicFont:
3810 case URxvt_boldItalicFont: 3936 case URxvt_boldItalicFont:
3811#endif 3937#endif
3812 if (query) 3938 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop, 3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3941 ? fontset[op - URxvt_font]->fontdesc : "",
3816 resp); 3942 resp);
3817 else 3943 else
3818 { 3944 {
3819 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3820 3946
… …
3823 set_fonts (); 3949 set_fonts ();
3824 } 3950 }
3825 break; 3951 break;
3826 3952
3827#if ENABLE_FRILLS 3953#if ENABLE_FRILLS
3828 case XTerm_locale: 3954 case URxvt_locale:
3829 if (query) 3955 if (query)
3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3831 else 3957 else
3832 { 3958 {
3833 set_locale (str); 3959 set_locale (str);
3834# ifdef USE_XIM 3960 pty.set_utf8_mode (enc_utf8);
3835 im_cb (); 3961 init_xlocale ();
3836# endif
3837 } 3962 }
3838 break; 3963 break;
3839#endif
3840 3964
3841#ifdef MENUBAR 3965 case URxvt_view_up:
3842 case XTerm_Menu: 3966 case URxvt_view_down:
3843 if (options & Opt_insecure) 3967 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 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
3845 break; 3976 break;
3846#endif 3977#endif
3847#if 0 3978
3848 case XTerm_dumpscreen: /* no error notices */ 3979#if ENABLE_PERL
3849 { 3980 case URxvt_perl:
3850 int fd; 3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3982 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3983 break;
3858#endif 3984#endif
3859 } 3985 }
3860} 3986}
3861/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3970 } 4096 }
3971 4097
3972 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4099 switch (arg[i])
3974 { 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
3975 case 1048: /* alternative cursor save */ 4111 case 1048: /* alternative cursor save */
3976 case 1049: 4112 case 1049:
3977 if (options & Opt_secondaryScreen) 4113 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4114 if (mode == 0)
3979 scr_cursor (RESTORE); 4115 scr_cursor (RESTORE);
3980 else if (mode == 1) 4116 else if (mode == 1)
3981 scr_cursor (SAVE); 4117 scr_cursor (SAVE);
3982 break; 4118 break;
… …
3994 */ 4130 */
3995 PrivMode (1, PrivMode_vt52); 4131 PrivMode (1, PrivMode_vt52);
3996 break; 4132 break;
3997 case 3: /* 80/132 */ 4133 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4134 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4135 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4136 break;
4001 case 4: /* smooth scrolling */ 4137 case 4: /* smooth scrolling */
4002 if (state) 4138 if (!state)
4003 options &= ~Opt_jumpScroll; 4139 SET_OPTION (Opt_jumpScroll);
4004 else 4140 else
4005 options |= Opt_jumpScroll; 4141 CLR_OPTION (Opt_jumpScroll);
4006 break; 4142 break;
4007 case 5: /* reverse video */ 4143 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4144 scr_rvideo_mode (state);
4009 break; 4145 break;
4010 case 6: /* relative/absolute origins */ 4146 case 6: /* relative/absolute origins */
… …
4051#if 0 4187#if 0
4052 case 1001: 4188 case 1001:
4053 break; /* X11 mouse highlighting */ 4189 break; /* X11 mouse highlighting */
4054#endif 4190#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4191 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state) 4192 if (!state)
4057 options &= ~Opt_scrollTtyOutput; 4193 SET_OPTION (Opt_scrollTtyOutput);
4058 else 4194 else
4059 options |= Opt_scrollTtyOutput; 4195 CLR_OPTION (Opt_scrollTtyOutput);
4060 break; 4196 break;
4061 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4062 if (state) 4198 if (state)
4063 options |= Opt_scrollTtyKeypress; 4199 SET_OPTION (Opt_scrollTtyKeypress);
4064 else 4200 else
4065 options &= ~Opt_scrollTtyKeypress; 4201 CLR_OPTION (Opt_scrollTtyKeypress);
4066 break; 4202 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4203 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4204 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4205 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4206 scr_erase_screen (2);
4071 scr_change_screen (state); 4207 scr_change_screen (state);
4072 break; 4208 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4209 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4210 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4211 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4212 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4213 scr_erase_screen (2);
4078 break; 4214 break;
4079 default: 4215 default:
4080 break; 4216 break;
… …
4230 case 106: 4366 case 106:
4231 case 107: 4367 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4368 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4369 break;
4234#endif 4370#endif
4235
4236 } 4371 }
4237 } 4372 }
4238} 4373}
4239/*}}} */ 4374/*}}} */
4240 4375
… …
4276 4411
4277/* ---------------------------------------------------------------------- */ 4412/* ---------------------------------------------------------------------- */
4278/* 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,
4279 * or generated by us in response to a query ESC sequence. 4414 * or generated by us in response to a query ESC sequence.
4280 */ 4415 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417
4281void 4418void
4282rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4419rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283{ 4420{
4284 const unsigned int 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));
4285 4424
4286 if (len) 4425 if ((unsigned int)written == len)
4426 return;
4427
4428 data += written;
4429 len -= written;
4287 { 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
4288 if (v_buflen == 0) 4448 if (v_buflen == 0)
4289 { 4449 {
4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292 if ((unsigned int)written == len)
4293 return;
4294
4295 data += written;
4296 len -= written;
4297 }
4298
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304 }
4305
4306 for (;;)
4307 {
4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310 if (written > 0)
4311 {
4312 v_buflen -= written;
4313
4314 if (v_buflen == 0)
4315 {
4316 free (v_buffer); 4450 free (v_buffer);
4317 v_buffer = 0; 4451 v_buffer = 0;
4318 v_buflen = 0; 4452 v_buflen = 0;
4319 4453
4320 pty_ev.set (EVENT_READ); 4454 pty_ev.set (EVENT_READ);
4321 return;
4322 }
4323
4324 memmove (v_buffer, v_buffer + written, v_buflen);
4325 }
4326 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4327 // original code just ignores this...
4328 destroy ();
4329 else
4330 {
4331 pty_ev.set (EVENT_READ | EVENT_WRITE);
4332 return; 4455 return;
4333 } 4456 }
4457
4458 memmove (v_buffer, v_buffer + written, v_buflen);
4334 } 4459 }
4460 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4461 pty_ev.set (EVENT_READ);
4335} 4462}
4336 4463
4337/*----------------------- end-of-file (C source) -----------------------*/ 4464/*----------------------- end-of-file (C source) -----------------------*/
4338 4465

Diff Legend

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