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

Diff Legend

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