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.280 by root, Mon Jan 23 23:33:58 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)
63
64// exception thrown when the command parser runs out of input data
65class out_of_input { } out_of_input;
66 68
67#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
68 70
69#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
118 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 122 XK_Print, 0x2399,
121 123
122 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
124 0, 134 0,
125}; 135};
126 136
127void 137void
128rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
129{ 139{
130 x = Pixel2Col (x); 140 x = Pixel2Col (x);
131 y = Pixel2Row (y); 141 y = Pixel2Row (y);
132 142
133 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 145 return;
136 146
137 for (;;) 147 for (;;)
138 { 148 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
140 152
141 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
142 { 154 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 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; 156 iso14755buf = ISO_14755_54;
146 break; 157 break;
147 } 158 }
148 159
149 x--; 160 x--;
150 } 161 }
151
152} 162}
153#endif
154 163
155#if ENABLE_OVERLAY
156void 164void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 166{
159 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 170 int len;
163 171
172 fname = rxvt_utf8towcs (f->name);
173
164#if ENABLE_COMBINING 174# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
166 { 176 {
167 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
170 } 180 }
171 else 181 else
172#endif 182# endif
173 { 183 {
174 ch2 = ch; 184 ch2 = ch;
175 185
176 alloc = 0; 186 alloc = 0;
177 chr = &ch2; 187 chr = &ch2;
178 len = 1; 188 len = 1;
179 } 189 }
180 190
181 int width = strlen (f->name); 191 char attr[80]; // plenty
182 192
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
184 215
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 217
187 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
188 { 219 {
… …
191 ch = *chr++; 222 ch = *chr++;
192 223
193 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
196#if !UNICODE3 227# if !UNICODE3
197 if (ch >= 0x10000) 228 if (ch >= 0x10000)
198 ch = 0xfffd; 229 ch = 0xfffd;
199#endif 230# endif
200 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
202 } 233 }
203 234
235 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
205 237
238 free (fname);
239
206#if ENABLE_COMBINING 240# if ENABLE_COMBINING
207 if (alloc) 241 if (alloc)
208 delete [] alloc; 242 delete [] alloc;
209#endif 243# endif
210} 244}
211#endif 245#endif
212 246
213void 247void
214rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 265 mb[0] = ch[0];
232 len = 1; 266 len = 1;
233 } 267 }
234 268
235 if (len > 0) 269 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
237 else 271 else
238 scr_bell (); 272 scr_bell ();
239 } 273 }
240 274
241 iso14755buf = 0; 275 iso14755buf = 0;
… …
269 KeySym keysym; 303 KeySym keysym;
270#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
272#endif 306#endif
273 int valid_keysym; 307 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
275 309
276 /* 310 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
279 * 313 *
280 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
281 */ 315 */
282 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
285 319
286 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
287 { 321 {
288 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 331 Status status_return;
298 332
299#if 0 333#if 0
300#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
304 else 338 else
305#endif 339#endif
306#endif 340#endif
307 { 341 {
… …
309 343
310 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
314 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
317 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 354 SET_LOCALE (locale);
319 355
320 if (status_return == XLookupChars 356 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
343 } 379 }
344 else 380 else
345#endif 381#endif
346 { 382 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
349 } 385 }
350 386
351 if (valid_keysym) 387 if (valid_keysym)
352 { 388 {
353#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 391 return;
356#endif 392#endif
357 393
358 if (TermWin.saveLines) 394 if (saveLines)
359 { 395 {
360#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 397 if (!ctrl && !meta)
362#else 398#else
363 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
364#endif 400#endif
365 { 401 {
366 int lnsppg; 402 int lnsppg;
367 403
368#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 406#else
371 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
372#endif 408#endif
373 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
374 { 410 {
375 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
376 return; 412 return;
… …
404 scr_move_to (0, 1); 440 scr_move_to (0, 1);
405 return; 441 return;
406 } 442 }
407 else if (keysym == XK_End) 443 else if (keysym == XK_End)
408 { 444 {
409 scr_move_to (1, 0); 445 scr_move_to (1, 1);
410 return; 446 return;
411 } 447 }
412 } 448 }
413#endif 449#endif
414 } 450 }
… …
425 { 461 {
426 switch (keysym) 462 switch (keysym)
427 { 463 {
428 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
429 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
430 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
431 return; 467 return;
432#if TODO 468#if TODO
433 /* rxvt extras */ 469 /* rxvt extras */
434 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
435 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
513 else 549 else
514 strcpy (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
515 break; 551 break;
516#endif 552#endif
517#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
518 case XK_Delete: 564 case XK_Delete:
519 strcpy (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
520 break; 566 break;
521#endif 567#endif
522 case XK_Tab: 568 case XK_Tab:
… …
625#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
626 case XK_KP_Begin: 672 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
628 break; 674 break;
629 675
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 676#endif
638 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
… …
673 break; 712 break;
674 713
675 case XK_Find: 714 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
677 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
678 case XK_Insert: 728 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
680 break; 730 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 732 case DXK_Remove:
… …
802 { 852 {
803#ifdef META8_OPTION 853#ifdef META8_OPTION
804 /* set 8-bit on */ 854 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
806 { 856 {
807 unsigned char *ch; 857 char *ch;
808 858
809 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 860 *ch |= 0x80;
811 861
812 meta = 0; 862 meta = 0;
… …
814#endif 864#endif
815 /* nil */ ; 865 /* nil */ ;
816 } 866 }
817 } 867 }
818 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
819 if (len <= 0) 872 if (len <= 0)
820 return; /* not mapped */ 873 return; /* not mapped */
821 874
822 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 876 if (view_start)
824 { 877 {
825 TermWin.view_start = 0; 878 view_start = 0;
826 want_refresh = 1; 879 want_refresh = 1;
827 } 880 }
828 881
829 /* 882 /*
830 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 898#ifdef META8_OPTION
846 && meta_char == C0_ESC 899 && meta_char == C0_ESC
847#endif 900#endif
848 ) 901 )
849 { 902 {
850 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
851 tt_write (&ch, 1); 904 tt_write (&ch, 1);
852 } 905 }
853 906
854#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
863#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
865} 918}
866/*}}} */ 919/*}}} */
867 920
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int 922unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 924{
874 unsigned int n, s; 925 unsigned int n, s;
875 926
876 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 965 }
915#endif 966#endif
916 967
917 if (want_refresh) 968 if (want_refresh)
918 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
919 scr_refresh (refresh_type); 1008 scr_refresh ();
920 scrollbar_show (1); 1009 scrollbar_show (1);
921#ifdef USE_XIM 1010#ifdef USE_XIM
922 IMSendSpot (); 1011 IMSendSpot ();
923#endif 1012#endif
924 } 1013 }
… …
927} 1016}
928 1017
929void 1018void
930rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
931{ 1020{
932 SET_R (this); 1021 make_current ();
933 SET_LOCALE (locale);
934 1022
935 display->flush (); 1023 display->flush ();
936 1024
937 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1027}
940 1028
941void 1029void
942rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
943{ 1031{
944 SET_R (this); 1032 make_current ();
945 SET_LOCALE (locale);
946 1033
947 refresh_limit = 1; 1034 refresh_limit = 1;
948 refresh_count = 0; 1035 refresh_count = 0;
949 flush (); 1036 flush ();
950} 1037}
… …
954rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
955{ 1042{
956 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1044 want_refresh = 1;
958 1045
959 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
960} 1047}
961#endif 1048#endif
962 1049
963#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
964void 1051void
… …
978rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
979{ 1066{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 { 1069 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1070 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 } 1072 }
987} 1073}
988#endif 1074#endif
… …
992rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
993{ 1079{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1081 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1083 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1085 }
1001} 1086}
1002#endif 1087#endif
… …
1007{ 1092{
1008 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1096 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1015 1099
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1100 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1102 }
1020} 1103}
1021#endif 1104#endif
1022 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1023bool 1124bool
1024rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1025{ 1126{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1128
1028 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1029 { 1130 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1132 n = 0;
1032 } 1133 }
1033 1134
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1037 1138
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1039 1140
1040 if (n > 0) 1141 if (r > 0)
1041 { 1142 {
1042 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1043 return true; 1144 return true;
1044 } 1145 }
1045 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1046 destroy (); 1158 destroy ();
1159 }
1047 1160
1048 return false; 1161 return false;
1049} 1162}
1050 1163
1051void 1164void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1053{ 1166{
1054 SET_R (this); 1167 make_current ();
1055 SET_LOCALE (locale);
1056 1168
1057 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1171 while (pty_fill ())
1060 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1065} 1177}
1066 1178
1067void 1179void
1068rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1069{ 1181{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1183 recolour_cursor ();
1072 1184
1073#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1186 hidden_pointer = 0;
1075 1187
1076 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1190#endif
1079} 1191}
1080 1192
1081#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1082void 1194void
1083rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1084{ 1196{
1085 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1086 return; 1198 return;
1087 1199
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1201 XFlush (display->display);
1090 1202
1091 hidden_pointer = 1; 1203 hidden_pointer = 1;
1092} 1204}
1093 1205
1094void 1206void
1095rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1096{ 1208{
1097 SET_R (this); 1209 make_current ();
1098 SET_LOCALE (locale);
1099 1210
1100 pointer_blank (); 1211 pointer_blank ();
1101} 1212}
1102#endif 1213#endif
1103 1214
… …
1182 1293
1183/*{{{ process an X event */ 1294/*{{{ process an X event */
1184void 1295void
1185rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1186{ 1297{
1187 SET_R (this); 1298 make_current ();
1188 SET_LOCALE (locale);
1189 1299
1190#if defined(CURSOR_BLINK) 1300 dDisp;
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1301
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
1200 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1202 1306
1203#if defined(POINTER_BLANK) 1307 // for XQueryPointer
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; 1308 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1310 unsigned int unused_mask;
1220 1311
1221 switch (ev.type) 1312 switch (ev.type)
… …
1228 1319
1229 break; 1320 break;
1230 1321
1231 case KeyRelease: 1322 case KeyRelease:
1232 { 1323 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1234 KeySym ks; 1325 KeySym keysym;
1235 1326
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif 1328#endif
1238 1329
1239#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support 1331 // ISO 14755 support
1241 if (iso14755buf) 1332 if (iso14755buf)
… …
1246# endif 1337# endif
1247# if ISO_14755 1338# if ISO_14755
1248 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1249 // first: controls 1340 // first: controls
1250 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1253 { 1344 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1255 commit_iso14755 (); 1346 commit_iso14755 ();
1256 return; // case-break; 1347 goto skip_switch;
1257 } 1348 }
1258 1349
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks) 1351 if (i[0] == keysym)
1261 { 1352 {
1262 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 (); 1354 commit_iso14755 ();
1264 return; // case-break; 1355 goto skip_switch;
1265 } 1356 }
1266 1357
1267 scr_bell (); 1358 scr_bell ();
1268# endif 1359# endif
1269 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1288 else 1379 else
1289 iso14755buf = 0; 1380 iso14755buf = 0;
1290 } 1381 }
1291#endif 1382#endif
1292 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1297 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1298#endif 1393#endif
1299 break; 1394 break;
1300 } 1395 }
1301 1396
… …
1307 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1308 break; 1403 break;
1309 1404
1310 case ClientMessage: 1405 case ClientMessage:
1311 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1313 destroy ();
1314#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink))
1320 { 1408 {
1321 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1322 Atom ActualType; 1410 {
1323 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1324 unsigned char *data; 1412 {
1325 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1326 1414 {
1327 XGetWindowProperty (display->display, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1328 xa[XA_DNDSELECTION], 1416 destroy ();
1329 0L, 1000000L, 1417 }
1330 False, AnyPropertyType, 1418#if ENABLE_EWMH
1331 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1332 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1333 &data); 1422 &ev);
1334 set_string_property (XA_CUT_BUFFER0, data); 1423#endif
1335 XFree (data); 1424 }
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1425 }
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1338 } 1435 }
1339#endif /* OFFIX_DND */
1340 break; 1436 break;
1341 1437
1342 case MappingNotify: 1438 case MappingNotify:
1343 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1344 break; 1440 break;
… …
1367 break; 1463 break;
1368 } 1464 }
1369 break; 1465 break;
1370 1466
1371 case FocusIn: 1467 case FocusIn:
1372 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1373 { 1477 {
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)); 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ;
1441 1480
1442 if (szHint.width != width || szHint.height != height) 1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1482 {
1444 seen_resize = 1; 1483 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1485 }
1447 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1490 if (OPTION (Opt_transparent))
1450 check_our_parents (); 1491 check_our_parents ();
1451#endif 1492#endif
1452 } 1493 }
1453 break; 1494 break;
1454 1495
1455 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459 1501
1460 break; 1502 break;
1461 1503
1462 case SelectionClear: 1504 case SelectionClear:
1463 selection_clear (); 1505 selection_clear ();
… …
1470 1512
1471 case SelectionRequest: 1513 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1473 break; 1515 break;
1474 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1475 case UnmapNotify: 1525 case UnmapNotify:
1476 TermWin.mapped = 0; 1526 mapped = 0;
1477#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1479#endif 1529#endif
1480 break; 1530 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; 1531 break;
1488 1532
1489#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1490 case ReparentNotify: 1534 case ReparentNotify:
1491 rootwin_cb (ev); 1535 rootwin_cb (ev);
1492 break; 1536 break;
1493#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1494 1538
1495 case GraphicsExpose: 1539 case GraphicsExpose:
1496 case Expose: 1540 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1498 { 1542 {
1499 do 1543 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1547
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1549
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1509 1553
1510 scr_refresh (refresh_type); 1554 want_refresh = 1;
1511 } 1555 }
1512 else 1556 else
1513 { 1557 {
1514 XEvent unused_event; 1558 XEvent unused_event;
1515 1559
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1561 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1563 ;
1520 1564
1521 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1522 { 1566 {
1523 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1524 scrollbar_show (0); 1568 scrollbar_show (0);
1525 } 1569 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530 1570
1531#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1534#endif 1574#endif
1535 } 1575 }
1536 break; 1576 break;
1537 1577
1538 case MotionNotify: 1578 case MotionNotify:
1539#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1580 if (hidden_pointer)
1541 pointer_unblank (); 1581 pointer_unblank ();
1542#endif 1582#endif
1543#if MENUBAR
1544 if (isMenuBarWindow (ev.xany.window))
1545 {
1546 menubar_control (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1584 break;
1552 1585
1553 if (ev.xany.window == TermWin.vt) 1586 if (ev.xany.window == vt)
1554 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1592 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1594 ;
1559 1595
1560 XQueryPointer (display->display, TermWin.vt, 1596 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1600 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1577#endif 1613#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1616
1581#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1620 {
1585 int dist; 1621 int dist;
1586 1622
1587 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1635
1600 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1602 { 1638 {
1603 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1605 } 1641 }
1606 else 1642 else
1607 { 1643 {
1608 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1645 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1646 }
1611 1647
1612 scroll_selection_lines = Pixel2Height (dist) 1648 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1650 + 1;
1615 MIN_IT (scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1617 } 1653 }
1618 else 1654 else
1619 { 1655 {
1620 /* we are within the text window, so we 1656 /* we are within the text window, so we
… …
1629#endif 1665#endif
1630 } 1666 }
1631 } 1667 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1669 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1670 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1636 ; 1672 ;
1637 1673
1638 XQueryPointer (display->display, scrollBar.win, 1674 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1678 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1680 scrollbar_size ());
1645 scr_refresh (refresh_type); 1681 want_refresh = 1;
1646 refresh_limit = 0; 1682 refresh_limit = 0;
1647 scrollbar_show (1); 1683 scrollbar_show (1);
1648 } 1684 }
1649 break; 1685 break;
1650 } 1686 }
1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1716}
1717
1718void
1719rxvt_term::focus_in ()
1720{
1721 if (!focus)
1722 {
1723 focus = 1;
1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM
1729 if (Input_Context != NULL)
1730 {
1731 IMSetStatusPosition ();
1732 XSetICFocus (Input_Context);
1733 }
1734#endif
1735#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_focused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1762 iso14755buf = 0;
1763# if ENABLE_OVERLAY
1764 scr_overlay_off ();
1765# endif
1766 }
1767#endif
1768#if USE_XIM
1769 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context);
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.stop ();
1775 hidden_cursor = 0;
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_unfocused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1651} 1785}
1652 1786
1653#if TRANSPARENT 1787#if TRANSPARENT
1654void 1788void
1655rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1790{
1657 SET_R (this); 1791 make_current ();
1658 SET_LOCALE (locale);
1659 1792
1660 switch (ev.type) 1793 switch (ev.type)
1661 { 1794 {
1662 case PropertyNotify: 1795 case PropertyNotify:
1663 /* 1796 /*
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1802 return;
1670 1803
1671 /* FALLTHROUGH */ 1804 /* FALLTHROUGH */
1672 case ReparentNotify: 1805 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1675 break; 1808 break;
1676 } 1809 }
1677} 1810}
1678#endif 1811#endif
… …
1681rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1682{ 1815{
1683 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1684 1817
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1686 if (!bypass_keystate) 1820 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1822
1689 /* 1823 /*
1690 * VT window processing of button press 1824 * VT window processing of button press
1691 */ 1825 */
1692 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1693 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1694#if ISO_14755 1831#if ISO_14755
1695 // 5.4 1832 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1834 {
1698 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1847#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1848 if (ev.button == MEvent.button && clickintime)
1712 { 1849 {
1713 /* same button, within alloted time */ 1850 /* same button, within alloted time */
1714 MEvent.clicks++; 1851 MEvent.clicks++;
1852
1715 if (MEvent.clicks > 1) 1853 if (MEvent.clicks > 1)
1716 { 1854 {
1717 /* only report double clicks */ 1855 /* only report double clicks */
1718 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1719 mouse_report (ev); 1857 mouse_report (ev);
… …
1751#else 1889#else
1752 selection.rect = false; 1890 selection.rect = false;
1753#endif 1891#endif
1754 1892
1755 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1895 {
1758 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1760 else 1898 else
1761 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
… …
1902 case Button3: 2040 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1904 { 2042 {
1905 if (scrollbar_above_slider (ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1908# else 2046# else
1909 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1910# endif 2048# endif
1911 else if (scrollbar_below_slider (ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1914# else 2052# else
1915 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1916# endif 2054# endif
1917 else 2055 else
1918 scrollBar.setMotion (); 2056 scrollBar.setMotion ();
1919 } 2057 }
1920 else 2058 else
1921 { 2059 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2061 (nrow
1924 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2063 / scrollbar_size ()));
1926 } 2064 }
1927 2065
1928 break; 2066 break;
1929 } 2067 }
1930 } 2068 }
2069
1931 return; 2070 return;
1932 } 2071 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2072}
1941 2073
1942void 2074void
1943rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
1944{ 2076{
… …
1950 2082
1951 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
1952 { 2084 {
1953 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
1954 scrollbar_show (0); 2086 scrollbar_show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2087 }
1959 2088
1960#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
1963#endif 2092#endif
1964 2093
1965 if (ev.window == TermWin.vt) 2094 if (ev.window == vt)
1966 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
1967#if ISO_14755 2099#if ISO_14755
1968 // 5.4 2100 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2102 return;
1971#endif 2103#endif
2104
1972 if (reportmode) 2105 if (reportmode)
1973 { 2106 {
1974 /* mouse report from vt window */ 2107 /* mouse report from vt window */
1975 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
1976 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2006 { 2139 {
2007 case Button1: 2140 case Button1:
2008 case Button3: 2141 case Button3:
2009 selection_make (ev.time); 2142 selection_make (ev.time);
2010 break; 2143 break;
2144
2011 case Button2: 2145 case Button2:
2012 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2013 break; 2148 break;
2149
2014#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2015 case Button4: 2151 case Button4:
2016 case Button5: 2152 case Button5:
2017 { 2153 {
2018 int i; 2154 int i;
… …
2020 2156
2021 v = ev.button == Button4 ? UP : DN; 2157 v = ev.button == Button4 ? UP : DN;
2022 2158
2023 if (ev.state & ShiftMask) 2159 if (ev.state & ShiftMask)
2024 i = 1; 2160 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2161 else if (OPTION (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2162 i = nrow - 1;
2027 else 2163 else
2028 i = 5; 2164 i = 5;
2029 2165
2030# ifdef MOUSE_SLIP_WHEELING 2166# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2167 if (ev.state & ControlMask)
2032 { 2168 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2170 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; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2172
2037 if (slip_wheel_ev.at < NOW) 2173 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2175
2040 slip_wheel_ev.start (); 2176 slip_wheel_ev.start ();
2041 } 2177 }
2042 else 2178 else
2043 { 2179 {
2044# endif 2180# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2181 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2182 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 2183# ifdef MOUSE_SLIP_WHEELING
2058 } 2184 }
2059#endif 2185# endif
2060 } 2186 }
2061 break; 2187 break;
2062#endif 2188#endif
2063 } 2189 }
2064 } 2190 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2191}
2070 2192
2071#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2072#if TINTING 2194#if TINTING
2073/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2206 int i;
2085 2207
2086 Visual* visual = display->visual; 2208 Visual *visual = display->visual;
2087 2209
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2211
2090 /* for convenience */ 2212 /* for convenience */
2091 mask_r = visual->red_mask; 2213 mask_r = visual->red_mask;
… …
2312 Atom atype; 2434 Atom atype;
2313 unsigned char *prop = NULL; 2435 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2436 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2437 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2317 2440
2318 pchanged = 0; 2441 pchanged = 0;
2319 2442
2320 if (!(options & Opt_transparent)) 2443 if (!OPTION (Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2444 return pchanged; /* Don't try any more */
2322 2445
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2447 rootdepth = wrootattr.depth;
2325 2448
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2449 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2450
2328 if (rootdepth != wattr.depth) 2451 if (rootdepth != wattr.depth)
2329 { 2452 {
2330 if (am_transparent) 2453 if (am_transparent)
2331 { 2454 {
2332 pchanged = 1; 2455 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2457 am_transparent = am_pixmap_trans = 0;
2335 } 2458 }
2336 2459
2337 return pchanged; /* Don't try any more */ 2460 return pchanged; /* Don't try any more */
2338 } 2461 }
2339 2462
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2463 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2464 XSync (disp, False);
2342 2465
2343 /* 2466 /*
2344 * Make the frame window set by the window manager have 2467 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2468 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2469 * windows for each client, so we have to take care about that.
2347 */ 2470 */
2348 i = (xa[XA_XROOTPMAP_ID] 2471 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2474 &nitems, &bytes_after, &prop) == Success);
2352 2475
2353 if (!i || prop == NULL) 2476 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2477 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2480 &nitems, &bytes_after, &prop) == Success);
2358 2481
2359 if (!i || prop == NULL 2482 if (!i || prop == NULL
2360#if TINTING 2483#if TINTING
… …
2379 Window cr; 2502 Window cr;
2380 XImage *image; 2503 XImage *image;
2381 GC gc; 2504 GC gc;
2382 XGCValues gcvalue; 2505 XGCValues gcvalue;
2383 2506
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2507 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2508 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2509 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2510 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2511 nx = ny = 0;
2389 2512
… …
2399 nh += sy; 2522 nh += sy;
2400 ny = -sy; 2523 ny = -sy;
2401 sy = 0; 2524 sy = 0;
2402 } 2525 }
2403 2526
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2529
2407 XSync (display->display, False); 2530 XSync (disp, False);
2408 allowedxerror = -1; 2531 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2533
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2535 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2536 allowedxerror = 0;
2414 2537
2415 if (image == NULL) 2538 if (image == NULL)
2416 { 2539 {
2417 if (am_transparent && am_pixmap_trans) 2540 if (am_transparent && am_pixmap_trans)
2418 { 2541 {
2419 pchanged = 1; 2542 pchanged = 1;
2420 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2421 { 2544 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2545 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2546 pixmap = None;
2424 } 2547 }
2425 } 2548 }
2426 2549
2427 am_pixmap_trans = 0; 2550 am_pixmap_trans = 0;
2428 } 2551 }
2429 else 2552 else
2430 { 2553 {
2431 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2555 XFreePixmap (disp, pixmap);
2433 2556
2434#if TINTING 2557#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2558 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2559 {
2437 unsigned short rm, gm, bm; 2560 unsigned short rm, gm, bm;
… …
2441 2564
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2565 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2566 }
2444#endif 2567#endif
2445 2568
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2569 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2570 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2573 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2574 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2575 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2577 XClearWindow (disp, parent[0]);
2455 2578
2456 if (!am_transparent || !am_pixmap_trans) 2579 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2580 pchanged = 1;
2458 2581
2459 am_transparent = am_pixmap_trans = 1; 2582 am_transparent = am_pixmap_trans = 1;
2460 } 2583 }
2461 } 2584 }
2462 2585
2463 if (am_pixmap_trans) 2586 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2588 else
2466 { 2589 {
2467 unsigned int n; 2590 unsigned int n;
2468 /* 2591 /*
2469 * InheritPixmap transparency 2592 * InheritPixmap transparency
2470 */ 2593 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2595 {
2473 oldp = TermWin.parent[i]; 2596 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2597 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2598 &parent[i], &list, &n);
2476 XFree (list); 2599 XFree (list);
2477 2600
2478 if (TermWin.parent[i] == display->root) 2601 if (parent[i] == display->root)
2479 { 2602 {
2480 if (oldp != None) 2603 if (oldp != None)
2481 pchanged = 1; 2604 pchanged = 1;
2482 2605
2483 break; 2606 break;
2484 } 2607 }
2485 2608
2486 if (oldp != TermWin.parent[i]) 2609 if (oldp != parent[i])
2487 pchanged = 1; 2610 pchanged = 1;
2488 } 2611 }
2489 2612
2490 n = 0; 2613 n = 0;
2491 2614
2492 if (pchanged) 2615 if (pchanged)
2493 { 2616 {
2494 for (; n < (unsigned int)i; n++) 2617 for (; n < (unsigned int)i; n++)
2495 { 2618 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2619 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2621 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2623 break;
2501 } 2624 }
2502 } 2625 }
2503 } 2626 }
2504 2627
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2629 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2632 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2511 } 2634 }
2512 else 2635 else
2513 { 2636 {
2514#if WAIT_FOR_WM
2515 /* wait (an arbitrary period) for the WM to do its thing
2516 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1);
2518#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2520 { 2638 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2523 } 2641 }
2524 2642
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2644 am_transparent = 1;
2527 } 2645 }
2528 2646
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2648 parent[i] = None;
2531 } 2649 }
2532 2650
2533 if (scrollBar.win) 2651 if (scrollBar.win)
2534 { 2652 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2654 scrollBar.setIdle ();
2537 scrollbar_show (0); 2655 scrollbar_show (0);
2538 } 2656 }
2539 2657
2540 if (am_transparent) 2658 if (am_transparent)
… …
2552 2670
2553bool 2671bool
2554rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2555{ 2673{
2556 bool flag = false; 2674 bool flag = false;
2557 unicode_t ch = NOCHAR; 2675 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2559 2677
2560 for (;;) 2678 for (;;)
2561 { 2679 {
2562 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2563 { 2681 {
2564 seq_begin = cmdbuf_ptr; 2682 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2683 ch = next_char ();
2566 }
2567 2684
2568 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR)
2569 break; 2686 break;
2687 }
2570 2688
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2690 {
2573 if (!seen_input) 2691 if (!seen_input)
2574 { 2692 {
… …
2578 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2700 // resized.
2583 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2585 } 2703 }
2586 2704
2587 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2706 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2707 bool refreshnow = false;
2590 int nlines = 0; 2708 int nlines = 0;
2591 unicode_t *str = buf; 2709 wchar_t *str = buf;
2710 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2711
2593 for (;;) 2712 for (;;)
2594 { 2713 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2715 break;
2597 2716
2598 *str++ = ch; 2717 *str++ = ch;
2599 2718
2600 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2601 { 2720 {
2721 if (ch == C0_LF)
2602 nlines++; 2722 nlines++;
2723
2603 refresh_count++; 2724 refresh_count++;
2604 2725
2605 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2728 {
2608 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2609 ch = NOCHAR; 2731 ch = NOCHAR;
2610 break; 2732 break;
2611 } 2733 }
2612 2734
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2615 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2740 scr_add_lines (buf, str - buf, nlines);
2741
2617 nlines = 0; 2742 nlines = 0;
2618 str = buf; 2743 str = buf;
2744 eol = str + min (ncol, UBUFSIZ);
2619 } 2745 }
2620 }
2621 2746
2622 if (str >= buf + UBUFSIZ) 2747 if (str >= eol)
2623 { 2748 {
2749 if (eol >= buf + UBUFSIZ)
2750 {
2624 ch = NOCHAR; 2751 ch = NOCHAR;
2625 break; 2752 break;
2753 }
2754 else
2755 eol = min (eol + ncol, buf + UBUFSIZ);
2756 }
2757
2626 } 2758 }
2627 2759
2628 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2761 ch = next_char ();
2630 } 2762 }
2631 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2766 scr_add_lines (buf, str - buf, nlines);
2633 2767
2634 /* 2768 /*
2635 * If there have been a lot of new lines, then update the screen 2769 * 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. 2770 * 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 2771 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2772 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2773 */
2640 if (refreshnow) 2774 if (refreshnow)
2641 { 2775 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2777 refresh_limit++;
2644 else 2778 else
2645 { 2779 {
2646 flag = true; 2780 flag = true;
2647 scr_refresh (refresh_type); 2781 scr_refresh ();
2782 want_refresh = 1;
2648 } 2783 }
2649 } 2784 }
2650 2785
2651 } 2786 }
2652 else 2787 else
… …
2667 } 2802 }
2668 2803
2669 return flag; 2804 return flag;
2670} 2805}
2671 2806
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 2807// read the next character
2682unicode_t 2808wchar_t
2683rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2684{ 2810{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2812 {
2687 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2815 return *cmdbuf_ptr++;
2690 2816
2691 wchar_t wc; 2817 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2819
2694 if (len == (size_t)-2) 2820 if (len == (size_t)-2)
2695 { 2821 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2822 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2823 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2824 break;
2699 } 2825 }
2700 2826
2701 if (len == (size_t)-1) 2827 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2829
2704 // assume wchar == unicode 2830 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2831 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2832 return wc & UNICODE_MASK;
2707 } 2833 }
2708 2834
2709 return NOCHAR; 2835 return NOCHAR;
2710} 2836}
2837
2838// read the next octet
2839uint32_t
2840rxvt_term::next_octet () NOTHROW
2841{
2842 return cmdbuf_ptr < cmdbuf_endp
2843 ? (unsigned char)*cmdbuf_ptr++
2844 : NOCHAR;
2845}
2846
2847static class out_of_input out_of_input;
2711 2848
2712/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2713/* 2850/*
2714 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2715 * to the command. 2852 * to the command.
2716 */ 2853 */
2717unicode_t 2854wchar_t
2718rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2719{ 2856{
2720 unicode_t c = next_char (); 2857 wchar_t c = next_char ();
2721 2858
2722 if (c == NOCHAR) 2859 if (c == NOCHAR)
2723 throw out_of_input; 2860 throw out_of_input;
2724 2861
2725 return c; 2862 return c;
2726} 2863}
2727 2864
2728unicode_t 2865uint32_t
2729rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2730{ 2867{
2731 unicode_t c = next_octet (); 2868 uint32_t c = next_octet ();
2732 2869
2733 if (c == NOCHAR) 2870 if (c == NOCHAR)
2734 throw out_of_input; 2871 throw out_of_input;
2735 2872
2736 return c; 2873 return c;
… …
2836 case C0_ESC: 2973 case C0_ESC:
2837 process_escape_seq (); 2974 process_escape_seq ();
2838 break; 2975 break;
2839 case C0_ENQ: /* terminal Status */ 2976 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2977 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2978 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2979 else
2844 tt_write ((unsigned char *)VT100_ANS, 2980 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2981 break;
2847 case C0_BEL: /* bell */ 2982 case C0_BEL: /* bell */
2848 scr_bell (); 2983 scr_bell ();
2849 break; 2984 break;
2850 case C0_BS: /* backspace */ 2985 case C0_BS: /* backspace */
… …
3005 break; 3140 break;
3006 3141
3007 /* 8.3.87: NEXT LINE */ 3142 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 3143 case C1_NEL: /* ESC E */
3009 { 3144 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 3145 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 3146 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 3147 }
3013 break; 3148 break;
3014 3149
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 3150 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 3151 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 3173 process_dcs_seq ();
3039 break; 3174 break;
3040 3175
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 3177 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 3179 break; /* steal obsolete ESC [ c */
3046 3180
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 3182 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 3183 process_csi_seq ();
… …
3174 { 3308 {
3175 switch (priv) 3309 switch (priv)
3176 { 3310 {
3177 case '>': 3311 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3312 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3314 break;
3181 case '?': 3315 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3317 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3318 break;
… …
3289 3423
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3424 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3425 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3426 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3427 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3428 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3429 break;
3296 3430
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3431 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3432 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3433 break;
3301 3434
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3435 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3436 process_sgr_mode (nargs, arg);
3304 break; 3437 break;
… …
3311 break; 3444 break;
3312 case 6: /* CPR requested */ 3445 case 6: /* CPR requested */
3313 scr_report_position (); 3446 scr_report_position ();
3314 break; 3447 break;
3315 case 7: /* unofficial extension */ 3448 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3449 if (OPTION (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3450 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3451 break;
3319 case 8: /* unofficial extension */ 3452 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3454 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3546rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3547{
3415 int x, y; 3548 int x, y;
3416 XWindowAttributes wattr; 3549 XWindowAttributes wattr;
3417 Window wdummy; 3550 Window wdummy;
3551 dDisp;
3418 3552
3419 if (nargs == 0) 3553 if (nargs == 0)
3420 return; 3554 return;
3421 3555
3422 switch (args[0]) 3556 switch (args[0])
3423 { 3557 {
3424 /* 3558 /*
3425 * commands 3559 * commands
3426 */ 3560 */
3427 case 1: /* deiconify window */ 3561 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3562 XMapWindow (disp, parent[0]);
3429 break; 3563 break;
3430 case 2: /* iconify window */ 3564 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3565 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3566 break;
3434 case 3: /* set position (pixels) */ 3567 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3568 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3569 break;
3437 case 4: /* set size (pixels) */ 3570 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3572 break;
3440 case 5: /* raise window */ 3573 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3574 XRaiseWindow (disp, parent[0]);
3442 break; 3575 break;
3443 case 6: /* lower window */ 3576 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3577 XLowerWindow (disp, parent[0]);
3445 break; 3578 break;
3446 case 7: /* refresh window */ 3579 case 7: /* refresh window */
3447 scr_touch (true); 3580 scr_touch (true);
3448 break; 3581 break;
3449 case 8: /* set size (chars) */ 3582 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3583 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3452 break; 3585 break;
3453 3586
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3587 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3588 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3589 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3590 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3591 (unsigned int) (args[1] * fheight));
3459 break; 3592 break;
3460 3593
3461 3594
3462 /* 3595 /*
3463 * reports - some output format copied from XTerm 3596 * reports - some output format copied from XTerm
3464 */ 3597 */
3465 case 11: /* report window state */ 3598 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3601 break;
3469 case 13: /* report window position */ 3602 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3604 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3605 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3606 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3607 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3608 break;
3476 case 14: /* report window size (pixels) */ 3609 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3610 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3612 break;
3480 case 18: /* report text area size (chars) */ 3613 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3615 break;
3483 case 19: /* report window size (chars) */ 3616 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3617 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3618 break;
3486 case 20: /* report icon label */ 3619 case 20: /* report icon label */
3487 { 3620 {
3488 char *s; 3621 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3622 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3624 XFree (s);
3492 } 3625 }
3493 break; 3626 break;
3494 case 21: /* report window title */ 3627 case 21: /* report window title */
3495 { 3628 {
3496 char *s; 3629 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3630 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3632 XFree (s);
3500 } 3633 }
3501 break; 3634 break;
3502 } 3635 }
3503} 3636}
… …
3506/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
3507/* 3640/*
3508 * get input up until STRING TERMINATOR (or BEL) 3641 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3642 * ends_how is terminator used. returned input must be free()'d
3510 */ 3643 */
3511unsigned char * 3644char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3645rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3646{
3514 unicode_t ch; 3647 unicode_t ch;
3515 bool seen_esc = false; 3648 bool seen_esc = false;
3516 unsigned int n = 0; 3649 unsigned int n = 0;
… …
3535 else if (ch < 0x20) 3668 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3669 return NULL; /* other control character - exit */
3537 3670
3538 seen_esc = false; 3671 seen_esc = false;
3539 3672
3540 if (n >= sizeof (string) - 1) 3673 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3674 // stop at some sane length
3542 return NULL; 3675 return NULL;
3543 3676
3544 if (ch == C0_SYN) 3677 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3678 string[n++] = cmd_get8 ();
… …
3549 3682
3550 string[n++] = '\0'; 3683 string[n++] = '\0';
3551 3684
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3685 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3686
3554 return (unsigned char *)rxvt_wcstombs (string); 3687 return rxvt_wcstombs (string);
3555} 3688}
3556 3689
3557/*----------------------------------------------------------------------*/ 3690/*----------------------------------------------------------------------*/
3558/* 3691/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3692 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3693 */
3561void 3694void
3562rxvt_term::process_dcs_seq () 3695rxvt_term::process_dcs_seq ()
3563{ 3696{
3564 unsigned char *s; 3697 char *s;
3565 unicode_t eh; 3698 unicode_t eh;
3566 3699
3567 /* 3700 /*
3568 * Not handled yet 3701 * Not handled yet
3569 */ 3702 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3721 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3722 arg = arg * 10 + (ch - '0');
3590 3723
3591 if (ch == ';') 3724 if (ch == ';')
3592 { 3725 {
3593 unsigned char *s = get_to_st (eh); 3726 char *s = get_to_st (eh);
3594 3727
3595 if (s) 3728 if (s)
3596 { 3729 {
3597 process_xterm_seq (arg, (char *)s, eh); 3730 process_xterm_seq (arg, s, eh);
3598 free (s); 3731 free (s);
3599 } 3732 }
3600 } 3733 }
3601} 3734}
3602 3735
3603void 3736void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3738{
3606 if (str[0] == '?' && !str[1]) 3739 if (str[0] == '?' && !str[1])
3607 { 3740 {
3608 unsigned short r, g, b; 3741 unsigned short r, g, b;
3609 pix_colors_focused[color].get (display, r, g, b); 3742 pix_colors_focused[color].get (display, r, g, b);
… …
3613 set_window_color (color, str); 3746 set_window_color (color, str);
3614} 3747}
3615 3748
3616/* 3749/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * 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 */ 3751 */
3641void 3752void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3754{
3644 int changed = 0;
3645 int color; 3755 int color;
3646 char *buf, *name; 3756 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3758 int saveop = op;
3759 dDisp;
3649 3760
3650 assert (str != NULL); 3761 assert (str != NULL);
3651 switch (op) 3762 switch (op)
3652 { 3763 {
3653 case XTerm_name: 3764 case XTerm_name:
… …
3669 unsigned long bytes_after; 3780 unsigned long bytes_after;
3670 unsigned char *value = 0; 3781 unsigned char *value = 0;
3671 const char *str = ""; 3782 const char *str = "";
3672 3783
3673 if (prop 3784 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3785 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3786 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3787 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3788 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3789 && actual_type != None
3679 && actual_format == 8) 3790 && actual_format == 8)
… …
3691 { 3802 {
3692 *eq = 0; 3803 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3804 set_utf8_property (display->atom (str), eq + 1);
3694 } 3805 }
3695 else 3806 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3807 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3808 display->atom (str));
3698 } 3809 }
3699 break; 3810 break;
3700 3811
3701 case XTerm_Color: 3812 case XTerm_Color:
… …
3703 { 3814 {
3704 if ((name = strchr (buf, ';')) == NULL) 3815 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3816 break;
3706 3817
3707 *name++ = '\0'; 3818 *name++ = '\0';
3708 color = atoi (buf); 3819 color = atoi (buf) + minCOLOR;
3709 3820
3710 if (color < 0 || color >= TOTAL_COLORS) 3821 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3822 break;
3712 3823
3713 if ((buf = strchr (name, ';')) != NULL) 3824 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3825 *buf++ = '\0';
3715 3826
3716 if (name[0] == '?' && !name[1]) 3827 if (name[0] == '?' && !name[1])
3717 { 3828 {
3718 unsigned short r, g, b; 3829 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3830 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); 3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 } 3832 }
3722 else 3833 else
3723 set_window_color (color + minCOLOR, name); 3834 set_window_color (color, name);
3724 } 3835 }
3725 break; 3836 break;
3726 case XTerm_Color00: 3837 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3838 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3728 break; 3839 break;
3729 case XTerm_Color01: 3840 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3841 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3731 break; 3842 break;
3732#ifndef NO_CURSORCOLOR 3843#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3844 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3735 break; 3846 break;
… …
3739 break; 3850 break;
3740 case XTerm_Color_pointer_bg: 3851 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3742 break; 3853 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3854#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: 3855 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3857 break;
3858 case Rxvt_Color_BD:
3859 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp);
3861 break;
3862 case Rxvt_Color_UL:
3863 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp);
3865 break;
3866 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3868 break;
3756#endif 3869#endif
3757#if TRANSPARENT && TINTING 3870#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3871 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3873 check_our_parents ();
3761 if (am_transparent) 3874 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3763 break; 3876 break;
3764#endif 3877#endif
3765 3878
3766 case XTerm_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3767 if (*str != ';') 3881 if (*str != ';')
3768 { 3882 {
3769#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3886 scr_touch (true);
3887#endif
3774 } 3888 }
3889
3890 int changed = 0;
3891
3775 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3776 { 3893 {
3777 str++; 3894 str++;
3778#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3780#endif 3897#endif
3781
3782 } 3898 }
3899
3783 if (changed) 3900 if (changed)
3784 { 3901 {
3785#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3903 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3904 scr_touch (true);
3905#endif
3789 } 3906 }
3907 }
3790 break; 3908 break;
3791 3909
3792 case XTerm_restoreFG: 3910 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3794 break; 3912 break;
3795 case XTerm_restoreBG: 3913 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3914 set_window_color (Color_bg, str);
3797 break; 3915 break;
3798 3916
3799 case XTerm_logfile: 3917 case XTerm_logfile:
3800 // TODO, when secure mode? 3918 // TODO, when secure mode?
3801 break; 3919 break;
3802 3920
3921#if 0
3922 case Rxvt_dumpscreen: /* no error notices */
3923 {
3924 int fd;
3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3926 {
3927 scr_dump (fd);
3928 close (fd);
3929 }
3930 }
3931 break;
3932#endif
3803 case XTerm_font: 3933 case XTerm_font:
3804 op = URxvt_font; 3934 op = URxvt_font;
3805 case URxvt_font: 3935 case URxvt_font:
3806#if ENABLE_STYLES 3936#if ENABLE_STYLES
3807 case URxvt_boldFont: 3937 case URxvt_boldFont:
3808 case URxvt_italicFont: 3938 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3939 case URxvt_boldItalicFont:
3810#endif 3940#endif
3811 if (query) 3941 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3942 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3944 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3945 resp);
3816 else 3946 else
3817 { 3947 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3948 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3949
… …
3822 set_fonts (); 3952 set_fonts ();
3823 } 3953 }
3824 break; 3954 break;
3825 3955
3826#if ENABLE_FRILLS 3956#if ENABLE_FRILLS
3827 case XTerm_locale: 3957 case URxvt_locale:
3828 if (query) 3958 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830 else 3960 else
3831 { 3961 {
3832 set_locale (str); 3962 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3964 init_xlocale ();
3836# endif
3837 } 3965 }
3838 break; 3966 break;
3839#endif
3840 3967
3841#ifdef MENUBAR 3968 case URxvt_view_up:
3842 case XTerm_Menu: 3969 case URxvt_view_down:
3843 if (options & Opt_insecure) 3970 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3971 int lines = atoi (str);
3972
3973 if (lines)
3974 scr_page (op == URxvt_view_up ? UP : DN, lines);
3975 else
3976 scr_erase_savelines ();
3977 }
3978
3845 break; 3979 break;
3846#endif 3980#endif
3847#if 0 3981
3848 case XTerm_dumpscreen: /* no error notices */ 3982#if ENABLE_PERL
3849 { 3983 case URxvt_perl:
3850 int fd; 3984 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) 3985 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3986 break;
3858#endif 3987#endif
3859 } 3988 }
3860} 3989}
3861/*----------------------------------------------------------------------*/ 3990/*----------------------------------------------------------------------*/
… …
3892 return state; 4021 return state;
3893} 4022}
3894 4023
3895/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
3896void 4025void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3898{ 4027{
3899 unsigned int i, j; 4028 unsigned int i, j;
3900 int state; 4029 int state;
3901 4030
3902 static const struct 4031 static const struct
… …
3913 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 4047 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 4051#endif
… …
3970 } 4096 }
3971 4097
3972 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4099 switch (arg[i])
3974 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 set_option (Opt_intensityStyles, mode);
4104
4105 scr_touch (true);
4106 break;
4107#endif
3975 case 1048: /* alternative cursor save */ 4108 case 1048: /* alternative cursor save */
3976 case 1049: 4109 case 1049:
3977 if (options & Opt_secondaryScreen) 4110 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4111 if (mode == 0)
3979 scr_cursor (RESTORE); 4112 scr_cursor (RESTORE);
3980 else if (mode == 1) 4113 else if (mode == 1)
3981 scr_cursor (SAVE); 4114 scr_cursor (SAVE);
3982 break; 4115 break;
… …
3994 */ 4127 */
3995 PrivMode (1, PrivMode_vt52); 4128 PrivMode (1, PrivMode_vt52);
3996 break; 4129 break;
3997 case 3: /* 80/132 */ 4130 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4131 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4132 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4133 break;
4001 case 4: /* smooth scrolling */ 4134 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4135 set_option (Opt_jumpScroll, !state);
4006 break; 4136 break;
4007 case 5: /* reverse video */ 4137 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4138 scr_rvideo_mode (state);
4009 break; 4139 break;
4010 case 6: /* relative/absolute origins */ 4140 case 6: /* relative/absolute origins */
… …
4016 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4020 break; 4150 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
4029 case scrollBar_esc: 4152 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4031 { 4154 {
4032 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4051#if 0 4174#if 0
4052 case 1001: 4175 case 1001:
4053 break; /* X11 mouse highlighting */ 4176 break; /* X11 mouse highlighting */
4054#endif 4177#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4178 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4179 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4180 break;
4061 case 1011: /* scroll to bottom on key press */ 4181 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4182 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4183 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4184 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4187 scr_erase_screen (2);
4071 scr_change_screen (state); 4188 scr_change_screen (state);
4072 break; 4189 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4190 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4191 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4192 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4193 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4194 scr_erase_screen (2);
4078 break; 4195 break;
4079 default: 4196 default:
4080 break; 4197 break;
… …
4208 scr_color (Color_bg, Color_bg); 4325 scr_color (Color_bg, Color_bg);
4209 break; 4326 break;
4210 4327
4211 //case 50: // not variable spacing 4328 //case 50: // not variable spacing
4212 4329
4213#ifndef NO_BRIGHTCOLOR 4330#if ENABLE_FRILLS
4214 case 90: 4331 case 90:
4215 case 91: /* set bright fg color */ 4332 case 91: /* set bright fg color */
4216 case 92: 4333 case 92:
4217 case 93: 4334 case 93:
4218 case 94: 4335 case 94:
… …
4230 case 106: 4347 case 106:
4231 case 107: 4348 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4349 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4350 break;
4234#endif 4351#endif
4235
4236 } 4352 }
4237 } 4353 }
4238} 4354}
4239/*}}} */ 4355/*}}} */
4240 4356
… …
4264 */ 4380 */
4265void 4381void
4266rxvt_term::tt_printf (const char *fmt,...) 4382rxvt_term::tt_printf (const char *fmt,...)
4267{ 4383{
4268 va_list arg_ptr; 4384 va_list arg_ptr;
4269 unsigned char buf[256]; 4385 char buf[256];
4270 4386
4271 va_start (arg_ptr, fmt); 4387 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4388 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4389 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4390 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 4395 * or generated by us in response to a query ESC sequence.
4280 */ 4396 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4397const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 4398
4283void 4399void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 4401{
4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4403 return;
4404
4405 if (pty->pty < 0)
4406 return;
4407
4286 if (v_buflen == 0) 4408 if (v_buflen == 0)
4287 { 4409 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4289 4411
4290 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4291 return; 4413 return;
4292 4414
4293 data += written; 4415 data += written;
4294 len -= written; 4416 len -= written;
4295 } 4417 }
4296 4418
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4420
4299 memcpy (v_buffer + v_buflen, data, len); 4421 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4422 v_buflen += len;
4301 4423
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4303} 4425}
4304 4426
4305void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4306{ 4428{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308 4430
4309 if (written > 0) 4431 if (written > 0)
4310 { 4432 {
4311 v_buflen -= written; 4433 v_buflen -= written;
4312 4434
… …
4321 } 4443 }
4322 4444
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4445 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4446 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4448 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4449}
4329 4450
4330/*----------------------- end-of-file (C source) -----------------------*/ 4451/*----------------------- end-of-file (C source) -----------------------*/
4331 4452

Diff Legend

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