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

Diff Legend

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