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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 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;
… …
404 scr_move_to (0, 1); 443 scr_move_to (0, 1);
405 return; 444 return;
406 } 445 }
407 else if (keysym == XK_End) 446 else if (keysym == XK_End)
408 { 447 {
409 scr_move_to (1, 0); 448 scr_move_to (1, 1);
410 return; 449 return;
411 } 450 }
412 } 451 }
413#endif 452#endif
414 } 453 }
… …
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 > top_row && 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 == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1107 mouse_slip_wheel_speed = 0;
1015 1108
1016 refresh_type |= SMOOTH_REFRESH; 1109 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1110 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1112 }
1020} 1113}
1021#endif 1114#endif
1022 1115
1116#if HAVE_SCHED_YIELD
1117static struct event_handler
1118{
1119 check_watcher cw_yield;
1120
1121 void yield (check_watcher &w)
1122 {
1123 sched_yield ();
1124 w.stop ();
1125 }
1126
1127 event_handler ()
1128 : cw_yield (this, &event_handler::yield)
1129 {
1130 }
1131} event_handler;
1132#endif
1133
1023bool 1134bool
1024rxvt_term::pty_fill () 1135rxvt_term::pty_fill ()
1025{ 1136{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1137 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1138
1028 if (CBUFSIZ == n) 1139 if (CBUFSIZ == n)
1029 { 1140 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1141 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1142 n = 0;
1032 } 1143 }
1033 1144
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1145 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1146 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1147 cmdbuf_endp = cmdbuf_ptr + n;
1037 1148
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1150
1040 if (n > 0) 1151 if (r > 0)
1041 { 1152 {
1042 cmdbuf_endp += n; 1153 cmdbuf_endp += r;
1043 return true; 1154 return true;
1044 } 1155 }
1045 else if (n < 0 && errno != EAGAIN) 1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 {
1158#if HAVE_SCHED_YIELD
1159 if (display->is_local)
1160 event_handler.cw_yield.start ();
1161#endif
1162 }
1163 else
1164 {
1165 pty_ev.stop ();
1166
1167 if (!OPTION (Opt_hold))
1046 destroy (); 1168 destroy ();
1169 }
1047 1170
1048 return false; 1171 return false;
1049} 1172}
1050 1173
1051void 1174void
… …
1065} 1188}
1066 1189
1067void 1190void
1068rxvt_term::pointer_unblank () 1191rxvt_term::pointer_unblank ()
1069{ 1192{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1193 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1194 recolour_cursor ();
1072 1195
1073#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1197 hidden_pointer = 0;
1075 1198
1076 if (options & Opt_pointerBlank) 1199 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1200 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1201#endif
1079} 1202}
1080 1203
1081#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
1082void 1205void
1083rxvt_term::pointer_blank () 1206rxvt_term::pointer_blank ()
1084{ 1207{
1085 if (! (options & Opt_pointerBlank)) 1208 if (!OPTION (Opt_pointerBlank))
1086 return; 1209 return;
1087 1210
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1211 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1212 XFlush (display->display);
1090 1213
1091 hidden_pointer = 1; 1214 hidden_pointer = 1;
1092} 1215}
1093 1216
… …
1182 1305
1183/*{{{ process an X event */ 1306/*{{{ process an X event */
1184void 1307void
1185rxvt_term::x_cb (XEvent &ev) 1308rxvt_term::x_cb (XEvent &ev)
1186{ 1309{
1310 dDisp;
1311
1187 SET_R (this); 1312 SET_R (this);
1188 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1189 1314
1190#if defined(CURSOR_BLINK) 1315 if (ev.xany.window == vt
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1192 { 1317 return;
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1318
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1319 // for XQueryPointer
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
1217 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1322 unsigned int unused_mask;
1220 1323
1221 switch (ev.type) 1324 switch (ev.type)
… …
1228 1331
1229 break; 1332 break;
1230 1333
1231 case KeyRelease: 1334 case KeyRelease:
1232 { 1335 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1234 KeySym ks; 1337 KeySym keysym;
1235 1338
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif 1340#endif
1238 1341
1239#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support 1343 // ISO 14755 support
1241 if (iso14755buf) 1344 if (iso14755buf)
… …
1246# endif 1349# endif
1247# if ISO_14755 1350# if ISO_14755
1248 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1249 // first: controls 1352 // first: controls
1250 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1253 { 1356 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1255 commit_iso14755 (); 1358 commit_iso14755 ();
1256 return; // case-break; 1359 goto skip_switch;
1257 } 1360 }
1258 1361
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks) 1363 if (i[0] == keysym)
1261 { 1364 {
1262 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 (); 1366 commit_iso14755 ();
1264 return; // case-break; 1367 goto skip_switch;
1265 } 1368 }
1266 1369
1267 scr_bell (); 1370 scr_bell ();
1268# endif 1371# endif
1269 iso14755buf = 0; 1372 iso14755buf = 0;
… …
1288 else 1391 else
1289 iso14755buf = 0; 1392 iso14755buf = 0;
1290 } 1393 }
1291#endif 1394#endif
1292 1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1297 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1298#endif 1405#endif
1299 break; 1406 break;
1300 } 1407 }
1301 1408
… …
1307 button_release (ev.xbutton); 1414 button_release (ev.xbutton);
1308 break; 1415 break;
1309 1416
1310 case ClientMessage: 1417 case ClientMessage:
1311 if (ev.xclient.format == 32 1418 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1420 {
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1422 destroy ();
1423#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev);
1428#endif
1429 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1314#ifdef OFFIX_DND 1439#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1440 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1442 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1443 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1444 || ev.xclient.data.l[0] == DndLink))
1320 { 1445 {
1321 /* Get Dnd data */ 1446 /* Get Dnd data */
1322 Atom ActualType; 1447 Atom ActualType;
1323 int ActualFormat; 1448 int ActualFormat;
1324 unsigned char *data; 1449 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1450 unsigned long Size, RemainingBytes;
1326 1451
1327 XGetWindowProperty (display->display, display->root, 1452 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1453 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1454 0L, 1000000L,
1330 False, AnyPropertyType, 1455 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1456 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1457 &Size, &RemainingBytes,
1333 &data); 1458 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1459 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1460 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1463 }
1339#endif /* OFFIX_DND */ 1464#endif /* OFFIX_DND */
1340 break; 1465 break;
1341 1466
1342 case MappingNotify: 1467 case MappingNotify:
… …
1367 break; 1492 break;
1368 } 1493 }
1369 break; 1494 break;
1370 1495
1371 case FocusIn: 1496 case FocusIn:
1372 if (!TermWin.focus) 1497 focus_in ();
1498 break;
1499
1500 case FocusOut:
1501 focus_out ();
1502 break;
1503
1504 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0])
1373 { 1506 {
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)); 1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ;
1441 1509
1442 if (szHint.width != width || szHint.height != height) 1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1511 {
1444 seen_resize = 1; 1512 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1514 }
1447 1515
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1517 if (OPTION (Opt_transparent))
1450 check_our_parents (); 1518 check_our_parents ();
1451#endif 1519#endif
1452 } 1520 }
1453 break; 1521 break;
1454 1522
… …
1470 1538
1471 case SelectionRequest: 1539 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1473 break; 1541 break;
1474 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1475 case UnmapNotify: 1551 case UnmapNotify:
1476 TermWin.mapped = 0; 1552 mapped = 0;
1477#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1479#endif 1555#endif
1480 break; 1556 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; 1557 break;
1488 1558
1489#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1490 case ReparentNotify: 1560 case ReparentNotify:
1491 rootwin_cb (ev); 1561 rootwin_cb (ev);
1492 break; 1562 break;
1493#endif /* TRANSPARENT */ 1563#endif /* TRANSPARENT */
1494 1564
1495 case GraphicsExpose: 1565 case GraphicsExpose:
1496 case Expose: 1566 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1567 if (ev.xany.window == vt)
1498 { 1568 {
1499 do 1569 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1573
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1575
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1509 1579
1510 scr_refresh (refresh_type); 1580 want_refresh = 1;
1511 } 1581 }
1512 else 1582 else
1513 { 1583 {
1514 XEvent unused_event; 1584 XEvent unused_event;
1515 1585
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1587 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1589 ;
1520 1590
1521 if (isScrollbarWindow (ev.xany.window)) 1591 if (isScrollbarWindow (ev.xany.window))
1522 { 1592 {
1523 scrollBar.setIdle (); 1593 scrollBar.setIdle ();
… …
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose (); 1598 menubar_expose ();
1529#endif 1599#endif
1530 1600
1531#ifdef TRANSPARENT 1601#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1602 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1603 XClearWindow (disp, ev.xany.window);
1534#endif 1604#endif
1535 } 1605 }
1536 break; 1606 break;
1537 1607
1538 case MotionNotify: 1608 case MotionNotify:
… …
1548 } 1618 }
1549#endif 1619#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1621 break;
1552 1622
1553 if (ev.xany.window == TermWin.vt) 1623 if (ev.xany.window == vt)
1554 { 1624 {
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1628 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1630 ;
1559 1631
1560 XQueryPointer (display->display, TermWin.vt, 1632 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1636 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1637#ifdef MOUSE_THRESHOLD
… …
1577#endif 1649#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1650 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1651 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1652
1581#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1656 {
1585 int dist; 1657 int dist;
1586 1658
1587 /* don't clobber the current delay if we are 1659 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1660 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1668 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1669 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1670 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1671
1600 /* calc number of lines to scroll */ 1672 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1673 if (ev.xbutton.y < int_bwidth)
1602 { 1674 {
1603 scroll_selection_dir = UP; 1675 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1676 dist = int_bwidth - ev.xbutton.y;
1605 } 1677 }
1606 else 1678 else
1607 { 1679 {
1608 scroll_selection_dir = DN; 1680 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1681 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1682 }
1611 1683
1612 scroll_selection_lines = Pixel2Height (dist) 1684 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1685 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1686 + 1;
1615 MIN_IT (scroll_selection_lines, 1687 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1688 SELECTION_SCROLL_MAX_LINES);
1617 } 1689 }
1618 else 1690 else
1619 { 1691 {
1620 /* we are within the text window, so we 1692 /* we are within the text window, so we
… …
1629#endif 1701#endif
1630 } 1702 }
1631 } 1703 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1704 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1705 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1706 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1707 MotionNotify, &ev))
1636 ; 1708 ;
1637 1709
1638 XQueryPointer (display->display, scrollBar.win, 1710 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1711 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1713 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1714 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1716 scrollbar_size ());
1645 scr_refresh (refresh_type); 1717 want_refresh = 1;
1646 refresh_limit = 0; 1718 refresh_limit = 0;
1647 scrollbar_show (1); 1719 scrollbar_show (1);
1648 } 1720 }
1649 break; 1721 break;
1722 }
1723
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1728 {
1729 if (hidden_cursor)
1730 {
1731 hidden_cursor = 0;
1732 want_refresh = 1;
1733 }
1734
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1736 }
1737#endif
1738
1739#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 {
1742 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease)
1745 if (hidden_pointer)
1746 pointer_unblank ();
1747
1748 if (ev.type == KeyPress && hidden_pointer == 0)
1749 pointer_blank ();
1750 }
1751#endif
1752}
1753
1754void
1755rxvt_term::focus_in ()
1756{
1757 if (!focus)
1758 {
1759 focus = 1;
1760 want_refresh = 1;
1761
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763
1764#if USE_XIM
1765 if (Input_Context != NULL)
1766 {
1767 IMSetStatusPosition ();
1768 XSetICFocus (Input_Context);
1769 }
1770#endif
1771#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1774#endif
1775#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade])
1777 {
1778 pix_colors = pix_colors_focused;
1779 scr_recolour ();
1780 }
1781#endif
1782 }
1783}
1784
1785void
1786rxvt_term::focus_out ()
1787{
1788 if (focus)
1789 {
1790 focus = 0;
1791 want_refresh = 1;
1792
1793 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794
1795#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf)
1797 {
1798 iso14755buf = 0;
1799# if ENABLE_OVERLAY
1800 scr_overlay_off ();
1801# endif
1802 }
1803#endif
1804#if USE_XIM
1805 if (Input_Context != NULL)
1806 XUnsetICFocus (Input_Context);
1807#endif
1808#if CURSOR_BLINK
1809 if (OPTION (Opt_cursorBlink))
1810 cursor_blink_ev.stop ();
1811 hidden_cursor = 0;
1812#endif
1813#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade])
1815 {
1816 pix_colors = pix_colors_unfocused;
1817 scr_recolour ();
1818 }
1819#endif
1650 } 1820 }
1651} 1821}
1652 1822
1653#if TRANSPARENT 1823#if TRANSPARENT
1654void 1824void
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1839 return;
1670 1840
1671 /* FALLTHROUGH */ 1841 /* FALLTHROUGH */
1672 case ReparentNotify: 1842 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1; 1844 want_refresh = want_full_refresh = 1;
1675 break; 1845 break;
1676 } 1846 }
1677} 1847}
1678#endif 1848#endif
… …
1681rxvt_term::button_press (XButtonEvent &ev) 1851rxvt_term::button_press (XButtonEvent &ev)
1682{ 1852{
1683 int reportmode = 0, clickintime; 1853 int reportmode = 0, clickintime;
1684 1854
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1855 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1856
1686 if (!bypass_keystate) 1857 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1858 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1859
1689 /* 1860 /*
1690 * VT window processing of button press 1861 * VT window processing of button press
1691 */ 1862 */
1692 if (ev.window == TermWin.vt) 1863 if (ev.window == vt)
1693 { 1864 {
1694#if ISO_14755 1865#if ISO_14755
1695 // 5.4 1866 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1868 {
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1881#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1882 if (ev.button == MEvent.button && clickintime)
1712 { 1883 {
1713 /* same button, within alloted time */ 1884 /* same button, within alloted time */
1714 MEvent.clicks++; 1885 MEvent.clicks++;
1886
1715 if (MEvent.clicks > 1) 1887 if (MEvent.clicks > 1)
1716 { 1888 {
1717 /* only report double clicks */ 1889 /* only report double clicks */
1718 MEvent.clicks = 2; 1890 MEvent.clicks = 2;
1719 mouse_report (ev); 1891 mouse_report (ev);
… …
1739 else 1911 else
1740 { 1912 {
1741 if (ev.button != MEvent.button) 1913 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1914 MEvent.clicks = 0;
1743 1915
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1744 switch (ev.button) 1917 switch (ev.button)
1745 { 1918 {
1746 case Button1: 1919 case Button1:
1747 /* allow meta + click to select rectangular areas */ 1920 /* allow meta + click to select rectangular areas */
1748 /* should be done in screen.C */ 1921 /* should be done in screen.C */
1749#if ENABLE_FRILLS 1922#if ENABLE_FRILLS
1750 selection.rect = !!(ev.state & ModMetaMask); 1923 selection.rect = !!(ev.state & ModMetaMask);
1751#else 1924#else
1752 selection.rect = false; 1925 selection.rect = false;
1753#endif 1926#endif
1754 1927
1755 /* allow shift+left click to extend selection */ 1928 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1930 {
1758 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1760 else 1933 else
1761 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
1762 } 1935 }
1763 else 1936 else
1764 { 1937 {
1765 if (MEvent.button == Button1 && clickintime) 1938 if (MEvent.button == Button1 && clickintime)
1766 MEvent.clicks++; 1939 MEvent.clicks++;
1767 else 1940 else
1768 MEvent.clicks = 1; 1941 MEvent.clicks = 1;
1769 1942
1770 selection_click (MEvent.clicks, ev.x, ev.y); 1943 selection_click (MEvent.clicks, ev.x, ev.y);
1771 } 1944 }
1772 1945
1773 MEvent.button = Button1; 1946 MEvent.button = Button1;
1774 break; 1947 break;
1775 1948
1776 case Button3: 1949 case Button3:
1777 if (MEvent.button == Button3 && clickintime) 1950 if (MEvent.button == Button3 && clickintime)
1778 selection_rotate (ev.x, ev.y); 1951 selection_rotate (ev.x, ev.y);
1779 else 1952 else
1780 selection_extend (ev.x, ev.y, 1); 1953 selection_extend (ev.x, ev.y, 1);
1781 1954
1782 MEvent.button = Button3; 1955 MEvent.button = Button3;
1783 break; 1956 break;
1784 } 1957 }
1785 } 1958 }
1786 1959
1787 MEvent.time = ev.time; 1960 MEvent.time = ev.time;
1788 return; 1961 return;
1789 } 1962 }
1790 1963
… …
1902 case Button3: 2075 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2076 if (scrollBar.style != R_SB_XTERM)
1904 { 2077 {
1905 if (scrollbar_above_slider (ev.y)) 2078 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2080 scr_page (UP, nrow - 1);
1908# else 2081# else
1909 scr_page (UP, TermWin.nrow / 4); 2082 scr_page (UP, nrow / 4);
1910# endif 2083# endif
1911 else if (scrollbar_below_slider (ev.y)) 2084 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2085# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2086 scr_page (DN, nrow - 1);
1914# else 2087# else
1915 scr_page (DN, TermWin.nrow / 4); 2088 scr_page (DN, nrow / 4);
1916# endif 2089# endif
1917 else 2090 else
1918 scrollBar.setMotion (); 2091 scrollBar.setMotion ();
1919 } 2092 }
1920 else 2093 else
1921 { 2094 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2095 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2096 (nrow
1924 * scrollbar_position (ev.y) 2097 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2098 / scrollbar_size ()));
1926 } 2099 }
1927 2100
1928 break; 2101 break;
1929 } 2102 }
1930 } 2103 }
2104
1931 return; 2105 return;
1932 } 2106 }
2107
1933#if MENUBAR 2108#if MENUBAR
1934 /* 2109 /*
1935 * Menubar window processing of button press 2110 * Menubar window processing of button press
1936 */ 2111 */
1937 if (isMenuBarWindow (ev.window)) 2112 if (isMenuBarWindow (ev.window))
… …
1960#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1963#endif 2138#endif
1964 2139
1965 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1966 { 2141 {
1967#if ISO_14755 2142#if ISO_14755
1968 // 5.4 2143 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2145 return;
… …
2000 if (priv_modes & PrivMode_mouse_report 2175 if (priv_modes & PrivMode_mouse_report
2001 && bypass_keystate 2176 && bypass_keystate
2002 && ev.button == Button1 && MEvent.clicks <= 1) 2177 && ev.button == Button1 && MEvent.clicks <= 1)
2003 selection_extend (ev.x, ev.y, 0); 2178 selection_extend (ev.x, ev.y, 0);
2004 2179
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2005 switch (ev.button) 2183 switch (ev.button)
2006 { 2184 {
2007 case Button1: 2185 case Button1:
2008 case Button3: 2186 case Button3:
2009 selection_make (ev.time); 2187 selection_make (ev.time);
… …
2020 2198
2021 v = ev.button == Button4 ? UP : DN; 2199 v = ev.button == Button4 ? UP : DN;
2022 2200
2023 if (ev.state & ShiftMask) 2201 if (ev.state & ShiftMask)
2024 i = 1; 2202 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2203 else if (OPTION (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2204 i = nrow - 1;
2027 else 2205 else
2028 i = 5; 2206 i = 5;
2029 2207
2030# ifdef MOUSE_SLIP_WHEELING 2208# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2209 if (ev.state & ControlMask)
2032 { 2210 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2211 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2212 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; 2213 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2214
2037 if (slip_wheel_ev.at < NOW) 2215 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2216 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2217
2040 slip_wheel_ev.start (); 2218 slip_wheel_ev.start ();
2041 } 2219 }
2042 else 2220 else
2043 { 2221 {
2044# endif 2222# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2223 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2224 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 2225# ifdef MOUSE_SLIP_WHEELING
2058 } 2226 }
2059#endif 2227# endif
2060 } 2228 }
2061 break; 2229 break;
2062#endif 2230#endif
2063 } 2231 }
2064 } 2232 }
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2252 int i;
2085 2253
2086 Visual* visual = display->visual; 2254 Visual *visual = display->visual;
2087 2255
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2257
2090 /* for convenience */ 2258 /* for convenience */
2091 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2312 Atom atype; 2480 Atom atype;
2313 unsigned char *prop = NULL; 2481 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2482 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2483 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2484 XWindowAttributes wattr, wrootattr;
2485 dDisp;
2317 2486
2318 pchanged = 0; 2487 pchanged = 0;
2319 2488
2320 if (!(options & Opt_transparent)) 2489 if (!OPTION (Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2322 2491
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2492 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2493 rootdepth = wrootattr.depth;
2325 2494
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2495 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2496
2328 if (rootdepth != wattr.depth) 2497 if (rootdepth != wattr.depth)
2329 { 2498 {
2330 if (am_transparent) 2499 if (am_transparent)
2331 { 2500 {
2332 pchanged = 1; 2501 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2503 am_transparent = am_pixmap_trans = 0;
2335 } 2504 }
2336 2505
2337 return pchanged; /* Don't try any more */ 2506 return pchanged; /* Don't try any more */
2338 } 2507 }
2339 2508
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2509 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2510 XSync (disp, False);
2342 2511
2343 /* 2512 /*
2344 * Make the frame window set by the window manager have 2513 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2514 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2515 * windows for each client, so we have to take care about that.
2347 */ 2516 */
2348 i = (xa[XA_XROOTPMAP_ID] 2517 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2518 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2520 &nitems, &bytes_after, &prop) == Success);
2352 2521
2353 if (!i || prop == NULL) 2522 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2523 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2524 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2526 &nitems, &bytes_after, &prop) == Success);
2358 2527
2359 if (!i || prop == NULL 2528 if (!i || prop == NULL
2360#if TINTING 2529#if TINTING
… …
2379 Window cr; 2548 Window cr;
2380 XImage *image; 2549 XImage *image;
2381 GC gc; 2550 GC gc;
2382 XGCValues gcvalue; 2551 XGCValues gcvalue;
2383 2552
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2553 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2554 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2555 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2556 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2557 nx = ny = 0;
2389 2558
… …
2399 nh += sy; 2568 nh += sy;
2400 ny = -sy; 2569 ny = -sy;
2401 sy = 0; 2570 sy = 0;
2402 } 2571 }
2403 2572
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2575
2407 XSync (display->display, False); 2576 XSync (disp, False);
2408 allowedxerror = -1; 2577 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2579
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2580 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2581 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2582 allowedxerror = 0;
2414 2583
2415 if (image == NULL) 2584 if (image == NULL)
2416 { 2585 {
2417 if (am_transparent && am_pixmap_trans) 2586 if (am_transparent && am_pixmap_trans)
2418 { 2587 {
2419 pchanged = 1; 2588 pchanged = 1;
2420 if (TermWin.pixmap != None) 2589 if (pixmap != None)
2421 { 2590 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2591 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2592 pixmap = None;
2424 } 2593 }
2425 } 2594 }
2426 2595
2427 am_pixmap_trans = 0; 2596 am_pixmap_trans = 0;
2428 } 2597 }
2429 else 2598 else
2430 { 2599 {
2431 if (TermWin.pixmap != None) 2600 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2601 XFreePixmap (disp, pixmap);
2433 2602
2434#if TINTING 2603#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2604 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2605 {
2437 unsigned short rm, gm, bm; 2606 unsigned short rm, gm, bm;
… …
2441 2610
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2611 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2612 }
2444#endif 2613#endif
2445 2614
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2615 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2616 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2619 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2620 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2621 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2623 XClearWindow (disp, parent[0]);
2455 2624
2456 if (!am_transparent || !am_pixmap_trans) 2625 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2626 pchanged = 1;
2458 2627
2459 am_transparent = am_pixmap_trans = 1; 2628 am_transparent = am_pixmap_trans = 1;
2460 } 2629 }
2461 } 2630 }
2462 2631
2463 if (am_pixmap_trans) 2632 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2634 else
2466 { 2635 {
2467 unsigned int n; 2636 unsigned int n;
2468 /* 2637 /*
2469 * InheritPixmap transparency 2638 * InheritPixmap transparency
2470 */ 2639 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2641 {
2473 oldp = TermWin.parent[i]; 2642 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2643 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2644 &parent[i], &list, &n);
2476 XFree (list); 2645 XFree (list);
2477 2646
2478 if (TermWin.parent[i] == display->root) 2647 if (parent[i] == display->root)
2479 { 2648 {
2480 if (oldp != None) 2649 if (oldp != None)
2481 pchanged = 1; 2650 pchanged = 1;
2482 2651
2483 break; 2652 break;
2484 } 2653 }
2485 2654
2486 if (oldp != TermWin.parent[i]) 2655 if (oldp != parent[i])
2487 pchanged = 1; 2656 pchanged = 1;
2488 } 2657 }
2489 2658
2490 n = 0; 2659 n = 0;
2491 2660
2492 if (pchanged) 2661 if (pchanged)
2493 { 2662 {
2494 for (; n < (unsigned int)i; n++) 2663 for (; n < (unsigned int)i; n++)
2495 { 2664 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2665 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2667 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2669 break;
2501 } 2670 }
2502 } 2671 }
2503 } 2672 }
2504 2673
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2675 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2677 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2678 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2679 /* XXX: also turn off Opt_transparent? */
2511 } 2680 }
2512 else 2681 else
2513 { 2682 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2685 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2686 sleep (1);
2518#endif 2687#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2688 for (n = 0; n < (unsigned int)i; n++)
2520 { 2689 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2691 XClearWindow (disp, parent[n]);
2523 } 2692 }
2524 2693
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2695 am_transparent = 1;
2527 } 2696 }
2528 2697
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2699 parent[i] = None;
2531 } 2700 }
2532 2701
2533 if (scrollBar.win) 2702 if (scrollBar.win)
2534 { 2703 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2705 scrollBar.setIdle ();
2537 scrollbar_show (0); 2706 scrollbar_show (0);
2538 } 2707 }
2539 2708
2540 if (am_transparent) 2709 if (am_transparent)
… …
2552 2721
2553bool 2722bool
2554rxvt_term::cmd_parse () 2723rxvt_term::cmd_parse ()
2555{ 2724{
2556 bool flag = false; 2725 bool flag = false;
2557 unicode_t ch = NOCHAR; 2726 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2727 char *seq_begin; // remember start of esc-sequence here
2559 2728
2560 for (;;) 2729 for (;;)
2561 { 2730 {
2562 if (ch == NOCHAR) 2731 if (ch == NOCHAR)
2563 { 2732 {
2564 seq_begin = cmdbuf_ptr; 2733 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2734 ch = next_char ();
2566 }
2567 2735
2568 if (ch == NOCHAR) // TODO: improve 2736 if (ch == NOCHAR)
2569 break; 2737 break;
2738 }
2570 2739
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2740 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2741 {
2573 if (!seen_input) 2742 if (!seen_input)
2574 { 2743 {
… …
2578 // some window managers resize the window early, and these programs 2747 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2748 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2749 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2750 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2751 // resized.
2583 if (seen_resize) 2752 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2753 kill (-cmd_pid, SIGWINCH);
2585 } 2754 }
2586 2755
2587 /* Read a text string from the input buffer */ 2756 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2757 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2758 bool refreshnow = false;
2590 int nlines = 0; 2759 int nlines = 0;
2591 unicode_t *str = buf; 2760 wchar_t *str = buf;
2761 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2762
2593 for (;;) 2763 for (;;)
2594 { 2764 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2765 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2766 break;
2597 2767
2598 *str++ = ch; 2768 *str++ = ch;
2599 2769
2600 if (ch == C0_LF) 2770 if (ch == C0_LF || str >= eol)
2601 { 2771 {
2772 if (ch == C0_LF)
2602 nlines++; 2773 nlines++;
2774
2603 refresh_count++; 2775 refresh_count++;
2604 2776
2605 if (!(options & Opt_jumpScroll) 2777 if (!OPTION (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2779 {
2608 refreshnow = true; 2780 refreshnow = true;
2781 refresh_count = 0;
2609 ch = NOCHAR; 2782 ch = NOCHAR;
2610 break; 2783 break;
2611 } 2784 }
2612 2785
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2786 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2787 if (nlines >= nrow - 1)
2615 { 2788 {
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2616 scr_add_lines (buf, nlines, str - buf); 2790 scr_add_lines (buf, str - buf, nlines);
2791
2617 nlines = 0; 2792 nlines = 0;
2618 str = buf; 2793 str = buf;
2794 eol = str + min (ncol, UBUFSIZ);
2619 } 2795 }
2620 }
2621 2796
2622 if (str >= buf + UBUFSIZ) 2797 if (str >= eol)
2623 { 2798 {
2799 if (eol >= buf + UBUFSIZ)
2800 {
2624 ch = NOCHAR; 2801 ch = NOCHAR;
2625 break; 2802 break;
2803 }
2804 else
2805 eol = min (eol + ncol, buf + UBUFSIZ);
2806 }
2807
2626 } 2808 }
2627 2809
2628 seq_begin = cmdbuf_ptr; 2810 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2811 ch = next_char ();
2630 } 2812 }
2631 2813
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2632 scr_add_lines (buf, nlines, str - buf); 2815 scr_add_lines (buf, str - buf, nlines);
2633 2816
2634 /* 2817 /*
2635 * If there have been a lot of new lines, then update the screen 2818 * 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. 2819 * 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 2820 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2821 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2822 */
2640 if (refreshnow) 2823 if (refreshnow)
2641 { 2824 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2826 refresh_limit++;
2644 else 2827 else
2645 { 2828 {
2646 flag = true; 2829 flag = true;
2647 scr_refresh (refresh_type); 2830 scr_refresh (refresh_type);
2831 want_refresh = 1;
2648 } 2832 }
2649 } 2833 }
2650 2834
2651 } 2835 }
2652 else 2836 else
… …
2667 } 2851 }
2668 2852
2669 return flag; 2853 return flag;
2670} 2854}
2671 2855
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 2856// read the next character
2682unicode_t 2857wchar_t
2683rxvt_term::next_char () 2858rxvt_term::next_char ()
2684{ 2859{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2860 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2861 {
2687 // assume 7-bit to be ascii ALWAYS 2862 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2864 return *cmdbuf_ptr++;
2690 2865
2691 wchar_t wc; 2866 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2867 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2868
2694 if (len == (size_t)-2) 2869 if (len == (size_t)-2)
2695 { 2870 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2871 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2872 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2873 break;
2699 } 2874 }
2700 2875
2701 if (len == (size_t)-1) 2876 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2877 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2878
2704 // assume wchar == unicode 2879 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2880 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2881 return wc & UNICODE_MASK;
2707 } 2882 }
2708 2883
2709 return NOCHAR; 2884 return NOCHAR;
2885}
2886
2887// read the next octet
2888uint32_t
2889rxvt_term::next_octet ()
2890{
2891 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR;
2710} 2894}
2711 2895
2712/* rxvt_cmd_getc () - Return next input character */ 2896/* rxvt_cmd_getc () - Return next input character */
2713/* 2897/*
2714 * Return the next input character after first passing any keyboard input 2898 * Return the next input character after first passing any keyboard input
2715 * to the command. 2899 * to the command.
2716 */ 2900 */
2717unicode_t 2901wchar_t
2718rxvt_term::cmd_getc () 2902rxvt_term::cmd_getc ()
2719{ 2903{
2720 unicode_t c = next_char (); 2904 wchar_t c = next_char ();
2721 2905
2722 if (c == NOCHAR) 2906 if (c == NOCHAR)
2723 throw out_of_input; 2907 throw out_of_input;
2724 2908
2725 return c; 2909 return c;
2726} 2910}
2727 2911
2728unicode_t 2912uint32_t
2729rxvt_term::cmd_get8 () 2913rxvt_term::cmd_get8 ()
2730{ 2914{
2731 unicode_t c = next_octet (); 2915 uint32_t c = next_octet ();
2732 2916
2733 if (c == NOCHAR) 2917 if (c == NOCHAR)
2734 throw out_of_input; 2918 throw out_of_input;
2735 2919
2736 return c; 2920 return c;
… …
2836 case C0_ESC: 3020 case C0_ESC:
2837 process_escape_seq (); 3021 process_escape_seq ();
2838 break; 3022 break;
2839 case C0_ENQ: /* terminal Status */ 3023 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 3024 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3025 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 3026 else
2844 tt_write ((unsigned char *)VT100_ANS, 3027 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 3028 break;
2847 case C0_BEL: /* bell */ 3029 case C0_BEL: /* bell */
2848 scr_bell (); 3030 scr_bell ();
2849 break; 3031 break;
2850 case C0_BS: /* backspace */ 3032 case C0_BS: /* backspace */
… …
3005 break; 3187 break;
3006 3188
3007 /* 8.3.87: NEXT LINE */ 3189 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 3190 case C1_NEL: /* ESC E */
3009 { 3191 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 3192 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 3193 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 3194 }
3013 break; 3195 break;
3014 3196
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 3197 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 3198 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 3220 process_dcs_seq ();
3039 break; 3221 break;
3040 3222
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3223 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 3224 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 3225 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 3226 break; /* steal obsolete ESC [ c */
3046 3227
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3228 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 3229 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 3230 process_csi_seq ();
… …
3174 { 3355 {
3175 switch (priv) 3356 switch (priv)
3176 { 3357 {
3177 case '>': 3358 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3359 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3360 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3361 break;
3181 case '?': 3362 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3363 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3364 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3365 break;
… …
3289 3470
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3471 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3472 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3473 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3474 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3475 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3476 break;
3296 3477
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3478 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3479 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3480 break;
3301 3481
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3482 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3483 process_sgr_mode (nargs, arg);
3304 break; 3484 break;
… …
3311 break; 3491 break;
3312 case 6: /* CPR requested */ 3492 case 6: /* CPR requested */
3313 scr_report_position (); 3493 scr_report_position ();
3314 break; 3494 break;
3315 case 7: /* unofficial extension */ 3495 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3496 if (OPTION (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3497 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3498 break;
3319 case 8: /* unofficial extension */ 3499 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3501 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3593rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3594{
3415 int x, y; 3595 int x, y;
3416 XWindowAttributes wattr; 3596 XWindowAttributes wattr;
3417 Window wdummy; 3597 Window wdummy;
3598 dDisp;
3418 3599
3419 if (nargs == 0) 3600 if (nargs == 0)
3420 return; 3601 return;
3421 3602
3422 switch (args[0]) 3603 switch (args[0])
3423 { 3604 {
3424 /* 3605 /*
3425 * commands 3606 * commands
3426 */ 3607 */
3427 case 1: /* deiconify window */ 3608 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3609 XMapWindow (disp, parent[0]);
3429 break; 3610 break;
3430 case 2: /* iconify window */ 3611 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3612 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3613 break;
3434 case 3: /* set position (pixels) */ 3614 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3615 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3616 break;
3437 case 4: /* set size (pixels) */ 3617 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3619 break;
3440 case 5: /* raise window */ 3620 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3621 XRaiseWindow (disp, parent[0]);
3442 break; 3622 break;
3443 case 6: /* lower window */ 3623 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3624 XLowerWindow (disp, parent[0]);
3445 break; 3625 break;
3446 case 7: /* refresh window */ 3626 case 7: /* refresh window */
3447 scr_touch (true); 3627 scr_touch (true);
3448 break; 3628 break;
3449 case 8: /* set size (chars) */ 3629 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3630 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3631 (unsigned int) (args[1] * fheight));
3452 break; 3632 break;
3453 3633
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3634 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3635 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3636 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3637 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
3459 break; 3639 break;
3460 3640
3461 3641
3462 /* 3642 /*
3463 * reports - some output format copied from XTerm 3643 * reports - some output format copied from XTerm
3464 */ 3644 */
3465 case 11: /* report window state */ 3645 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3648 break;
3469 case 13: /* report window position */ 3649 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3650 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3651 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3652 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3653 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3654 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3655 break;
3476 case 14: /* report window size (pixels) */ 3656 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3659 break;
3480 case 18: /* report text area size (chars) */ 3660 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3661 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3662 break;
3483 case 19: /* report window size (chars) */ 3663 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3664 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3665 break;
3486 case 20: /* report icon label */ 3666 case 20: /* report icon label */
3487 { 3667 {
3488 char *s; 3668 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3669 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3671 XFree (s);
3492 } 3672 }
3493 break; 3673 break;
3494 case 21: /* report window title */ 3674 case 21: /* report window title */
3495 { 3675 {
3496 char *s; 3676 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3677 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3679 XFree (s);
3500 } 3680 }
3501 break; 3681 break;
3502 } 3682 }
3503} 3683}
… …
3506/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
3507/* 3687/*
3508 * get input up until STRING TERMINATOR (or BEL) 3688 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3689 * ends_how is terminator used. returned input must be free()'d
3510 */ 3690 */
3511unsigned char * 3691char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3692rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3693{
3514 unicode_t ch; 3694 unicode_t ch;
3515 bool seen_esc = false; 3695 bool seen_esc = false;
3516 unsigned int n = 0; 3696 unsigned int n = 0;
… …
3535 else if (ch < 0x20) 3715 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3716 return NULL; /* other control character - exit */
3537 3717
3538 seen_esc = false; 3718 seen_esc = false;
3539 3719
3540 if (n >= sizeof (string) - 1) 3720 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3721 // stop at some sane length
3542 return NULL; 3722 return NULL;
3543 3723
3544 if (ch == C0_SYN) 3724 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3725 string[n++] = cmd_get8 ();
… …
3549 3729
3550 string[n++] = '\0'; 3730 string[n++] = '\0';
3551 3731
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3732 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3733
3554 return (unsigned char *)rxvt_wcstombs (string); 3734 return rxvt_wcstombs (string);
3555} 3735}
3556 3736
3557/*----------------------------------------------------------------------*/ 3737/*----------------------------------------------------------------------*/
3558/* 3738/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3739 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3740 */
3561void 3741void
3562rxvt_term::process_dcs_seq () 3742rxvt_term::process_dcs_seq ()
3563{ 3743{
3564 unsigned char *s; 3744 char *s;
3565 unicode_t eh; 3745 unicode_t eh;
3566 3746
3567 /* 3747 /*
3568 * Not handled yet 3748 * Not handled yet
3569 */ 3749 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3768 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3769 arg = arg * 10 + (ch - '0');
3590 3770
3591 if (ch == ';') 3771 if (ch == ';')
3592 { 3772 {
3593 unsigned char *s = get_to_st (eh); 3773 char *s = get_to_st (eh);
3594 3774
3595 if (s) 3775 if (s)
3596 { 3776 {
3597 process_xterm_seq (arg, (char *)s, eh); 3777 process_xterm_seq (arg, s, eh);
3598 free (s); 3778 free (s);
3599 } 3779 }
3600 } 3780 }
3601} 3781}
3602 3782
3603void 3783void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3785{
3606 if (str[0] == '?' && !str[1]) 3786 if (str[0] == '?' && !str[1])
3607 { 3787 {
3608 unsigned short r, g, b; 3788 unsigned short r, g, b;
3609 pix_colors_focused[color].get (display, r, g, b); 3789 pix_colors_focused[color].get (display, r, g, b);
… …
3613 set_window_color (color, str); 3793 set_window_color (color, str);
3614} 3794}
3615 3795
3616/* 3796/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3797 * 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 */ 3798 */
3641void 3799void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3800rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3801{
3644 int changed = 0; 3802 int changed = 0;
3645 int color; 3803 int color;
3646 char *buf, *name; 3804 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3805 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3806 int saveop = op;
3807 dDisp;
3649 3808
3650 assert (str != NULL); 3809 assert (str != NULL);
3651 switch (op) 3810 switch (op)
3652 { 3811 {
3653 case XTerm_name: 3812 case XTerm_name:
… …
3669 unsigned long bytes_after; 3828 unsigned long bytes_after;
3670 unsigned char *value = 0; 3829 unsigned char *value = 0;
3671 const char *str = ""; 3830 const char *str = "";
3672 3831
3673 if (prop 3832 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3833 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3837 && actual_type != None
3679 && actual_format == 8) 3838 && actual_format == 8)
… …
3691 { 3850 {
3692 *eq = 0; 3851 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3694 } 3853 }
3695 else 3854 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3855 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3856 display->atom (str));
3698 } 3857 }
3699 break; 3858 break;
3700 3859
3701 case XTerm_Color: 3860 case XTerm_Color:
… …
3703 { 3862 {
3704 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3864 break;
3706 3865
3707 *name++ = '\0'; 3866 *name++ = '\0';
3708 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3709 3868
3710 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3870 break;
3712 3871
3713 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3873 *buf++ = '\0';
3715 3874
3716 if (name[0] == '?' && !name[1]) 3875 if (name[0] == '?' && !name[1])
3717 { 3876 {
3718 unsigned short r, g, b; 3877 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3878 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); 3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 } 3880 }
3722 else 3881 else
3723 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3724 } 3883 }
3725 break; 3884 break;
3726 case XTerm_Color00: 3885 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3728 break; 3887 break;
3729 case XTerm_Color01: 3888 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3731 break; 3890 break;
3732#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3735 break; 3894 break;
… …
3739 break; 3898 break;
3740 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3742 break; 3901 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#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: 3903 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3905 break;
3906 case Rxvt_Color_BD:
3907 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp);
3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3913 break;
3914 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3916 break;
3756#endif 3917#endif
3757#if TRANSPARENT && TINTING 3918#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3919 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3921 check_our_parents ();
3761 if (am_transparent) 3922 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3763 break; 3924 break;
3764#endif 3925#endif
3765 3926
3766 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3767 if (*str != ';') 3928 if (*str != ';')
3768 { 3929 {
3769#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3933 scr_touch (true);
3934#endif
3774 } 3935 }
3936
3775 while ((str = strchr (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3776 { 3938 {
3777 str++; 3939 str++;
3778#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
3780#endif 3942#endif
3781
3782 } 3943 }
3944
3783 if (changed) 3945 if (changed)
3784 { 3946 {
3785#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3948 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3949 scr_touch (true);
3950#endif
3789 } 3951 }
3790 break; 3952 break;
3791 3953
3792 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3794 break; 3956 break;
3795 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3797 break; 3959 break;
3798 3960
3799 case XTerm_logfile: 3961 case XTerm_logfile:
3800 // TODO, when secure mode? 3962 // TODO, when secure mode?
3801 break; 3963 break;
3802 3964
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0
3972 case Rxvt_dumpscreen: /* no error notices */
3973 {
3974 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 {
3977 scr_dump (fd);
3978 close (fd);
3979 }
3980 }
3981 break;
3982#endif
3803 case XTerm_font: 3983 case XTerm_font:
3804 op = URxvt_font; 3984 op = URxvt_font;
3805 case URxvt_font: 3985 case URxvt_font:
3806#if ENABLE_STYLES 3986#if ENABLE_STYLES
3807 case URxvt_boldFont: 3987 case URxvt_boldFont:
3808 case URxvt_italicFont: 3988 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3989 case URxvt_boldItalicFont:
3810#endif 3990#endif
3811 if (query) 3991 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3994 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3995 resp);
3816 else 3996 else
3817 { 3997 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3999
… …
3822 set_fonts (); 4002 set_fonts ();
3823 } 4003 }
3824 break; 4004 break;
3825 4005
3826#if ENABLE_FRILLS 4006#if ENABLE_FRILLS
3827 case XTerm_locale: 4007 case URxvt_locale:
3828 if (query) 4008 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830 else 4010 else
3831 { 4011 {
3832 set_locale (str); 4012 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 4013 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 4014 init_xlocale ();
3836# endif
3837 } 4015 }
3838 break; 4016 break;
3839#endif
3840 4017
3841#ifdef MENUBAR 4018 case URxvt_view_up:
3842 case XTerm_Menu: 4019 case URxvt_view_down:
3843 if (options & Opt_insecure) 4020 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4021 int lines = atoi (str);
4022
4023 if (lines)
4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
4025 else
4026 scr_erase_savelines ();
4027 }
4028
3845 break; 4029 break;
3846#endif 4030#endif
3847#if 0 4031
3848 case XTerm_dumpscreen: /* no error notices */ 4032#if ENABLE_PERL
3849 { 4033 case URxvt_perl:
3850 int fd; 4034 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) 4035 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 4036 break;
3858#endif 4037#endif
3859 } 4038 }
3860} 4039}
3861/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
3970 } 4149 }
3971 4150
3972 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4152 switch (arg[i])
3974 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 set_option (Opt_intensityStyles, mode);
4157
4158 scr_touch (true);
4159 break;
4160#endif
3975 case 1048: /* alternative cursor save */ 4161 case 1048: /* alternative cursor save */
3976 case 1049: 4162 case 1049:
3977 if (options & Opt_secondaryScreen) 4163 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4164 if (mode == 0)
3979 scr_cursor (RESTORE); 4165 scr_cursor (RESTORE);
3980 else if (mode == 1) 4166 else if (mode == 1)
3981 scr_cursor (SAVE); 4167 scr_cursor (SAVE);
3982 break; 4168 break;
… …
3994 */ 4180 */
3995 PrivMode (1, PrivMode_vt52); 4181 PrivMode (1, PrivMode_vt52);
3996 break; 4182 break;
3997 case 3: /* 80/132 */ 4183 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4184 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4185 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4186 break;
4001 case 4: /* smooth scrolling */ 4187 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4188 set_option (Opt_jumpScroll, !state);
4006 break; 4189 break;
4007 case 5: /* reverse video */ 4190 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4191 scr_rvideo_mode (state);
4009 break; 4192 break;
4010 case 6: /* relative/absolute origins */ 4193 case 6: /* relative/absolute origins */
… …
4051#if 0 4234#if 0
4052 case 1001: 4235 case 1001:
4053 break; /* X11 mouse highlighting */ 4236 break; /* X11 mouse highlighting */
4054#endif 4237#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4238 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4239 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4240 break;
4061 case 1011: /* scroll to bottom on key press */ 4241 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4242 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4243 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4244 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4245 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4246 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4247 scr_erase_screen (2);
4071 scr_change_screen (state); 4248 scr_change_screen (state);
4072 break; 4249 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4250 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4251 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4252 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4253 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4254 scr_erase_screen (2);
4078 break; 4255 break;
4079 default: 4256 default:
4080 break; 4257 break;
… …
4208 scr_color (Color_bg, Color_bg); 4385 scr_color (Color_bg, Color_bg);
4209 break; 4386 break;
4210 4387
4211 //case 50: // not variable spacing 4388 //case 50: // not variable spacing
4212 4389
4213#ifndef NO_BRIGHTCOLOR 4390#if ENABLE_FRILLS
4214 case 90: 4391 case 90:
4215 case 91: /* set bright fg color */ 4392 case 91: /* set bright fg color */
4216 case 92: 4393 case 92:
4217 case 93: 4394 case 93:
4218 case 94: 4395 case 94:
… …
4230 case 106: 4407 case 106:
4231 case 107: 4408 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4409 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4410 break;
4234#endif 4411#endif
4235
4236 } 4412 }
4237 } 4413 }
4238} 4414}
4239/*}}} */ 4415/*}}} */
4240 4416
… …
4264 */ 4440 */
4265void 4441void
4266rxvt_term::tt_printf (const char *fmt,...) 4442rxvt_term::tt_printf (const char *fmt,...)
4267{ 4443{
4268 va_list arg_ptr; 4444 va_list arg_ptr;
4269 unsigned char buf[256]; 4445 char buf[256];
4270 4446
4271 va_start (arg_ptr, fmt); 4447 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4448 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4449 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4450 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 4455 * or generated by us in response to a query ESC sequence.
4280 */ 4456 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 4458
4283void 4459void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4460rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 4461{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return;
4464
4465 if (pty.pty < 0)
4466 return;
4467
4286 if (v_buflen == 0) 4468 if (v_buflen == 0)
4287 { 4469 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4289 4471
4290 if ((unsigned int)written == len) 4472 if ((unsigned int)written == len)
… …
4292 4474
4293 data += written; 4475 data += written;
4294 len -= written; 4476 len -= written;
4295 } 4477 }
4296 4478
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4480
4299 memcpy (v_buffer + v_buflen, data, len); 4481 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4482 v_buflen += len;
4301 4483
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4321 } 4503 }
4322 4504
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4505 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4506 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4508 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4509}
4329 4510
4330/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
4331 4512

Diff Legend

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