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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 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.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
53#include <wchar.h> 61# include <sched.h>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
… …
113 XK_Escape, 0x238b, 122 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 123 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 124 XK_Print, 0x2399,
116 125
117 XK_space, 0x2423, 126 XK_space, 0x2423,
127
128#ifdef XK_KP_Begin
129 XK_KP_Prior, 0x21de,
130 XK_KP_Next, 0x21df,
131 XK_KP_Begin, 0x2320,
132 XK_KP_Insert, 0x2380,
133 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 134 XK_KP_Space, 0x2422,
135#endif
119 0, 136 0,
120}; 137};
121 138
122void 139void
123rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
124{ 141{
125 x = Pixel2Col (x); 142 x = Pixel2Col (x);
126 y = Pixel2Row (y); 143 y = Pixel2Row (y);
127 144
128 if (x < 0 || x >= TermWin.ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 147 return;
131 148
132 for (;;) 149 for (;;)
133 { 150 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
135 154
136 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
137 { 156 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 157 iso14755_51 (l.t[x], l.r[x], x, y);
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 158 iso14755buf = ISO_14755_54;
141 break; 159 break;
142 } 160 }
143 161
144 x--; 162 x--;
145 } 163 }
146
147} 164}
148#endif
149 165
150#if ENABLE_OVERLAY
151void 166void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 168{
154 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 171 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 172 int len;
158 173
174 fname = rxvt_utf8towcs (f->name);
175
159#if ENABLE_COMBINING 176# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
161 { 178 {
162 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
165 } 182 }
166 else 183 else
167#endif 184# endif
168 { 185 {
169 ch2 = ch; 186 ch2 = ch;
170 187
171 alloc = 0; 188 alloc = 0;
172 chr = &ch2; 189 chr = &ch2;
173 len = 1; 190 len = 1;
174 } 191 }
175 192
176 int width = strlen (f->name); 193 char attr[80]; // plenty
177 194
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
205 int width = wcswidth (fname, wcslen (fname));
206
207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
179 217
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 219
182 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
183 { 221 {
… …
186 ch = *chr++; 224 ch = *chr++;
187 225
188 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
191#if !UNICODE3 229# if !UNICODE3
192 if (ch >= 0x10000) 230 if (ch >= 0x10000)
193 ch = 0xfffd; 231 ch = 0xfffd;
194#endif 232# endif
195 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
197 } 235 }
198 236
237 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 238 scr_overlay_set (0, len + 1, fname);
200 239
240 free (fname);
241
201#if ENABLE_COMBINING 242# if ENABLE_COMBINING
202 if (alloc) 243 if (alloc)
203 delete [] alloc; 244 delete [] alloc;
204#endif 245# endif
205} 246}
206#endif 247#endif
207 248
208void 249void
209rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
272 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273 * escape sequence to toggle the Keypad. 314 * escape sequence to toggle the Keypad.
274 * 315 *
275 * Always permit `shift' to override the current setting 316 * Always permit `shift' to override the current setting
276 */ 317 */
277 shft = (ev.state & ShiftMask); 318 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 319 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 320 meta = ev.state & ModMetaMask;
280 321
281 if (numlock_state || (ev.state & ModNumLockMask)) 322 if (numlock_state || (ev.state & ModNumLockMask))
282 { 323 {
283 numlock_state = (ev.state & ModNumLockMask); 324 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 325 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
304 345
305 // the XOpenIM manpage lies about hardcoding the locale 346 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 347 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 348 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 349 SET_LOCALE (rs[Rs_imLocale]);
350
309 // assume wchar_t == unicode or better 351 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 352 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 353 KBUFSZ, &keysym, &status_return);
354
312 if (rs[Rs_imLocale]) 355 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 356 SET_LOCALE (locale);
314 357
315 if (status_return == XLookupChars 358 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 359 || status_return == XLookupBoth)
… …
343 valid_keysym = keysym != NoSymbol; 386 valid_keysym = keysym != NoSymbol;
344 } 387 }
345 388
346 if (valid_keysym) 389 if (valid_keysym)
347 { 390 {
391#ifdef KEYSYM_RESOURCE
392 if (keyboard->dispatch (this, keysym, ev.state))
393 return;
394#endif
395
348 if (TermWin.saveLines) 396 if (saveLines)
349 { 397 {
350#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 399 if (!ctrl && !meta)
352#else 400#else
353 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
354#endif 402#endif
355 { 403 {
356 int lnsppg; 404 int lnsppg;
357 405
358#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 408#else
361 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
362#endif 410#endif
363 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
364 { 412 {
365 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
366 return; 414 return;
… …
417 { 465 {
418 /* normal XTerm key bindings */ 466 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 467 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 468 selection_request (ev.time, 0, 0);
421 return; 469 return;
422#if TODO // TODO 470#if TODO
423 /* rxvt extras */ 471 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 472 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 473 change_font (FONT_UP);
426 return; 474 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 475 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 534 }
487#endif 535#endif
488 536
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 537 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 538 {
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 { 539 {
517 newlen = 1; 540 newlen = 1;
518 switch (keysym) 541 switch (keysym)
519 { 542 {
520#ifndef NO_BACKSPACE_KEY 543#ifndef NO_BACKSPACE_KEY
… …
528 else 551 else
529 strcpy (kbuf, key_backspace); 552 strcpy (kbuf, key_backspace);
530 break; 553 break;
531#endif 554#endif
532#ifndef NO_DELETE_KEY 555#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior
557 case XK_KP_Delete:
558 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033On");
562 break;
563 }
564 /* FALLTHROUGH */
565# endif
533 case XK_Delete: 566 case XK_Delete:
534 strcpy (kbuf, key_delete); 567 strcpy (kbuf, key_delete);
535 break; 568 break;
536#endif 569#endif
537 case XK_Tab: 570 case XK_Tab:
… …
640#ifdef XK_KP_Begin 673#ifdef XK_KP_Begin
641 case XK_KP_Begin: 674 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 675 strcpy (kbuf, "\033Ou");
643 break; 676 break;
644 677
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 678#endif
653 case XK_KP_F1: /* "\033OP" */ 679 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 680 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 681 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 682 case XK_KP_F4: /* "\033OS" */
… …
688 break; 714 break;
689 715
690 case XK_Find: 716 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 717 strcpy (kbuf, "\033[1~");
692 break; 718 break;
719
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
693 case XK_Insert: 730 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 731 strcpy (kbuf, "\033[2~");
695 break; 732 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 733#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 734 case DXK_Remove:
… …
787#undef FKEY 824#undef FKEY
788 default: 825 default:
789 newlen = 0; 826 newlen = 0;
790 break; 827 break;
791 } 828 }
829
792 if (newlen) 830 if (newlen)
793 len = strlen (kbuf); 831 len = strlen (kbuf);
794 } 832 }
795 833
796 /* 834 /*
… …
805 else if (ctrl && keysym == XK_minus) 843 else if (ctrl && keysym == XK_minus)
806 { 844 {
807 len = 1; 845 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 846 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 847 }
848 else if (keysym == XK_ISO_Left_Tab)
849 {
850 strcpy (kbuf, "\033[Z");
851 len = 3;
852 }
810 else 853 else
811 { 854 {
812#ifdef META8_OPTION 855#ifdef META8_OPTION
813 /* set 8-bit on */ 856 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 857 if (meta && (meta_char == 0x80))
… …
826 } 869 }
827 870
828 if (len <= 0) 871 if (len <= 0)
829 return; /* not mapped */ 872 return; /* not mapped */
830 873
831 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 875 if (view_start)
833 { 876 {
834 TermWin.view_start = 0; 877 view_start = 0;
835 want_refresh = 1; 878 want_refresh = 1;
836 } 879 }
837 880
838 /* 881 /*
839 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
872#endif /* DEBUG_CMD */ 915#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 916 tt_write (kbuf, (unsigned int)len);
874} 917}
875/*}}} */ 918/*}}} */
876 919
877#if (MENUBAR_MAX) 920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 922/* attempt to `write' count to the input buffer */
880unsigned int 923unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 924rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882{ 925{
… …
905 948
906 cmd_parse (); 949 cmd_parse ();
907 950
908 return 0; 951 return 0;
909} 952}
910#endif /* MENUBAR_MAX */ 953#endif
911 954
912void 955void
913rxvt_term::flush () 956rxvt_term::flush ()
914{ 957{
915 flush_ev.stop (); 958 flush_ev.stop ();
… …
1016{ 1059{
1017 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1063 {
1064 if (view_start == nsaved ||
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0;
1067
1021 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1069 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1071 }
1025} 1072}
… …
1038 1085
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1086 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1087 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1088 cmdbuf_endp = cmdbuf_ptr + n;
1042 1089
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1044 1091
1045 if (n > 0) 1092 if (r > 0)
1046 { 1093 {
1047 cmdbuf_endp += n; 1094 cmdbuf_endp += r;
1048 return true; 1095 return true;
1049 } 1096 }
1050 else if (n < 0 && errno != EAGAIN) 1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 {
1099#if HAVE_SCHED_YIELD
1100 sched_yield ();
1101#endif
1102 }
1103 else
1104 {
1105 pty_ev.stop ();
1106
1107 if (!OPTION (Opt_hold))
1051 destroy (); 1108 destroy ();
1109 }
1052 1110
1053 return false; 1111 return false;
1054} 1112}
1055 1113
1056void 1114void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1115rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1116{
1059 SET_R (this); 1117 SET_R (this);
1060 SET_LOCALE (locale); 1118 SET_LOCALE (locale);
1061 1119
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1120 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1121 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1122 while (pty_fill ())
1067 if (cmd_parse ()) 1123 if (cmd_parse ())
1068 break; 1124 break;
1125
1126 if (revents & EVENT_WRITE)
1127 pty_write ();
1069} 1128}
1070 1129
1071void 1130void
1072rxvt_term::pointer_unblank () 1131rxvt_term::pointer_unblank ()
1073{ 1132{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1133 XDefineCursor (display->display, vt, TermWin_cursor);
1075 recolour_cursor (); 1134 recolour_cursor ();
1076 1135
1077#ifdef POINTER_BLANK 1136#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1137 hidden_pointer = 0;
1079 1138
1080 if (options & Opt_pointerBlank) 1139 if (OPTION (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1140 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1141#endif
1083} 1142}
1084 1143
1085#ifdef POINTER_BLANK 1144#ifdef POINTER_BLANK
1086void 1145void
1087rxvt_term::pointer_blank () 1146rxvt_term::pointer_blank ()
1088{ 1147{
1089 if (! (options & Opt_pointerBlank)) 1148 if (! OPTION (Opt_pointerBlank))
1090 return; 1149 return;
1091 1150
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1151 XDefineCursor (display->display, vt, display->blank_cursor);
1093 XFlush (display->display); 1152 XFlush (display->display);
1094 1153
1095 hidden_pointer = 1; 1154 hidden_pointer = 1;
1096} 1155}
1097 1156
… …
1186 1245
1187/*{{{ process an X event */ 1246/*{{{ process an X event */
1188void 1247void
1189rxvt_term::x_cb (XEvent &ev) 1248rxvt_term::x_cb (XEvent &ev)
1190{ 1249{
1250 dDisp;
1251
1191 SET_R (this); 1252 SET_R (this);
1192 SET_LOCALE (locale); 1253 SET_LOCALE (locale);
1193 1254
1194#if defined(CURSOR_BLINK) 1255#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1196 { 1257 {
1197 if (hidden_cursor) 1258 if (hidden_cursor)
1198 { 1259 {
1199 hidden_cursor = 0; 1260 hidden_cursor = 0;
1200 want_refresh = 1; 1261 want_refresh = 1;
… …
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1204 } 1265 }
1205#endif 1266#endif
1206 1267
1207#if defined(POINTER_BLANK) 1268#if defined(POINTER_BLANK)
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1209 { 1270 {
1210 if (ev.type == MotionNotify 1271 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress 1272 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease) 1273 || ev.type == ButtonRelease)
1213 if (hidden_pointer) 1274 if (hidden_pointer)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1277 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1278 pointer_blank ();
1218 } 1279 }
1219#endif 1280#endif
1220 1281
1221 Window unused_root, unused_child; 1282 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1283 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1284 unsigned int unused_mask;
1224 1285
1225 switch (ev.type) 1286 switch (ev.type)
1226 { 1287 {
1227 case KeyPress: 1288 case KeyPress:
1228#if ISO_14755 1289#if ISO_14755
… …
1311 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1312 break; 1373 break;
1313 1374
1314 case ClientMessage: 1375 case ClientMessage:
1315 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1378 {
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1317 destroy (); 1380 destroy ();
1381#if ENABLE_EWMH
1382 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1383 XSendEvent (disp, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &ev);
1386#endif
1387 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1318#ifdef OFFIX_DND 1397#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */ 1398 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile 1400 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir 1401 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink)) 1402 || ev.xclient.data.l[0] == DndLink))
1324 { 1403 {
1325 /* Get Dnd data */ 1404 /* Get Dnd data */
1326 Atom ActualType; 1405 Atom ActualType;
1327 int ActualFormat; 1406 int ActualFormat;
1328 unsigned char *data; 1407 unsigned char *data;
1329 unsigned long Size, RemainingBytes; 1408 unsigned long Size, RemainingBytes;
1330 1409
1331 XGetWindowProperty (display->display, display->root, 1410 XGetWindowProperty (disp, display->root,
1332 xa[XA_DNDSELECTION], 1411 xa[XA_DNDSELECTION],
1333 0L, 1000000L, 1412 0L, 1000000L,
1334 False, AnyPropertyType, 1413 False, AnyPropertyType,
1335 &ActualType, &ActualFormat, 1414 &ActualType, &ActualFormat,
1336 &Size, &RemainingBytes, 1415 &Size, &RemainingBytes,
1337 &data); 1416 &data);
1338 XChangeProperty (display->display, display->root, 1417 set_string_property (XA_CUT_BUFFER0, data);
1339 XA_CUT_BUFFER0, XA_STRING,
1340 8, PropModeReplace,
1341 data, strlen (data));
1342 XFree (data); 1418 XFree (data);
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345 } 1421 }
1346#endif /* OFFIX_DND */ 1422#endif /* OFFIX_DND */
1347 break; 1423 break;
1348 1424
1349 case MappingNotify: 1425 case MappingNotify:
… …
1374 break; 1450 break;
1375 } 1451 }
1376 break; 1452 break;
1377 1453
1378 case FocusIn: 1454 case FocusIn:
1379 if (!TermWin.focus) 1455 focus_in ();
1456 break;
1457
1458 case FocusOut:
1459 focus_out ();
1460 break;
1461
1462 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0])
1380 { 1464 {
1381 TermWin.focus = 1;
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 {
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401
1402 }
1403 break;
1404
1405 case FocusOut:
1406 if (TermWin.focus)
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0])
1438 {
1439 int height, width;
1440
1441 do
1442 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ;
1448 1467
1449 if (szHint.width != width || szHint.height != height) 1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1469 {
1451 seen_resize = 1; 1470 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1472 }
1454 1473
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent) 1475 if (OPTION (Opt_transparent))
1457 {
1458 check_our_parents (); 1476 check_our_parents ();
1459 if (am_transparent)
1460 want_refresh = want_full_refresh = 1;
1461 }
1462#endif 1477#endif
1463 } 1478 }
1464 break; 1479 break;
1465 1480
1466 case PropertyNotify: 1481 case PropertyNotify:
… …
1474 selection_clear (); 1489 selection_clear ();
1475 break; 1490 break;
1476 1491
1477 case SelectionNotify: 1492 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1493 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1495 break;
1482 1496
1483 case SelectionRequest: 1497 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1485 break; 1499 break;
1486 1500
1487 case UnmapNotify: 1501 case UnmapNotify:
1488 TermWin.mapped = 0; 1502 mapped = 0;
1489#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1491#endif 1505#endif
1492 break; 1506 break;
1493 1507
1494 case MapNotify: 1508 case MapNotify:
1495 TermWin.mapped = 1; 1509 mapped = 1;
1496#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif 1512#endif
1499 break; 1513 break;
1500 1514
… …
1504 break; 1518 break;
1505#endif /* TRANSPARENT */ 1519#endif /* TRANSPARENT */
1506 1520
1507 case GraphicsExpose: 1521 case GraphicsExpose:
1508 case Expose: 1522 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1523 if (ev.xany.window == vt)
1510 { 1524 {
1511 do 1525 do
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1515 1529
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1531
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1521 1535
1522 scr_refresh (refresh_type); 1536 scr_refresh (refresh_type);
1523 } 1537 }
1524 else 1538 else
1525 { 1539 {
1526 XEvent unused_event; 1540 XEvent unused_event;
1527 1541
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529 ; 1543 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1545 ;
1532 1546
1533 if (isScrollbarWindow (ev.xany.window)) 1547 if (isScrollbarWindow (ev.xany.window))
1534 { 1548 {
1535 scrollBar.setIdle (); 1549 scrollBar.setIdle ();
… …
1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540 menubar_expose (); 1554 menubar_expose ();
1541#endif 1555#endif
1542 1556
1543#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1558 if (am_transparent && ev.xany.window == parent[0])
1545 XClearWindow (display->display, ev.xany.window); 1559 XClearWindow (disp, ev.xany.window);
1546#endif 1560#endif
1547 } 1561 }
1548 break; 1562 break;
1549 1563
1550 case MotionNotify: 1564 case MotionNotify:
… …
1560 } 1574 }
1561#endif 1575#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1577 break;
1564 1578
1565 if (ev.xany.window == TermWin.vt) 1579 if (ev.xany.window == vt)
1566 { 1580 {
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1582 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1570 ; 1584 ;
1571 1585
1572 XQueryPointer (display->display, TermWin.vt, 1586 XQueryPointer (disp, vt,
1573 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1590 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1589#endif 1603#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1606
1593#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1610 {
1597 int dist; 1611 int dist;
1598 1612
1599 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
… …
1608 selection_save_x = ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1625
1612 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1614 { 1628 {
1615 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1617 } 1631 }
1618 else 1632 else
1619 { 1633 {
1620 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1635 dist = ev.xbutton.y - (int_bwidth + height);
1622 } 1636 }
1623 1637
1624 scroll_selection_lines = Pixel2Height (dist) 1638 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1640 + 1;
1627 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1629 } 1643 }
1630 else 1644 else
1631 { 1645 {
1632 /* we are within the text window, so we 1646 /* we are within the text window, so we
… …
1641#endif 1655#endif
1642 } 1656 }
1643 } 1657 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1659 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1660 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1648 ; 1662 ;
1649 1663
1650 XQueryPointer (display->display, scrollBar.win, 1664 XQueryPointer (disp, scrollBar.win,
1651 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1668 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 } 1674 }
1661 break; 1675 break;
1662 } 1676 }
1663} 1677}
1664 1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 {
1689 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context);
1691 }
1692#endif
1693#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1696#endif
1697#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_focused;
1701 scr_recolour ();
1702 }
1703#endif
1704 }
1705}
1706
1707void
1708rxvt_term::focus_out ()
1709{
1710 if (focus)
1711 {
1712 focus = 0;
1713 want_refresh = 1;
1714
1715#if ENABLE_FRILLS || ISO_14755
1716 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY
1719 scr_overlay_off ();
1720#endif
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context);
1724#endif
1725#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink))
1727 cursor_blink_ev.stop ();
1728 hidden_cursor = 0;
1729#endif
1730#if OFF_FOCUS_FADING
1731 if (rs[Rs_fade])
1732 {
1733 pix_colors = pix_colors_unfocused;
1734 scr_recolour ();
1735 }
1736#endif
1737 }
1738}
1739
1665#if TRANSPARENT 1740#if TRANSPARENT
1666void 1741void
1667rxvt_term::rootwin_cb (XEvent &ev) 1742rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1743{
1669 SET_R (this); 1744 SET_R (this);
… …
1674 case PropertyNotify: 1749 case PropertyNotify:
1675 /* 1750 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1751 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1752 * use the property to determine the pixmap. We use it later on.
1678 */ 1753 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1754 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683 return; 1756 return;
1684 1757
1685 /* FALLTHROUGH */ 1758 /* FALLTHROUGH */
1686 case ReparentNotify: 1759 case ReparentNotify:
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1688 want_refresh = want_full_refresh = 1; 1761 want_refresh = want_full_refresh = 1;
1689 break; 1762 break;
1690 } 1763 }
1691} 1764}
1692#endif 1765#endif
… …
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1774 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1775
1703 /* 1776 /*
1704 * VT window processing of button press 1777 * VT window processing of button press
1705 */ 1778 */
1706 if (ev.window == TermWin.vt) 1779 if (ev.window == vt)
1707 { 1780 {
1708#if ISO_14755 1781#if ISO_14755
1709 // 5.4 1782 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1784 {
… …
1759 { 1832 {
1760 case Button1: 1833 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1834 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1835 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1836#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1837 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1838#else
1766 selection.rect = false; 1839 selection.rect = false;
1767#endif 1840#endif
1768 1841
1769 /* allow shift+left click to extend selection */ 1842 /* allow shift+left click to extend selection */
… …
1916 case Button3: 1989 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 1990 if (scrollBar.style != R_SB_XTERM)
1918 { 1991 {
1919 if (scrollbar_above_slider (ev.y)) 1992 if (scrollbar_above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 1993# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 1994 scr_page (UP, nrow - 1);
1922# else 1995# else
1923 scr_page (UP, TermWin.nrow / 4); 1996 scr_page (UP, nrow / 4);
1924# endif 1997# endif
1925 else if (scrollbar_below_slider (ev.y)) 1998 else if (scrollbar_below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 1999# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2000 scr_page (DN, nrow - 1);
1928# else 2001# else
1929 scr_page (DN, TermWin.nrow / 4); 2002 scr_page (DN, nrow / 4);
1930# endif 2003# endif
1931 else 2004 else
1932 scrollBar.setMotion (); 2005 scrollBar.setMotion ();
1933 } 2006 }
1934 else 2007 else
1935 { 2008 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2009 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2010 (nrow
1938 * scrollbar_position (ev.y) 2011 * scrollbar_position (ev.y)
1939 / scrollbar_size ())); 2012 / scrollbar_size ()));
1940 } 2013 }
1941 2014
1942 break; 2015 break;
… …
1974#ifdef SELECTION_SCROLLING 2047#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active) 2048 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2049 sel_scroll_ev.stop();
1977#endif 2050#endif
1978 2051
1979 if (ev.window == TermWin.vt) 2052 if (ev.window == vt)
1980 { 2053 {
1981#if ISO_14755 2054#if ISO_14755
1982 // 5.4 2055 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2057 return;
… …
2034 2107
2035 v = ev.button == Button4 ? UP : DN; 2108 v = ev.button == Button4 ? UP : DN;
2036 2109
2037 if (ev.state & ShiftMask) 2110 if (ev.state & ShiftMask)
2038 i = 1; 2111 i = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2112 else if (OPTION (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2113 i = nrow - 1;
2041 else 2114 else
2042 i = 5; 2115 i = 5;
2043 2116
2044# ifdef MOUSE_SLIP_WHEELING 2117# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2118 if (ev.state & ControlMask)
2046 { 2119 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2120 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2121 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2122 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050 2123
2051 if (slip_wheel_ev.at < NOW) 2124 if (slip_wheel_ev.at < NOW)
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2125 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053 2126
2054 slip_wheel_ev.start (); 2127 slip_wheel_ev.start ();
… …
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2168 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2169 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2170 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i; 2171 int i;
2099 2172
2100 Visual* visual = display->visual; 2173 Visual *visual = display->visual;
2101 2174
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2175 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103 2176
2104 /* for convenience */ 2177 /* for convenience */
2105 mask_r = visual->red_mask; 2178 mask_r = visual->red_mask;
… …
2326 Atom atype; 2399 Atom atype;
2327 unsigned char *prop = NULL; 2400 unsigned char *prop = NULL;
2328 Window root, oldp, *list; 2401 Window root, oldp, *list;
2329 Pixmap rootpixmap = None; 2402 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2404 dDisp;
2331 2405
2332 pchanged = 0; 2406 pchanged = 0;
2333 2407
2334 if (!(options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
2335 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
2336 2410
2337 XGetWindowAttributes (display->display, display->root, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
2339 2413
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2414 XGetWindowAttributes (disp, parent[0], &wattr);
2341 2415
2342 if (rootdepth != wattr.depth) 2416 if (rootdepth != wattr.depth)
2343 { 2417 {
2344 if (am_transparent) 2418 if (am_transparent)
2345 { 2419 {
2346 pchanged = 1; 2420 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0; 2422 am_transparent = am_pixmap_trans = 0;
2349 } 2423 }
2350 2424
2351 return pchanged; /* Don't try any more */ 2425 return pchanged; /* Don't try any more */
2352 } 2426 }
2353 2427
2354 /* Get all X ops out of the queue so that our information is up-to-date. */ 2428 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False); 2429 XSync (disp, False);
2356 2430
2357 /* 2431 /*
2358 * Make the frame window set by the window manager have 2432 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame 2433 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that. 2434 * windows for each client, so we have to take care about that.
2361 */ 2435 */
2362 i = (xa[XA_XROOTPMAPID] 2436 i = (xa[XA_XROOTPMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2439 &nitems, &bytes_after, &prop) == Success);
2366 2440
2367 if (!i || prop == NULL) 2441 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID] 2442 i = (xa[XA_ESETROOT_PMAP_ID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2443 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2444 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success); 2445 &nitems, &bytes_after, &prop) == Success);
2372 2446
2373 if (!i || prop == NULL 2447 if (!i || prop == NULL
2374#if TINTING 2448#if TINTING
… …
2393 Window cr; 2467 Window cr;
2394 XImage *image; 2468 XImage *image;
2395 GC gc; 2469 GC gc;
2396 XGCValues gcvalue; 2470 XGCValues gcvalue;
2397 2471
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2472 XTranslateCoordinates (disp, parent[0], display->root,
2399 0, 0, &sx, &sy, &cr); 2473 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width; 2474 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height; 2475 nh = (unsigned int)szHint.height;
2402 nx = ny = 0; 2476 nx = ny = 0;
2403 2477
… …
2413 nh += sy; 2487 nh += sy;
2414 ny = -sy; 2488 ny = -sy;
2415 sy = 0; 2489 sy = 0;
2416 } 2490 }
2417 2491
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494
2495 XSync (disp, False);
2420 allowedxerror = -1; 2496 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422 2498
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */ 2500 /* XXX: may need a delay here? */
2425 allowedxerror = 0; 2501 allowedxerror = 0;
2426 2502
2427 if (image == NULL) 2503 if (image == NULL)
2428 { 2504 {
2429 if (am_transparent && am_pixmap_trans) 2505 if (am_transparent && am_pixmap_trans)
2430 { 2506 {
2431 pchanged = 1; 2507 pchanged = 1;
2432 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2433 { 2509 {
2434 XFreePixmap (display->display, TermWin.pixmap); 2510 XFreePixmap (disp, pixmap);
2435 TermWin.pixmap = None; 2511 pixmap = None;
2436 } 2512 }
2437 } 2513 }
2438 2514
2439 am_pixmap_trans = 0; 2515 am_pixmap_trans = 0;
2440 } 2516 }
2441 else 2517 else
2442 { 2518 {
2443 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap); 2520 XFreePixmap (disp, pixmap);
2445 2521
2446#if TINTING 2522#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint)) 2523 if (ISSET_PIXCOLOR (Color_tint))
2448 { 2524 {
2449 unsigned short rm, gm, bm; 2525 unsigned short rm, gm, bm;
… …
2453 2529
2454 ShadeXImage (display, image, shade, rm, gm, bm); 2530 ShadeXImage (display, image, shade, rm, gm, bm);
2455 } 2531 }
2456#endif 2532#endif
2457 2533
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2534 pixmap = XCreatePixmap (disp, vt,
2459 szHint.width, szHint.height, image->depth); 2535 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2537 XPutImage (disp, pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height); 2538 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc); 2539 XFreeGC (disp, gc);
2464 XDestroyImage (image); 2540 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]); 2542 XClearWindow (disp, parent[0]);
2467 2543
2468 if (!am_transparent || !am_pixmap_trans) 2544 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1; 2545 pchanged = 1;
2470 2546
2471 am_transparent = am_pixmap_trans = 1; 2547 am_transparent = am_pixmap_trans = 1;
2472 } 2548 }
2473 } 2549 }
2474 2550
2475 if (!am_pixmap_trans) 2551 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2553 else
2476 { 2554 {
2477 unsigned int n; 2555 unsigned int n;
2478 /* 2556 /*
2479 * InheritPixmap transparency 2557 * InheritPixmap transparency
2480 */ 2558 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2482 { 2560 {
2483 oldp = TermWin.parent[i]; 2561 oldp = parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2562 XQueryTree (disp, parent[i - 1], &root,
2485 &TermWin.parent[i], &list, &n); 2563 &parent[i], &list, &n);
2486 XFree (list); 2564 XFree (list);
2487 2565
2488 if (TermWin.parent[i] == display->root) 2566 if (parent[i] == display->root)
2489 { 2567 {
2490 if (oldp != None) 2568 if (oldp != None)
2491 pchanged = 1; 2569 pchanged = 1;
2492 2570
2493 break; 2571 break;
2494 } 2572 }
2495 2573
2496 if (oldp != TermWin.parent[i]) 2574 if (oldp != parent[i])
2497 pchanged = 1; 2575 pchanged = 1;
2498 } 2576 }
2499 2577
2500 n = 0; 2578 n = 0;
2501 2579
2502 if (pchanged) 2580 if (pchanged)
2503 { 2581 {
2504 for (; n < (unsigned int)i; n++) 2582 for (; n < (unsigned int)i; n++)
2505 { 2583 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2584 XGetWindowAttributes (disp, parent[n], &wattr);
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 { 2586 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2510 break; 2588 break;
2511 } 2589 }
2512 } 2590 }
2513 } 2591 }
2514 2592
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2593 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2516 { 2594 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0; 2597 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */ 2598 /* XXX: also turn off Opt_transparent? */
2521 } 2599 }
2522 else 2600 else
2523 { 2601 {
… …
2526 * needed for fvwm2.2.2 (and before?) */ 2604 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1); 2605 sleep (1);
2528#endif 2606#endif
2529 for (n = 0; n < (unsigned int)i; n++) 2607 for (n = 0; n < (unsigned int)i; n++)
2530 { 2608 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]); 2610 XClearWindow (disp, parent[n]);
2533 } 2611 }
2534 2612
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2536 am_transparent = 1; 2614 am_transparent = 1;
2537 } 2615 }
2538 2616
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None; 2618 parent[i] = None;
2541 } 2619 }
2542 2620
2543 if (scrollBar.win) 2621 if (scrollBar.win)
2544 { 2622 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle (); 2624 scrollBar.setIdle ();
2547 scrollbar_show (0); 2625 scrollbar_show (0);
2626 }
2627
2628 if (am_transparent)
2629 {
2630 want_refresh = want_full_refresh = 1;
2631 if (am_pixmap_trans)
2632 flush ();
2548 } 2633 }
2549 2634
2550 return pchanged; 2635 return pchanged;
2551} 2636}
2552#endif 2637#endif
… …
2581 // some window managers resize the window early, and these programs 2666 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2667 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2668 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2669 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2670 // resized.
2586 if (seen_resize) 2671 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2672 kill (-cmd_pid, SIGWINCH);
2588 } 2673 }
2589 2674
2590 /* Read a text string from the input buffer */ 2675 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2676 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2677 bool refreshnow = false;
2593 int nlines = 0; 2678 int nlines = 0;
2594 unicode_t *str = buf; 2679 unicode_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ);
2595 2681
2596 for (;;) 2682 for (;;)
2597 { 2683 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2685 break;
2600 2686
2601 *str++ = ch; 2687 *str++ = ch;
2602 2688
2603 if (ch == C0_LF) 2689 if (ch == C0_LF || str >= eol)
2604 { 2690 {
2691 if (ch == C0_LF)
2605 nlines++; 2692 nlines++;
2693
2606 refresh_count++; 2694 refresh_count++;
2607 2695
2608 if (!(options & Opt_jumpScroll) 2696 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2697 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2698 {
2611 refreshnow = true; 2699 refreshnow = true;
2612 ch = NOCHAR; 2700 ch = NOCHAR;
2613 break; 2701 break;
2614 } 2702 }
2615 2703
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2618 { 2706 {
2619 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0; 2708 nlines = 0;
2621 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2622 } 2711 }
2623 }
2624 2712
2625 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2626 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2627 ch = NOCHAR; 2717 ch = NOCHAR;
2628 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2629 } 2724 }
2630 2725
2631 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2727 ch = next_char ();
2633 } 2728 }
… …
2640 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2737 */
2643 if (refreshnow) 2738 if (refreshnow)
2644 { 2739 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2741 refresh_limit++;
2647 else 2742 else
2648 { 2743 {
2649 flag = true; 2744 flag = true;
2650 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
… …
2704 if (len == (size_t)-1) 2799 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2801
2707 // assume wchar == unicode 2802 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2803 cmdbuf_ptr += len;
2709 return wc; 2804 return wc & UNICODE_MASK;
2710 } 2805 }
2711 2806
2712 return NOCHAR; 2807 return NOCHAR;
2713} 2808}
2714 2809
… …
3177 { 3272 {
3178 switch (priv) 3273 switch (priv)
3179 { 3274 {
3180 case '>': 3275 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3276 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3277 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3278 break;
3184 case '?': 3279 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3281 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3282 break;
… …
3292 3387
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3388 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3389 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3390 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3393 break;
3299 3394
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3396 tt_write ((const unsigned char *)VT100_ANS,
3302 (unsigned int) (sizeof (VT100_ANS) - 1)); 3397 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3314 break; 3409 break;
3315 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
3316 scr_report_position (); 3411 scr_report_position ();
3317 break; 3412 break;
3318 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3414 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3416 break;
3322 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3419 break;
… …
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3511rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3512{
3418 int x, y; 3513 int x, y;
3419 XWindowAttributes wattr; 3514 XWindowAttributes wattr;
3420 Window wdummy; 3515 Window wdummy;
3516 dDisp;
3421 3517
3422 if (nargs == 0) 3518 if (nargs == 0)
3423 return; 3519 return;
3424 3520
3425 switch (args[0]) 3521 switch (args[0])
3426 { 3522 {
3427 /* 3523 /*
3428 * commands 3524 * commands
3429 */ 3525 */
3430 case 1: /* deiconify window */ 3526 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3527 XMapWindow (disp, parent[0]);
3432 break; 3528 break;
3433 case 2: /* iconify window */ 3529 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3530 XIconifyWindow (disp, parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3531 break;
3437 case 3: /* set position (pixels) */ 3532 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3533 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3534 break;
3440 case 4: /* set size (pixels) */ 3535 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3537 break;
3443 case 5: /* raise window */ 3538 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3539 XRaiseWindow (disp, parent[0]);
3445 break; 3540 break;
3446 case 6: /* lower window */ 3541 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3542 XLowerWindow (disp, parent[0]);
3448 break; 3543 break;
3449 case 7: /* refresh window */ 3544 case 7: /* refresh window */
3450 scr_touch (true); 3545 scr_touch (true);
3451 break; 3546 break;
3452 case 8: /* set size (chars) */ 3547 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3548 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3549 (unsigned int) (args[1] * fheight));
3455 break; 3550 break;
3456 3551
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3552 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3553 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3554 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3555 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3556 (unsigned int) (args[1] * fheight));
3462 break; 3557 break;
3463 3558
3464 3559
3465 /* 3560 /*
3466 * reports - some output format copied from XTerm 3561 * reports - some output format copied from XTerm
3467 */ 3562 */
3468 case 11: /* report window state */ 3563 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3566 break;
3472 case 13: /* report window position */ 3567 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3568 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3569 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3570 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3571 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3572 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3573 break;
3479 case 14: /* report window size (pixels) */ 3574 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3575 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3577 break;
3483 case 18: /* report text area size (chars) */ 3578 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3579 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3580 break;
3486 case 19: /* report window size (chars) */ 3581 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3582 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3583 break;
3489 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3490 { 3585 {
3491 char *s; 3586 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3589 XFree (s);
3495 } 3590 }
3496 break; 3591 break;
3497 case 21: /* report window title */ 3592 case 21: /* report window title */
3498 { 3593 {
3499 char *s; 3594 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3597 XFree (s);
3503 } 3598 }
3504 break; 3599 break;
3505 } 3600 }
3506} 3601}
… …
3512 * ends_how is terminator used. returned input must be free()'d 3607 * ends_how is terminator used. returned input must be free()'d
3513 */ 3608 */
3514unsigned char * 3609unsigned char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3610rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3611{
3517 unicode_t seen_esc = 0, ch; 3612 unicode_t ch;
3613 bool seen_esc = false;
3518 unsigned int n = 0; 3614 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3615 wchar_t string[STRING_MAX];
3521 3616
3522 while ((ch = cmd_getc ()) != NOCHAR) 3617 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3618 {
3524 if (seen_esc) 3619 if (seen_esc)
3525 { 3620 {
… …
3528 else 3623 else
3529 return NULL; 3624 return NULL;
3530 } 3625 }
3531 else if (ch == C0_ESC) 3626 else if (ch == C0_ESC)
3532 { 3627 {
3533 seen_esc = 1; 3628 seen_esc = true;
3534 continue; 3629 continue;
3535 } 3630 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3631 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3632 break;
3538 else if (ch < 0x20) 3633 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3634 return NULL; /* other control character - exit */
3540 3635
3541 seen_esc = 0; 3636 seen_esc = false;
3542 3637
3543 if (n >= sizeof (string) - 1) 3638 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3639 // stop at some sane length
3545 return NULL; 3640 return NULL;
3546 3641
3547 if (ch == C0_SYN) 3642 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3643 string[n++] = cmd_get8 ();
… …
3550 string[n++] = ch; 3645 string[n++] = ch;
3551 } 3646 }
3552 3647
3553 string[n++] = '\0'; 3648 string[n++] = '\0';
3554 3649
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3650 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3651
3560 return s; 3652 return (unsigned char *)rxvt_wcstombs (string);
3561} 3653}
3562 3654
3563/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
3564/* 3656/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3619 set_window_color (color, str); 3711 set_window_color (color, str);
3620} 3712}
3621 3713
3622/* 3714/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3716 */
3647void 3717void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649{ 3719{
3650 int changed = 0; 3720 int changed = 0;
3651 int color; 3721 int color;
3652 char *buf, *name; 3722 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3723 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3724 int saveop = op;
3725 dDisp;
3655 3726
3656 assert (str != NULL); 3727 assert (str != NULL);
3657 switch (op) 3728 switch (op)
3658 { 3729 {
3659 case XTerm_name: 3730 case XTerm_name:
… …
3666 set_title (str); 3737 set_title (str);
3667 break; 3738 break;
3668 case XTerm_property: 3739 case XTerm_property:
3669 if (str[0] == '?') 3740 if (str[0] == '?')
3670 { 3741 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3743 Atom actual_type;
3673 int actual_format; 3744 int actual_format;
3674 unsigned long nitems; 3745 unsigned long nitems;
3675 unsigned long bytes_after; 3746 unsigned long bytes_after;
3676 unsigned char *value = 0; 3747 unsigned char *value = 0;
3677 const char *str = ""; 3748 const char *str = "";
3678 3749
3679 if (prop 3750 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (disp, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3755 && actual_type != None
3685 && actual_format == 8) 3756 && actual_format == 8)
… …
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3766
3696 if (eq) 3767 if (eq)
3697 { 3768 {
3698 *eq = 0; 3769 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3770 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3771 }
3704 else 3772 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (disp, parent[0],
3706 display->atom (str)); 3774 display->atom (str));
3707 } 3775 }
3708 break; 3776 break;
3709 3777
3710 case XTerm_Color: 3778 case XTerm_Color:
… …
3751 break; 3819 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3820#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD: 3821 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break; 3823 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL: 3824 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break; 3826 break;
3762 case XTerm_Color_RV: 3827 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764 break; 3829 break;
3830 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break;
3765#endif 3833#endif
3766#if TRANSPARENT || TINTING 3834#if TRANSPARENT && TINTING
3767 case XTerm_Color_tint: 3835 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3769 check_our_parents (); 3837 check_our_parents ();
3770 if (am_transparent) 3838 if (am_transparent)
3771 want_full_refresh = want_refresh = 1; 3839 want_full_refresh = want_refresh = 1;
3772 break; 3840 break;
3773#endif 3841#endif
… …
3785 { 3853 {
3786 str++; 3854 str++;
3787#if XPM_BACKGROUND 3855#if XPM_BACKGROUND
3788 changed += scale_pixmap (str); 3856 changed += scale_pixmap (str);
3789#endif 3857#endif
3790
3791 } 3858 }
3859
3792 if (changed) 3860 if (changed)
3793 { 3861 {
3794#ifdef XPM_BACKGROUND 3862#ifdef XPM_BACKGROUND
3795 resize_pixmap (); 3863 resize_pixmap ();
3796#endif 3864#endif
… …
3807 3875
3808 case XTerm_logfile: 3876 case XTerm_logfile:
3809 // TODO, when secure mode? 3877 // TODO, when secure mode?
3810 break; 3878 break;
3811 3879
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0
3887 case XTerm_dumpscreen: /* no error notices */
3888 {
3889 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 {
3892 scr_dump (fd);
3893 close (fd);
3894 }
3895 }
3896 break;
3897#endif
3812 case XTerm_font: 3898 case XTerm_font:
3813 op = URxvt_font; 3899 op = URxvt_font;
3814 case URxvt_font: 3900 case URxvt_font:
3815#if ENABLE_STYLES 3901#if ENABLE_STYLES
3816 case URxvt_boldFont: 3902 case URxvt_boldFont:
3817 case URxvt_italicFont: 3903 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3904 case URxvt_boldItalicFont:
3819#endif 3905#endif
3820 if (query) 3906 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3907 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3909 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3910 resp);
3825 else 3911 else
3826 { 3912 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3913 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3914
… …
3831 set_fonts (); 3917 set_fonts ();
3832 } 3918 }
3833 break; 3919 break;
3834 3920
3835#if ENABLE_FRILLS 3921#if ENABLE_FRILLS
3836 case XTerm_locale: 3922 case URxvt_locale:
3837 if (query) 3923 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3839 else 3925 else
3840 { 3926 {
3841 set_locale (str); 3927 set_locale (str);
3842# ifdef USE_XIM 3928 pty.set_utf8_mode (enc_utf8);
3843 im_cb (); 3929 init_xlocale ();
3844# endif
3845 } 3930 }
3846 break; 3931 break;
3847#endif
3848 3932
3849#ifdef MENUBAR 3933 case URxvt_view_up:
3850 case XTerm_Menu: 3934 case URxvt_view_down:
3851 if (options & Opt_insecure) 3935 int lines = atoi (str);
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3936
3853 break; 3937 if (lines)
3854#endif 3938 scr_page (op == URxvt_view_up ? UP : DN, lines);
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 { 3939 else
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3940 {
3861 scr_dump (fd); 3941 scr_erase_savelines ();
3862 close (fd);
3863 } 3942 }
3864 } 3943
3865 break; 3944 break;
3866#endif 3945#endif
3867 } 3946 }
3868} 3947}
3869/*----------------------------------------------------------------------*/ 3948/*----------------------------------------------------------------------*/
… …
3978 } 4057 }
3979 4058
3980 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
3981 switch (arg[i]) 4060 switch (arg[i])
3982 { 4061 {
4062#if ENABLE_STYLES
4063 case 1021:
4064 if (mode)
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068
4069 want_refresh = 1;
4070 want_full_refresh = 1;
4071 break;
4072#endif
3983 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
3984 case 1049: 4074 case 1049:
3985 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
3986 if (mode == 0) 4076 if (mode == 0)
3987 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
3988 else if (mode == 1) 4078 else if (mode == 1)
3989 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
3990 break; 4080 break;
… …
4002 */ 4092 */
4003 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4004 break; 4094 break;
4005 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4008 break; 4098 break;
4009 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4010 if (state) 4100 if (!state)
4011 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4012 else 4102 else
4013 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4014 break; 4104 break;
4015 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4017 break; 4107 break;
4018 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4059#if 0 4149#if 0
4060 case 1001: 4150 case 1001:
4061 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4062#endif 4152#endif
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state) 4154 if (!state)
4065 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4066 else 4156 else
4067 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4068 break; 4158 break;
4069 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4070 if (state) 4160 if (state)
4071 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4072 else 4162 else
4073 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4074 break; 4164 break;
4075 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4078 scr_erase_screen (2); 4168 scr_erase_screen (2);
4079 scr_change_screen (state); 4169 scr_change_screen (state);
4080 break; 4170 break;
4081 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4082 scr_change_screen (state); 4172 scr_change_screen (state);
4083 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4085 scr_erase_screen (2); 4175 scr_erase_screen (2);
4086 break; 4176 break;
4087 default: 4177 default:
4088 break; 4178 break;
… …
4238 case 106: 4328 case 106:
4239 case 107: 4329 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 4331 break;
4242#endif 4332#endif
4243
4244 } 4333 }
4245 } 4334 }
4246} 4335}
4247/*}}} */ 4336/*}}} */
4248 4337
… …
4284 4373
4285/* ---------------------------------------------------------------------- */ 4374/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 4375/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 4376 * or generated by us in response to a query ESC sequence.
4288 */ 4377 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379
4289void 4380void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4381rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4291{ 4382{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4383 if (v_buflen == 0)
4384 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293 4386
4294 if (len) 4387 if ((unsigned int)written == len)
4388 return;
4389
4390 data += written;
4391 len -= written;
4295 { 4392 }
4393
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4395
4396 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len;
4398
4399 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400}
4401
4402void rxvt_term::pty_write ()
4403{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405
4406 if (written > 0)
4407 {
4408 v_buflen -= written;
4409
4296 if (v_buflen == 0) 4410 if (v_buflen == 0)
4297 { 4411 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 4412 free (v_buffer);
4325 v_buffer = 0; 4413 v_buffer = 0;
4326 v_buflen = 0; 4414 v_buflen = 0;
4327 4415
4328 pty_ev.set (EVENT_READ); 4416 pty_ev.set (EVENT_READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 4417 return;
4341 } 4418 }
4419
4420 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4421 }
4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4423 pty_ev.set (EVENT_READ);
4343} 4424}
4344 4425
4345/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4346 4427

Diff Legend

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