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.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.258 by root, Thu Jan 12 03:32:56 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-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 125 XK_Print, 0x2399,
121 126
122 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
124 0, 137 0,
125}; 138};
126 139
127void 140void
128rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
129{ 142{
130 x = Pixel2Col (x); 143 x = Pixel2Col (x);
131 y = Pixel2Row (y); 144 y = Pixel2Row (y);
132 145
133 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 148 return;
136 149
137 for (;;) 150 for (;;)
138 { 151 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
140 155
141 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
142 { 157 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
146 break; 160 break;
147 } 161 }
148 162
149 x--; 163 x--;
150 } 164 }
151
152} 165}
153#endif
154 166
155#if ENABLE_OVERLAY
156void 167void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 169{
159 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 173 int len;
163 174
175 fname = rxvt_utf8towcs (f->name);
176
164#if ENABLE_COMBINING 177# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
166 { 179 {
167 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
170 } 183 }
171 else 184 else
172#endif 185# endif
173 { 186 {
174 ch2 = ch; 187 ch2 = ch;
175 188
176 alloc = 0; 189 alloc = 0;
177 chr = &ch2; 190 chr = &ch2;
178 len = 1; 191 len = 1;
179 } 192 }
180 193
181 int width = strlen (f->name); 194 char attr[80]; // plenty
182 195
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
184 218
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 220
187 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
188 { 222 {
… …
191 ch = *chr++; 225 ch = *chr++;
192 226
193 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
196#if !UNICODE3 230# if !UNICODE3
197 if (ch >= 0x10000) 231 if (ch >= 0x10000)
198 ch = 0xfffd; 232 ch = 0xfffd;
199#endif 233# endif
200 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
202 } 236 }
203 237
238 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
205 240
241 free (fname);
242
206#if ENABLE_COMBINING 243# if ENABLE_COMBINING
207 if (alloc) 244 if (alloc)
208 delete [] alloc; 245 delete [] alloc;
209#endif 246# endif
210} 247}
211#endif 248#endif
212 249
213void 250void
214rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 268 mb[0] = ch[0];
232 len = 1; 269 len = 1;
233 } 270 }
234 271
235 if (len > 0) 272 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
237 else 274 else
238 scr_bell (); 275 scr_bell ();
239 } 276 }
240 277
241 iso14755buf = 0; 278 iso14755buf = 0;
… …
269 KeySym keysym; 306 KeySym keysym;
270#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
272#endif 309#endif
273 int valid_keysym; 310 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
275 312
276 /* 313 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
279 * 316 *
280 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
281 */ 318 */
282 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
285 322
286 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
287 { 324 {
288 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 334 Status status_return;
298 335
299#if 0 336#if 0
300#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
304 else 341 else
305#endif 342#endif
306#endif 343#endif
307 { 344 {
… …
309 346
310 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
314 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
317 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 357 SET_LOCALE (locale);
319 358
320 if (status_return == XLookupChars 359 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
343 } 382 }
344 else 383 else
345#endif 384#endif
346 { 385 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
349 } 388 }
350 389
351 if (valid_keysym) 390 if (valid_keysym)
352 { 391 {
353#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 394 return;
356#endif 395#endif
357 396
358 if (TermWin.saveLines) 397 if (saveLines)
359 { 398 {
360#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 400 if (!ctrl && !meta)
362#else 401#else
363 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
364#endif 403#endif
365 { 404 {
366 int lnsppg; 405 int lnsppg;
367 406
368#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 409#else
371 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
372#endif 411#endif
373 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
374 { 413 {
375 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
376 return; 415 return;
… …
513 else 552 else
514 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
515 break; 554 break;
516#endif 555#endif
517#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
518 case XK_Delete: 567 case XK_Delete:
519 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
520 break; 569 break;
521#endif 570#endif
522 case XK_Tab: 571 case XK_Tab:
… …
625#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
626 case XK_KP_Begin: 675 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
628 break; 677 break;
629 678
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 679#endif
638 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
673 break; 715 break;
674 716
675 case XK_Find: 717 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
677 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
678 case XK_Insert: 731 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
680 break; 733 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 735 case DXK_Remove:
… …
802 { 855 {
803#ifdef META8_OPTION 856#ifdef META8_OPTION
804 /* set 8-bit on */ 857 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
806 { 859 {
807 unsigned char *ch; 860 char *ch;
808 861
809 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 863 *ch |= 0x80;
811 864
812 meta = 0; 865 meta = 0;
… …
814#endif 867#endif
815 /* nil */ ; 868 /* nil */ ;
816 } 869 }
817 } 870 }
818 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
819 if (len <= 0) 875 if (len <= 0)
820 return; /* not mapped */ 876 return; /* not mapped */
821 877
822 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 879 if (view_start)
824 { 880 {
825 TermWin.view_start = 0; 881 view_start = 0;
826 want_refresh = 1; 882 want_refresh = 1;
827 } 883 }
828 884
829 /* 885 /*
830 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 901#ifdef META8_OPTION
846 && meta_char == C0_ESC 902 && meta_char == C0_ESC
847#endif 903#endif
848 ) 904 )
849 { 905 {
850 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
851 tt_write (&ch, 1); 907 tt_write (&ch, 1);
852 } 908 }
853 909
854#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
867 923
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
871unsigned int 927unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 929{
874 unsigned int n, s; 930 unsigned int n, s;
875 931
876 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 970 }
915#endif 971#endif
916 972
917 if (want_refresh) 973 if (want_refresh)
918 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
919 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
920 scrollbar_show (1); 1014 scrollbar_show (1);
921#ifdef USE_XIM 1015#ifdef USE_XIM
922 IMSendSpot (); 1016 IMSendSpot ();
923#endif 1017#endif
… …
933 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
934 1028
935 display->flush (); 1029 display->flush ();
936 1030
937 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1033}
940 1034
941void 1035void
942rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
943{ 1037{
… …
1007{ 1101{
1008 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1105 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1106 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1107 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1108 mouse_slip_wheel_speed = 0;
1015 1109
1016 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1111 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1113 }
1020} 1114}
1021#endif 1115#endif
1022 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1023bool 1135bool
1024rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1025{ 1137{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1139
1028 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1029 { 1141 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1143 n = 0;
1032 } 1144 }
1033 1145
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1037 1149
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1151
1040 if (n > 0) 1152 if (r > 0)
1041 { 1153 {
1042 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1043 return true; 1155 return true;
1044 } 1156 }
1045 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1046 destroy (); 1169 destroy ();
1170 }
1047 1171
1048 return false; 1172 return false;
1049} 1173}
1050 1174
1051void 1175void
… …
1065} 1189}
1066 1190
1067void 1191void
1068rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1069{ 1193{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1195 recolour_cursor ();
1072 1196
1073#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1198 hidden_pointer = 0;
1075 1199
1076 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1202#endif
1079} 1203}
1080 1204
1081#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1082void 1206void
1083rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1084{ 1208{
1085 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1086 return; 1210 return;
1087 1211
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1213 XFlush (display->display);
1090 1214
1091 hidden_pointer = 1; 1215 hidden_pointer = 1;
1092} 1216}
1093 1217
… …
1182 1306
1183/*{{{ process an X event */ 1307/*{{{ process an X event */
1184void 1308void
1185rxvt_term::x_cb (XEvent &ev) 1309rxvt_term::x_cb (XEvent &ev)
1186{ 1310{
1311 dDisp;
1312
1187 SET_R (this); 1313 SET_R (this);
1188 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1189
1190#if defined(CURSOR_BLINK)
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1200 }
1201#endif
1202
1203#if defined(POINTER_BLANK)
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216 1315
1217 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1318 unsigned int unused_mask;
1220 1319
… …
1228 1327
1229 break; 1328 break;
1230 1329
1231 case KeyRelease: 1330 case KeyRelease:
1232 { 1331 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1234 KeySym ks; 1333 KeySym keysym;
1235 1334
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif 1336#endif
1238 1337
1239#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support 1339 // ISO 14755 support
1241 if (iso14755buf) 1340 if (iso14755buf)
… …
1246# endif 1345# endif
1247# if ISO_14755 1346# if ISO_14755
1248 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1249 // first: controls 1348 // first: controls
1250 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1253 { 1352 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1255 commit_iso14755 (); 1354 commit_iso14755 ();
1256 return; // case-break; 1355 goto skip_switch;
1257 } 1356 }
1258 1357
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks) 1359 if (i[0] == keysym)
1261 { 1360 {
1262 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 (); 1362 commit_iso14755 ();
1264 return; // case-break; 1363 goto skip_switch;
1265 } 1364 }
1266 1365
1267 scr_bell (); 1366 scr_bell ();
1268# endif 1367# endif
1269 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1288 else 1387 else
1289 iso14755buf = 0; 1388 iso14755buf = 0;
1290 } 1389 }
1291#endif 1390#endif
1292 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1297 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1298#endif 1401#endif
1299 break; 1402 break;
1300 } 1403 }
1301 1404
… …
1307 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1308 break; 1411 break;
1309 1412
1310 case ClientMessage: 1413 case ClientMessage:
1311 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1314#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1320 { 1441 {
1321 /* Get Dnd data */ 1442 /* Get Dnd data */
1322 Atom ActualType; 1443 Atom ActualType;
1323 int ActualFormat; 1444 int ActualFormat;
1324 unsigned char *data; 1445 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1326 1447
1327 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1450 0L, 1000000L,
1330 False, AnyPropertyType, 1451 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1333 &data); 1454 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1455 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1456 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1459 }
1339#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1340 break; 1461 break;
1341 1462
1342 case MappingNotify: 1463 case MappingNotify:
… …
1367 break; 1488 break;
1368 } 1489 }
1369 break; 1490 break;
1370 1491
1371 case FocusIn: 1492 case FocusIn:
1372 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1373 { 1502 {
1374 TermWin.focus = 1;
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ;
1441 1505
1442 if (szHint.width != width || szHint.height != height) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1507 {
1444 seen_resize = 1; 1508 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1510 }
1447 1511
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1450 check_our_parents (); 1514 check_our_parents ();
1451#endif 1515#endif
1452 } 1516 }
1453 break; 1517 break;
1454 1518
… …
1470 1534
1471 case SelectionRequest: 1535 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1473 break; 1537 break;
1474 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1475 case UnmapNotify: 1547 case UnmapNotify:
1476 TermWin.mapped = 0; 1548 mapped = 0;
1477#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1479#endif 1551#endif
1480 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break; 1553 break;
1488 1554
1489#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1490 case ReparentNotify: 1556 case ReparentNotify:
1491 rootwin_cb (ev); 1557 rootwin_cb (ev);
1492 break; 1558 break;
1493#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1494 1560
1495 case GraphicsExpose: 1561 case GraphicsExpose:
1496 case Expose: 1562 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1498 { 1564 {
1499 do 1565 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1569
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1571
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1509 1575
1510 scr_refresh (refresh_type); 1576 want_refresh = 1;
1511 } 1577 }
1512 else 1578 else
1513 { 1579 {
1514 XEvent unused_event; 1580 XEvent unused_event;
1515 1581
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1583 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1585 ;
1520 1586
1521 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1522 { 1588 {
1523 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
… …
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose (); 1594 menubar_expose ();
1529#endif 1595#endif
1530 1596
1531#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1534#endif 1600#endif
1535 } 1601 }
1536 break; 1602 break;
1537 1603
1538 case MotionNotify: 1604 case MotionNotify:
… …
1548 } 1614 }
1549#endif 1615#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1617 break;
1552 1618
1553 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1554 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1624 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1626 ;
1559 1627
1560 XQueryPointer (display->display, TermWin.vt, 1628 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1632 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
… …
1577#endif 1645#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1648
1581#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1652 {
1585 int dist; 1653 int dist;
1586 1654
1587 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1667
1600 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1602 { 1670 {
1603 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1605 } 1673 }
1606 else 1674 else
1607 { 1675 {
1608 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1677 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1678 }
1611 1679
1612 scroll_selection_lines = Pixel2Height (dist) 1680 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1682 + 1;
1615 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1617 } 1685 }
1618 else 1686 else
1619 { 1687 {
1620 /* we are within the text window, so we 1688 /* we are within the text window, so we
… …
1629#endif 1697#endif
1630 } 1698 }
1631 } 1699 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1701 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1702 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1703 MotionNotify, &ev))
1636 ; 1704 ;
1637 1705
1638 XQueryPointer (display->display, scrollBar.win, 1706 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1707 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1710 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1712 scrollbar_size ());
1645 scr_refresh (refresh_type); 1713 want_refresh = 1;
1646 refresh_limit = 0; 1714 refresh_limit = 0;
1647 scrollbar_show (1); 1715 scrollbar_show (1);
1648 } 1716 }
1649 break; 1717 break;
1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1748}
1749
1750void
1751rxvt_term::focus_in ()
1752{
1753 if (!focus)
1754 {
1755 focus = 1;
1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1760#if USE_XIM
1761 if (Input_Context != NULL)
1762 {
1763 IMSetStatusPosition ();
1764 XSetICFocus (Input_Context);
1765 }
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1770#endif
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 pix_colors = pix_colors_focused;
1775 scr_recolour ();
1776 }
1777#endif
1778 }
1779}
1780
1781void
1782rxvt_term::focus_out ()
1783{
1784 if (focus)
1785 {
1786 focus = 0;
1787 want_refresh = 1;
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1794 iso14755buf = 0;
1795# if ENABLE_OVERLAY
1796 scr_overlay_off ();
1797# endif
1798 }
1799#endif
1800#if USE_XIM
1801 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context);
1803#endif
1804#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink))
1806 cursor_blink_ev.stop ();
1807 hidden_cursor = 0;
1808#endif
1809#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade])
1811 {
1812 pix_colors = pix_colors_unfocused;
1813 scr_recolour ();
1814 }
1815#endif
1650 } 1816 }
1651} 1817}
1652 1818
1653#if TRANSPARENT 1819#if TRANSPARENT
1654void 1820void
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1835 return;
1670 1836
1671 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1672 case ReparentNotify: 1838 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1675 break; 1841 break;
1676 } 1842 }
1677} 1843}
1678#endif 1844#endif
… …
1681rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1682{ 1848{
1683 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1684 1850
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1686 if (!bypass_keystate) 1853 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1855
1689 /* 1856 /*
1690 * VT window processing of button press 1857 * VT window processing of button press
1691 */ 1858 */
1692 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1693 { 1860 {
1694#if ISO_14755 1861#if ISO_14755
1695 // 5.4 1862 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1864 {
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1712 { 1879 {
1713 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1714 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1715 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1716 { 1884 {
1717 /* only report double clicks */ 1885 /* only report double clicks */
1718 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1719 mouse_report (ev); 1887 mouse_report (ev);
… …
1739 else 1907 else
1740 { 1908 {
1741 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1743 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1744 switch (ev.button) 1913 switch (ev.button)
1745 { 1914 {
1746 case Button1: 1915 case Button1:
1747 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1748 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1749#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1750 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1751#else 1920#else
1752 selection.rect = false; 1921 selection.rect = false;
1753#endif 1922#endif
1754 1923
1755 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1926 {
1758 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1760 else 1929 else
1761 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1762 } 1931 }
1763 else 1932 else
1764 { 1933 {
1765 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1766 MEvent.clicks++; 1935 MEvent.clicks++;
1767 else 1936 else
1768 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1769 1938
1770 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1771 } 1940 }
1772 1941
1773 MEvent.button = Button1; 1942 MEvent.button = Button1;
1774 break; 1943 break;
1775 1944
1776 case Button3: 1945 case Button3:
1777 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1778 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1779 else 1948 else
1780 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1781 1950
1782 MEvent.button = Button3; 1951 MEvent.button = Button3;
1783 break; 1952 break;
1784 } 1953 }
1785 } 1954 }
1786 1955
1787 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1788 return; 1957 return;
1789 } 1958 }
1790 1959
… …
1902 case Button3: 2071 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1904 { 2073 {
1905 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1908# else 2077# else
1909 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1910# endif 2079# endif
1911 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1914# else 2083# else
1915 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1916# endif 2085# endif
1917 else 2086 else
1918 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1919 } 2088 }
1920 else 2089 else
1921 { 2090 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2092 (nrow
1924 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2094 / scrollbar_size ()));
1926 } 2095 }
1927 2096
1928 break; 2097 break;
1929 } 2098 }
1930 } 2099 }
2100
1931 return; 2101 return;
1932 } 2102 }
2103
1933#if MENUBAR 2104#if MENUBAR
1934 /* 2105 /*
1935 * Menubar window processing of button press 2106 * Menubar window processing of button press
1936 */ 2107 */
1937 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
1960#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
1963#endif 2134#endif
1964 2135
1965 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1966 { 2137 {
1967#if ISO_14755 2138#if ISO_14755
1968 // 5.4 2139 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2141 return;
… …
2000 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2001 && bypass_keystate 2172 && bypass_keystate
2002 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2003 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2004 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2005 switch (ev.button) 2179 switch (ev.button)
2006 { 2180 {
2007 case Button1: 2181 case Button1:
2008 case Button3: 2182 case Button3:
2009 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2020 2194
2021 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2022 2196
2023 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2024 i = 1; 2198 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2200 i = nrow - 1;
2027 else 2201 else
2028 i = 5; 2202 i = 5;
2029 2203
2030# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
2032 { 2206 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2210
2037 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2213
2040 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2041 } 2215 }
2042 else 2216 else
2043 { 2217 {
2044# endif 2218# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2219 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2220 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2058 } 2222 }
2059#endif 2223# endif
2060 } 2224 }
2061 break; 2225 break;
2062#endif 2226#endif
2063 } 2227 }
2064 } 2228 }
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2248 int i;
2085 2249
2086 Visual* visual = display->visual; 2250 Visual *visual = display->visual;
2087 2251
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2253
2090 /* for convenience */ 2254 /* for convenience */
2091 mask_r = visual->red_mask; 2255 mask_r = visual->red_mask;
… …
2312 Atom atype; 2476 Atom atype;
2313 unsigned char *prop = NULL; 2477 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2478 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2479 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2317 2482
2318 pchanged = 0; 2483 pchanged = 0;
2319 2484
2320 if (!(options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
2322 2487
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
2325 2490
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2492
2328 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
2329 { 2494 {
2330 if (am_transparent) 2495 if (am_transparent)
2331 { 2496 {
2332 pchanged = 1; 2497 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
2335 } 2500 }
2336 2501
2337 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
2338 } 2503 }
2339 2504
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2506 XSync (disp, False);
2342 2507
2343 /* 2508 /*
2344 * Make the frame window set by the window manager have 2509 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2510 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2511 * windows for each client, so we have to take care about that.
2347 */ 2512 */
2348 i = (xa[XA_XROOTPMAP_ID] 2513 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2516 &nitems, &bytes_after, &prop) == Success);
2352 2517
2353 if (!i || prop == NULL) 2518 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2519 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2522 &nitems, &bytes_after, &prop) == Success);
2358 2523
2359 if (!i || prop == NULL 2524 if (!i || prop == NULL
2360#if TINTING 2525#if TINTING
… …
2379 Window cr; 2544 Window cr;
2380 XImage *image; 2545 XImage *image;
2381 GC gc; 2546 GC gc;
2382 XGCValues gcvalue; 2547 XGCValues gcvalue;
2383 2548
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2553 nx = ny = 0;
2389 2554
… …
2399 nh += sy; 2564 nh += sy;
2400 ny = -sy; 2565 ny = -sy;
2401 sy = 0; 2566 sy = 0;
2402 } 2567 }
2403 2568
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2571
2407 XSync (display->display, False); 2572 XSync (disp, False);
2408 allowedxerror = -1; 2573 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2575
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2577 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2578 allowedxerror = 0;
2414 2579
2415 if (image == NULL) 2580 if (image == NULL)
2416 { 2581 {
2417 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2418 { 2583 {
2419 pchanged = 1; 2584 pchanged = 1;
2420 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2421 { 2586 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2588 pixmap = None;
2424 } 2589 }
2425 } 2590 }
2426 2591
2427 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2428 } 2593 }
2429 else 2594 else
2430 { 2595 {
2431 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2433 2598
2434#if TINTING 2599#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2600 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2601 {
2437 unsigned short rm, gm, bm; 2602 unsigned short rm, gm, bm;
… …
2441 2606
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2607 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2608 }
2444#endif 2609#endif
2445 2610
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2612 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2615 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2616 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2617 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2619 XClearWindow (disp, parent[0]);
2455 2620
2456 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2622 pchanged = 1;
2458 2623
2459 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2460 } 2625 }
2461 } 2626 }
2462 2627
2463 if (am_pixmap_trans) 2628 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2630 else
2466 { 2631 {
2467 unsigned int n; 2632 unsigned int n;
2468 /* 2633 /*
2469 * InheritPixmap transparency 2634 * InheritPixmap transparency
2470 */ 2635 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2637 {
2473 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2476 XFree (list); 2641 XFree (list);
2477 2642
2478 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2479 { 2644 {
2480 if (oldp != None) 2645 if (oldp != None)
2481 pchanged = 1; 2646 pchanged = 1;
2482 2647
2483 break; 2648 break;
2484 } 2649 }
2485 2650
2486 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2487 pchanged = 1; 2652 pchanged = 1;
2488 } 2653 }
2489 2654
2490 n = 0; 2655 n = 0;
2491 2656
2492 if (pchanged) 2657 if (pchanged)
2493 { 2658 {
2494 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2495 { 2660 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2661 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2663 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2665 break;
2501 } 2666 }
2502 } 2667 }
2503 } 2668 }
2504 2669
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2671 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2674 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2511 } 2676 }
2512 else 2677 else
2513 { 2678 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2681 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2682 sleep (1);
2518#endif 2683#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2520 { 2685 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2687 XClearWindow (disp, parent[n]);
2523 } 2688 }
2524 2689
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2691 am_transparent = 1;
2527 } 2692 }
2528 2693
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2695 parent[i] = None;
2531 } 2696 }
2532 2697
2533 if (scrollBar.win) 2698 if (scrollBar.win)
2534 { 2699 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2701 scrollBar.setIdle ();
2537 scrollbar_show (0); 2702 scrollbar_show (0);
2538 } 2703 }
2539 2704
2540 if (am_transparent) 2705 if (am_transparent)
… …
2552 2717
2553bool 2718bool
2554rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2555{ 2720{
2556 bool flag = false; 2721 bool flag = false;
2557 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2559 2724
2560 for (;;) 2725 for (;;)
2561 { 2726 {
2562 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2563 { 2728 {
2564 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2730 ch = next_char ();
2566 }
2567 2731
2568 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2569 break; 2733 break;
2734 }
2570 2735
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2737 {
2573 if (!seen_input) 2738 if (!seen_input)
2574 { 2739 {
… …
2578 // some window managers resize the window early, and these programs 2743 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2744 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2745 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2746 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2747 // resized.
2583 if (seen_resize) 2748 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2585 } 2750 }
2586 2751
2587 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2754 bool refreshnow = false;
2590 int nlines = 0; 2755 int nlines = 0;
2591 unicode_t *str = buf; 2756 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2758
2593 for (;;) 2759 for (;;)
2594 { 2760 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2762 break;
2597 2763
2598 *str++ = ch; 2764 *str++ = ch;
2599 2765
2600 if (ch == C0_LF) 2766 if (ch == C0_LF || str >= eol)
2601 { 2767 {
2768 if (ch == C0_LF)
2602 nlines++; 2769 nlines++;
2770
2603 refresh_count++; 2771 refresh_count++;
2604 2772
2605 if (!(options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2775 {
2608 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2609 ch = NOCHAR; 2778 ch = NOCHAR;
2610 break; 2779 break;
2611 } 2780 }
2612 2781
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2783 if (nlines >= nrow - 1)
2615 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2616 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2617 nlines = 0; 2788 nlines = 0;
2618 str = buf; 2789 str = buf;
2790 eol = str + min (ncol, UBUFSIZ);
2619 } 2791 }
2620 }
2621 2792
2622 if (str >= buf + UBUFSIZ) 2793 if (str >= eol)
2623 { 2794 {
2795 if (eol >= buf + UBUFSIZ)
2796 {
2624 ch = NOCHAR; 2797 ch = NOCHAR;
2625 break; 2798 break;
2799 }
2800 else
2801 eol = min (eol + ncol, buf + UBUFSIZ);
2802 }
2803
2626 } 2804 }
2627 2805
2628 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2807 ch = next_char ();
2630 } 2808 }
2631 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2632 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2633 2812
2634 /* 2813 /*
2635 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2817 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2818 */
2640 if (refreshnow) 2819 if (refreshnow)
2641 { 2820 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2822 refresh_limit++;
2644 else 2823 else
2645 { 2824 {
2646 flag = true; 2825 flag = true;
2647 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2648 } 2828 }
2649 } 2829 }
2650 2830
2651 } 2831 }
2652 else 2832 else
… …
2667 } 2847 }
2668 2848
2669 return flag; 2849 return flag;
2670} 2850}
2671 2851
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2681// read the next character 2852// read the next character
2682unicode_t 2853wchar_t
2683rxvt_term::next_char () 2854rxvt_term::next_char ()
2684{ 2855{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2857 {
2687 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2690 2861
2691 wchar_t wc; 2862 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2864
2694 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2695 { 2866 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2869 break;
2699 } 2870 }
2700 2871
2701 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2874
2704 // assume wchar == unicode 2875 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2707 } 2878 }
2708 2879
2709 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2710} 2890}
2711 2891
2712/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2713/* 2893/*
2714 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2715 * to the command. 2895 * to the command.
2716 */ 2896 */
2717unicode_t 2897wchar_t
2718rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2719{ 2899{
2720 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2721 2901
2722 if (c == NOCHAR) 2902 if (c == NOCHAR)
2723 throw out_of_input; 2903 throw out_of_input;
2724 2904
2725 return c; 2905 return c;
2726} 2906}
2727 2907
2728unicode_t 2908uint32_t
2729rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2730{ 2910{
2731 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2732 2912
2733 if (c == NOCHAR) 2913 if (c == NOCHAR)
2734 throw out_of_input; 2914 throw out_of_input;
2735 2915
2736 return c; 2916 return c;
… …
2836 case C0_ESC: 3016 case C0_ESC:
2837 process_escape_seq (); 3017 process_escape_seq ();
2838 break; 3018 break;
2839 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 3022 else
2844 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 3024 break;
2847 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2848 scr_bell (); 3026 scr_bell ();
2849 break; 3027 break;
2850 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3005 break; 3183 break;
3006 3184
3007 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3009 { 3187 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 3190 }
3013 break; 3191 break;
3014 3192
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 3216 process_dcs_seq ();
3039 break; 3217 break;
3040 3218
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3046 3223
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 3226 process_csi_seq ();
… …
3174 { 3351 {
3175 switch (priv) 3352 switch (priv)
3176 { 3353 {
3177 case '>': 3354 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3355 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3357 break;
3181 case '?': 3358 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3360 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3361 break;
… …
3289 3466
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3467 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3468 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3469 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3472 break;
3296 3473
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3476 break;
3301 3477
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3304 break; 3480 break;
… …
3311 break; 3487 break;
3312 case 6: /* CPR requested */ 3488 case 6: /* CPR requested */
3313 scr_report_position (); 3489 scr_report_position ();
3314 break; 3490 break;
3315 case 7: /* unofficial extension */ 3491 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3492 if (OPTION (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3493 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3494 break;
3319 case 8: /* unofficial extension */ 3495 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3497 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3589rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3590{
3415 int x, y; 3591 int x, y;
3416 XWindowAttributes wattr; 3592 XWindowAttributes wattr;
3417 Window wdummy; 3593 Window wdummy;
3594 dDisp;
3418 3595
3419 if (nargs == 0) 3596 if (nargs == 0)
3420 return; 3597 return;
3421 3598
3422 switch (args[0]) 3599 switch (args[0])
3423 { 3600 {
3424 /* 3601 /*
3425 * commands 3602 * commands
3426 */ 3603 */
3427 case 1: /* deiconify window */ 3604 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3605 XMapWindow (disp, parent[0]);
3429 break; 3606 break;
3430 case 2: /* iconify window */ 3607 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3608 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3609 break;
3434 case 3: /* set position (pixels) */ 3610 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3611 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3612 break;
3437 case 4: /* set size (pixels) */ 3613 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3615 break;
3440 case 5: /* raise window */ 3616 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3617 XRaiseWindow (disp, parent[0]);
3442 break; 3618 break;
3443 case 6: /* lower window */ 3619 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3620 XLowerWindow (disp, parent[0]);
3445 break; 3621 break;
3446 case 7: /* refresh window */ 3622 case 7: /* refresh window */
3447 scr_touch (true); 3623 scr_touch (true);
3448 break; 3624 break;
3449 case 8: /* set size (chars) */ 3625 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3626 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3627 (unsigned int) (args[1] * fheight));
3452 break; 3628 break;
3453 3629
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3630 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3631 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3632 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3633 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
3459 break; 3635 break;
3460 3636
3461 3637
3462 /* 3638 /*
3463 * reports - some output format copied from XTerm 3639 * reports - some output format copied from XTerm
3464 */ 3640 */
3465 case 11: /* report window state */ 3641 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3642 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3644 break;
3469 case 13: /* report window position */ 3645 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3647 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3648 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3649 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3650 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3651 break;
3476 case 14: /* report window size (pixels) */ 3652 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3655 break;
3480 case 18: /* report text area size (chars) */ 3656 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3657 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3658 break;
3483 case 19: /* report window size (chars) */ 3659 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3660 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3661 break;
3486 case 20: /* report icon label */ 3662 case 20: /* report icon label */
3487 { 3663 {
3488 char *s; 3664 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3665 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3667 XFree (s);
3492 } 3668 }
3493 break; 3669 break;
3494 case 21: /* report window title */ 3670 case 21: /* report window title */
3495 { 3671 {
3496 char *s; 3672 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3673 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3675 XFree (s);
3500 } 3676 }
3501 break; 3677 break;
3502 } 3678 }
3503} 3679}
… …
3506/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3507/* 3683/*
3508 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3510 */ 3686 */
3511unsigned char * 3687char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3689{
3514 unicode_t ch; 3690 unicode_t ch;
3515 bool seen_esc = false; 3691 bool seen_esc = false;
3516 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3535 else if (ch < 0x20) 3711 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3712 return NULL; /* other control character - exit */
3537 3713
3538 seen_esc = false; 3714 seen_esc = false;
3539 3715
3540 if (n >= sizeof (string) - 1) 3716 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3717 // stop at some sane length
3542 return NULL; 3718 return NULL;
3543 3719
3544 if (ch == C0_SYN) 3720 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3721 string[n++] = cmd_get8 ();
… …
3549 3725
3550 string[n++] = '\0'; 3726 string[n++] = '\0';
3551 3727
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3729
3554 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3555} 3731}
3556 3732
3557/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3558/* 3734/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3736 */
3561void 3737void
3562rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3563{ 3739{
3564 unsigned char *s; 3740 char *s;
3565 unicode_t eh; 3741 unicode_t eh;
3566 3742
3567 /* 3743 /*
3568 * Not handled yet 3744 * Not handled yet
3569 */ 3745 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3590 3766
3591 if (ch == ';') 3767 if (ch == ';')
3592 { 3768 {
3593 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3594 3770
3595 if (s) 3771 if (s)
3596 { 3772 {
3597 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3598 free (s); 3774 free (s);
3599 } 3775 }
3600 } 3776 }
3601} 3777}
3602 3778
3603void 3779void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3781{
3606 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3607 { 3783 {
3608 unsigned short r, g, b; 3784 unsigned short r, g, b;
3609 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3613 set_window_color (color, str); 3789 set_window_color (color, str);
3614} 3790}
3615 3791
3616/* 3792/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3794 */
3641void 3795void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3797{
3644 int changed = 0; 3798 int changed = 0;
3645 int color; 3799 int color;
3646 char *buf, *name; 3800 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3802 int saveop = op;
3803 dDisp;
3649 3804
3650 assert (str != NULL); 3805 assert (str != NULL);
3651 switch (op) 3806 switch (op)
3652 { 3807 {
3653 case XTerm_name: 3808 case XTerm_name:
… …
3669 unsigned long bytes_after; 3824 unsigned long bytes_after;
3670 unsigned char *value = 0; 3825 unsigned char *value = 0;
3671 const char *str = ""; 3826 const char *str = "";
3672 3827
3673 if (prop 3828 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3829 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3830 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3831 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3832 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3833 && actual_type != None
3679 && actual_format == 8) 3834 && actual_format == 8)
… …
3691 { 3846 {
3692 *eq = 0; 3847 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3848 set_utf8_property (display->atom (str), eq + 1);
3694 } 3849 }
3695 else 3850 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3851 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3852 display->atom (str));
3698 } 3853 }
3699 break; 3854 break;
3700 3855
3701 case XTerm_Color: 3856 case XTerm_Color:
… …
3703 { 3858 {
3704 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3860 break;
3706 3861
3707 *name++ = '\0'; 3862 *name++ = '\0';
3708 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3709 3864
3710 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3866 break;
3712 3867
3713 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3869 *buf++ = '\0';
3715 3870
3716 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3717 { 3872 {
3718 unsigned short r, g, b; 3873 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 } 3876 }
3722 else 3877 else
3723 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3724 } 3879 }
3725 break; 3880 break;
3726 case XTerm_Color00: 3881 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3728 break; 3883 break;
3729 case XTerm_Color01: 3884 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3731 break; 3886 break;
3732#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3735 break; 3890 break;
… …
3739 break; 3894 break;
3740 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3742 break; 3897 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3909 break;
3910 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break;
3756#endif 3913#endif
3757#if TRANSPARENT && TINTING 3914#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3915 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3917 check_our_parents ();
3761 if (am_transparent) 3918 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3763 break; 3920 break;
3764#endif 3921#endif
3765 3922
3766 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3767 if (*str != ';') 3924 if (*str != ';')
3768 { 3925 {
3769#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3929 scr_touch (true);
3930#endif
3774 } 3931 }
3932
3775 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3776 { 3934 {
3777 str++; 3935 str++;
3778#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3782 3940
3783 if (changed) 3941 if (changed)
3784 { 3942 {
3785#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3944 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3945 scr_touch (true);
3946#endif
3789 } 3947 }
3790 break; 3948 break;
3791 3949
3792 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3794 break; 3952 break;
3795 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3797 break; 3955 break;
3798 3956
3799 case XTerm_logfile: 3957 case XTerm_logfile:
3800 // TODO, when secure mode? 3958 // TODO, when secure mode?
3801 break; 3959 break;
3802 3960
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0
3968 case Rxvt_dumpscreen: /* no error notices */
3969 {
3970 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 {
3973 scr_dump (fd);
3974 close (fd);
3975 }
3976 }
3977 break;
3978#endif
3803 case XTerm_font: 3979 case XTerm_font:
3804 op = URxvt_font; 3980 op = URxvt_font;
3805 case URxvt_font: 3981 case URxvt_font:
3806#if ENABLE_STYLES 3982#if ENABLE_STYLES
3807 case URxvt_boldFont: 3983 case URxvt_boldFont:
3808 case URxvt_italicFont: 3984 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3985 case URxvt_boldItalicFont:
3810#endif 3986#endif
3811 if (query) 3987 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3988 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3990 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3991 resp);
3816 else 3992 else
3817 { 3993 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3994 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3995
… …
3822 set_fonts (); 3998 set_fonts ();
3823 } 3999 }
3824 break; 4000 break;
3825 4001
3826#if ENABLE_FRILLS 4002#if ENABLE_FRILLS
3827 case XTerm_locale: 4003 case URxvt_locale:
3828 if (query) 4004 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830 else 4006 else
3831 { 4007 {
3832 set_locale (str); 4008 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 4009 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 4010 init_xlocale ();
3836# endif
3837 } 4011 }
3838 break; 4012 break;
3839#endif
3840 4013
3841#ifdef MENUBAR 4014 case URxvt_view_up:
3842 case XTerm_Menu: 4015 case URxvt_view_down:
3843 if (options & Opt_insecure) 4016 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4017 int lines = atoi (str);
4018
4019 if (lines)
4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
4021 else
4022 scr_erase_savelines ();
4023 }
4024
3845 break; 4025 break;
3846#endif 4026#endif
3847#if 0 4027
3848 case XTerm_dumpscreen: /* no error notices */ 4028#if ENABLE_PERL
3849 { 4029 case URxvt_perl:
3850 int fd; 4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4031 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 4032 break;
3858#endif 4033#endif
3859 } 4034 }
3860} 4035}
3861/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
3970 } 4145 }
3971 4146
3972 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4148 switch (arg[i])
3974 { 4149 {
4150#if ENABLE_STYLES
4151 case 1021:
4152 set_option (Opt_intensityStyles, mode);
4153
4154 scr_touch (true);
4155 break;
4156#endif
3975 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
3976 case 1049: 4158 case 1049:
3977 if (options & Opt_secondaryScreen) 4159 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4160 if (mode == 0)
3979 scr_cursor (RESTORE); 4161 scr_cursor (RESTORE);
3980 else if (mode == 1) 4162 else if (mode == 1)
3981 scr_cursor (SAVE); 4163 scr_cursor (SAVE);
3982 break; 4164 break;
… …
3994 */ 4176 */
3995 PrivMode (1, PrivMode_vt52); 4177 PrivMode (1, PrivMode_vt52);
3996 break; 4178 break;
3997 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4182 break;
4001 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4184 set_option (Opt_jumpScroll, !state);
4006 break; 4185 break;
4007 case 5: /* reverse video */ 4186 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
4009 break; 4188 break;
4010 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
… …
4051#if 0 4230#if 0
4052 case 1001: 4231 case 1001:
4053 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
4054#endif 4233#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4235 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4236 break;
4061 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4238 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4239 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4240 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4241 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4243 scr_erase_screen (2);
4071 scr_change_screen (state); 4244 scr_change_screen (state);
4072 break; 4245 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4246 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4247 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4248 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4250 scr_erase_screen (2);
4078 break; 4251 break;
4079 default: 4252 default:
4080 break; 4253 break;
… …
4208 scr_color (Color_bg, Color_bg); 4381 scr_color (Color_bg, Color_bg);
4209 break; 4382 break;
4210 4383
4211 //case 50: // not variable spacing 4384 //case 50: // not variable spacing
4212 4385
4213#ifndef NO_BRIGHTCOLOR 4386#if ENABLE_FRILLS
4214 case 90: 4387 case 90:
4215 case 91: /* set bright fg color */ 4388 case 91: /* set bright fg color */
4216 case 92: 4389 case 92:
4217 case 93: 4390 case 93:
4218 case 94: 4391 case 94:
… …
4230 case 106: 4403 case 106:
4231 case 107: 4404 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4405 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4406 break;
4234#endif 4407#endif
4235
4236 } 4408 }
4237 } 4409 }
4238} 4410}
4239/*}}} */ 4411/*}}} */
4240 4412
… …
4264 */ 4436 */
4265void 4437void
4266rxvt_term::tt_printf (const char *fmt,...) 4438rxvt_term::tt_printf (const char *fmt,...)
4267{ 4439{
4268 va_list arg_ptr; 4440 va_list arg_ptr;
4269 unsigned char buf[256]; 4441 char buf[256];
4270 4442
4271 va_start (arg_ptr, fmt); 4443 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4445 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4446 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 4451 * or generated by us in response to a query ESC sequence.
4280 */ 4452 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 4454
4283void 4455void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4461 if (pty.pty < 0)
4462 return;
4463
4286 if (v_buflen == 0) 4464 if (v_buflen == 0)
4287 { 4465 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4289 4467
4290 if ((unsigned int)written == len) 4468 if ((unsigned int)written == len)
… …
4292 4470
4293 data += written; 4471 data += written;
4294 len -= written; 4472 len -= written;
4295 } 4473 }
4296 4474
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4476
4299 memcpy (v_buffer + v_buflen, data, len); 4477 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4478 v_buflen += len;
4301 4479
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4480 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4321 } 4499 }
4322 4500
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4501 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4502 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4503 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4504 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4505}
4329 4506
4330/*----------------------- end-of-file (C source) -----------------------*/ 4507/*----------------------- end-of-file (C source) -----------------------*/
4331 4508

Diff Legend

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