ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

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

Diff Legend

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