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

Diff Legend

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