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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.250 by root, Sun Jan 8 06:35:23 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
53#include <cwchar> 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <csignal> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
114 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 125 XK_Print, 0x2399,
117 126
118 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
120 0, 137 0,
121}; 138};
122 139
123void 140void
124rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
125{ 142{
126 x = Pixel2Col (x); 143 x = Pixel2Col (x);
127 y = Pixel2Row (y); 144 y = Pixel2Row (y);
128 145
129 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 148 return;
132 149
133 for (;;) 150 for (;;)
134 { 151 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
136 155
137 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
138 { 157 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
142 break; 160 break;
143 } 161 }
144 162
145 x--; 163 x--;
146 } 164 }
147
148} 165}
149#endif
150 166
151#if ENABLE_OVERLAY
152void 167void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 169{
155 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 173 int len;
159 174
175 fname = rxvt_utf8towcs (f->name);
176
160#if ENABLE_COMBINING 177# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
162 { 179 {
163 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
166 } 183 }
167 else 184 else
168#endif 185# endif
169 { 186 {
170 ch2 = ch; 187 ch2 = ch;
171 188
172 alloc = 0; 189 alloc = 0;
173 chr = &ch2; 190 chr = &ch2;
174 len = 1; 191 len = 1;
175 } 192 }
176 193
177 int width = strlen (f->name); 194 char attr[80]; // plenty
178 195
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
180 218
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 220
183 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
184 { 222 {
… …
187 ch = *chr++; 225 ch = *chr++;
188 226
189 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
192#if !UNICODE3 230# if !UNICODE3
193 if (ch >= 0x10000) 231 if (ch >= 0x10000)
194 ch = 0xfffd; 232 ch = 0xfffd;
195#endif 233# endif
196 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
198 } 236 }
199 237
238 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
201 240
241 free (fname);
242
202#if ENABLE_COMBINING 243# if ENABLE_COMBINING
203 if (alloc) 244 if (alloc)
204 delete [] alloc; 245 delete [] alloc;
205#endif 246# endif
206} 247}
207#endif 248#endif
208 249
209void 250void
210rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 268 mb[0] = ch[0];
228 len = 1; 269 len = 1;
229 } 270 }
230 271
231 if (len > 0) 272 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
233 else 274 else
234 scr_bell (); 275 scr_bell ();
235 } 276 }
236 277
237 iso14755buf = 0; 278 iso14755buf = 0;
… …
265 KeySym keysym; 306 KeySym keysym;
266#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
268#endif 309#endif
269 int valid_keysym; 310 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
271 312
272 /* 313 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
275 * 316 *
276 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
277 */ 318 */
278 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
281 322
282 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
283 { 324 {
284 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 334 Status status_return;
294 335
295#if 0 336#if 0
296#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
300 else 341 else
301#endif 342#endif
302#endif 343#endif
303 { 344 {
… …
305 346
306 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
310 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
313 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 357 SET_LOCALE (locale);
315 358
316 if (status_return == XLookupChars 359 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
339 } 382 }
340 else 383 else
341#endif 384#endif
342 { 385 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
345 } 388 }
346 389
347 if (valid_keysym) 390 if (valid_keysym)
348 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
349 if (TermWin.saveLines) 397 if (saveLines)
350 { 398 {
351#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 400 if (!ctrl && !meta)
353#else 401#else
354 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
355#endif 403#endif
356 { 404 {
357 int lnsppg; 405 int lnsppg;
358 406
359#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 409#else
362 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
363#endif 411#endif
364 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
365 { 413 {
366 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
367 return; 415 return;
… …
487 } 535 }
488#endif 536#endif
489 537
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 539 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 540 {
518 newlen = 1; 541 newlen = 1;
519 switch (keysym) 542 switch (keysym)
520 { 543 {
521#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
529 else 552 else
530 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
531 break; 554 break;
532#endif 555#endif
533#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
534 case XK_Delete: 567 case XK_Delete:
535 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
536 break; 569 break;
537#endif 570#endif
538 case XK_Tab: 571 case XK_Tab:
… …
641#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
642 case XK_KP_Begin: 675 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
644 break; 677 break;
645 678
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 679#endif
654 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
689 break; 715 break;
690 716
691 case XK_Find: 717 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
693 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
694 case XK_Insert: 731 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
696 break; 733 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 735 case DXK_Remove:
… …
785 case XK_F35: /* "\033[49~" */ 822 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 823 FKEY (31, XK_F17);
787 break; 824 break;
788#undef FKEY 825#undef FKEY
789 default: 826 default:
790 if (len == 0 827 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 828 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 829 }
796 830
797 if (newlen) 831 if (newlen)
798 len = strlen (kbuf); 832 len = strlen (kbuf);
799 } 833 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 849 else if (keysym == XK_ISO_Left_Tab)
816 { 850 {
817 strcpy (kbuf, "\033[Z"); 851 strcpy (kbuf, "\033[Z");
818 len = 3; 852 len = 3;
819 } 853 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 854 else
828 { 855 {
829#ifdef META8_OPTION 856#ifdef META8_OPTION
830 /* set 8-bit on */ 857 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
832 { 859 {
833 unsigned char *ch; 860 char *ch;
834 861
835 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 863 *ch |= 0x80;
837 864
838 meta = 0; 865 meta = 0;
… …
840#endif 867#endif
841 /* nil */ ; 868 /* nil */ ;
842 } 869 }
843 } 870 }
844 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
845 if (len <= 0) 875 if (len <= 0)
846 return; /* not mapped */ 876 return; /* not mapped */
847 877
848 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 879 if (view_start)
850 { 880 {
851 TermWin.view_start = 0; 881 view_start = 0;
852 want_refresh = 1; 882 want_refresh = 1;
853 } 883 }
854 884
855 /* 885 /*
856 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 901#ifdef META8_OPTION
872 && meta_char == C0_ESC 902 && meta_char == C0_ESC
873#endif 903#endif
874 ) 904 )
875 { 905 {
876 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
877 tt_write (&ch, 1); 907 tt_write (&ch, 1);
878 } 908 }
879 909
880#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
889#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
891} 921}
892/*}}} */ 922/*}}} */
893 923
894#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
897unsigned int 927unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 929{
900 unsigned int n, s; 930 unsigned int n, s;
901 931
902 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 952
923 cmd_parse (); 953 cmd_parse ();
924 954
925 return 0; 955 return 0;
926} 956}
927#endif /* MENUBAR_MAX */ 957#endif
928 958
929void 959void
930rxvt_term::flush () 960rxvt_term::flush ()
931{ 961{
932 flush_ev.stop (); 962 flush_ev.stop ();
… …
940 } 970 }
941#endif 971#endif
942 972
943 if (want_refresh) 973 if (want_refresh)
944 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (++row < end_row);
1011 }
1012
945 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
946 scrollbar_show (1); 1014 scrollbar_show (1);
947#ifdef USE_XIM 1015#ifdef USE_XIM
948 IMSendSpot (); 1016 IMSendSpot ();
949#endif 1017#endif
… …
959 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
960 1028
961 display->flush (); 1029 display->flush ();
962 1030
963 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1033}
966 1034
967void 1035void
968rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
969{ 1037{
… …
1033{ 1101{
1034 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1105 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1038 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1; 1111 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1113 }
1042} 1114}
1043#endif 1115#endif
1044 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1045bool 1135bool
1046rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1047{ 1137{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1139
1050 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1051 { 1141 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1143 n = 0;
1054 } 1144 }
1055 1145
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1059 1149
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1061 1151
1062 if (n > 0) 1152 if (r > 0)
1063 { 1153 {
1064 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1065 return true; 1155 return true;
1066 } 1156 }
1067 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1068 destroy (); 1169 destroy ();
1170 }
1069 1171
1070 return false; 1172 return false;
1071} 1173}
1072 1174
1073void 1175void
… …
1087} 1189}
1088 1190
1089void 1191void
1090rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1091{ 1193{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1093 recolour_cursor (); 1195 recolour_cursor ();
1094 1196
1095#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1198 hidden_pointer = 0;
1097 1199
1098 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1202#endif
1101} 1203}
1102 1204
1103#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1104void 1206void
1105rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1106{ 1208{
1107 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1108 return; 1210 return;
1109 1211
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1111 XFlush (display->display); 1213 XFlush (display->display);
1112 1214
1113 hidden_pointer = 1; 1215 hidden_pointer = 1;
1114} 1216}
1115 1217
… …
1204 1306
1205/*{{{ process an X event */ 1307/*{{{ process an X event */
1206void 1308void
1207rxvt_term::x_cb (XEvent &ev) 1309rxvt_term::x_cb (XEvent &ev)
1208{ 1310{
1311 dDisp;
1312
1209 SET_R (this); 1313 SET_R (this);
1210 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1211
1212#if defined(CURSOR_BLINK)
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1222 }
1223#endif
1224
1225#if defined(POINTER_BLANK)
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238 1315
1239 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1318 unsigned int unused_mask;
1242 1319
… …
1273 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (ks >= 0x61 && ks <= 0x7f)))
1275 { 1352 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 (); 1354 commit_iso14755 ();
1278 return; // case-break; 1355 goto skip_switch;
1279 } 1356 }
1280 1357
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks) 1359 if (i[0] == ks)
1283 { 1360 {
1284 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 (); 1362 commit_iso14755 ();
1286 return; // case-break; 1363 goto skip_switch;
1287 } 1364 }
1288 1365
1289 scr_bell (); 1366 scr_bell ();
1290# endif 1367# endif
1291 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1310 else 1387 else
1311 iso14755buf = 0; 1388 iso14755buf = 0;
1312 } 1389 }
1313#endif 1390#endif
1314 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1394 break;
1395
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (ks == XK_Control_L || ks == XK_Control_R)
1319 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
… …
1329 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1330 break; 1411 break;
1331 1412
1332 case ClientMessage: 1413 case ClientMessage:
1333 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1336#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1342 { 1441 {
1343 /* Get Dnd data */ 1442 /* Get Dnd data */
1344 Atom ActualType; 1443 Atom ActualType;
1345 int ActualFormat; 1444 int ActualFormat;
1346 unsigned char *data; 1445 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1348 1447
1349 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1450 0L, 1000000L,
1352 False, AnyPropertyType, 1451 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1355 &data); 1454 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1455 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1456 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1459 }
1361#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1362 break; 1461 break;
1363 1462
1364 case MappingNotify: 1463 case MappingNotify:
… …
1389 break; 1488 break;
1390 } 1489 }
1391 break; 1490 break;
1392 1491
1393 case FocusIn: 1492 case FocusIn:
1394 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1395 { 1502 {
1396 TermWin.focus = 1;
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ;
1463 1505
1464 if (szHint.width != width || szHint.height != height) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1507 {
1466 seen_resize = 1; 1508 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1510 }
1469 1511
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1514 check_our_parents ();
1473#endif 1515#endif
1474 } 1516 }
1475 break; 1517 break;
1476 1518
… …
1492 1534
1493 case SelectionRequest: 1535 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1495 break; 1537 break;
1496 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1497 case UnmapNotify: 1547 case UnmapNotify:
1498 TermWin.mapped = 0; 1548 mapped = 0;
1499#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1501#endif 1551#endif
1502 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break; 1553 break;
1510 1554
1511#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1512 case ReparentNotify: 1556 case ReparentNotify:
1513 rootwin_cb (ev); 1557 rootwin_cb (ev);
1514 break; 1558 break;
1515#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1516 1560
1517 case GraphicsExpose: 1561 case GraphicsExpose:
1518 case Expose: 1562 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1520 { 1564 {
1521 do 1565 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525 1569
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1571
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1531 1575
1532 scr_refresh (refresh_type); 1576 scr_refresh (refresh_type);
1533 } 1577 }
1534 else 1578 else
1535 { 1579 {
1536 XEvent unused_event; 1580 XEvent unused_event;
1537 1581
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1583 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1585 ;
1542 1586
1543 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1544 { 1588 {
1545 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
… …
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose (); 1594 menubar_expose ();
1551#endif 1595#endif
1552 1596
1553#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1556#endif 1600#endif
1557 } 1601 }
1558 break; 1602 break;
1559 1603
1560 case MotionNotify: 1604 case MotionNotify:
… …
1570 } 1614 }
1571#endif 1615#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1617 break;
1574 1618
1575 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1576 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1624 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580 ; 1626 ;
1581 1627
1582 XQueryPointer (display->display, TermWin.vt, 1628 XQueryPointer (disp, vt,
1583 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1632 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
… …
1599#endif 1645#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1648
1603#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1652 {
1607 int dist; 1653 int dist;
1608 1654
1609 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1667
1622 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1624 { 1670 {
1625 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1627 } 1673 }
1628 else 1674 else
1629 { 1675 {
1630 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1677 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1678 }
1633 1679
1634 scroll_selection_lines = Pixel2Height (dist) 1680 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1682 + 1;
1637 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1639 } 1685 }
1640 else 1686 else
1641 { 1687 {
1642 /* we are within the text window, so we 1688 /* we are within the text window, so we
… …
1651#endif 1697#endif
1652 } 1698 }
1653 } 1699 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1701 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1702 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1703 MotionNotify, &ev))
1658 ; 1704 ;
1659 1705
1660 XQueryPointer (display->display, scrollBar.win, 1706 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1707 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1710 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1668 refresh_limit = 0; 1714 refresh_limit = 0;
1669 scrollbar_show (1); 1715 scrollbar_show (1);
1670 } 1716 }
1671 break; 1717 break;
1672 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1748}
1749
1750void
1751rxvt_term::focus_in ()
1752{
1753 if (!focus)
1754 {
1755 focus = 1;
1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1760#if USE_XIM
1761 if (Input_Context != NULL)
1762 {
1763 IMSetStatusPosition ();
1764 XSetICFocus (Input_Context);
1765 }
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1770#endif
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 pix_colors = pix_colors_focused;
1775 scr_recolour ();
1776 }
1777#endif
1778 }
1779}
1780
1781void
1782rxvt_term::focus_out ()
1783{
1784 if (focus)
1785 {
1786 focus = 0;
1787 want_refresh = 1;
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1794 iso14755buf = 0;
1795# if ENABLE_OVERLAY
1796 scr_overlay_off ();
1797# endif
1798 }
1799#endif
1800#if USE_XIM
1801 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context);
1803#endif
1804#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink))
1806 cursor_blink_ev.stop ();
1807 hidden_cursor = 0;
1808#endif
1809#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade])
1811 {
1812 pix_colors = pix_colors_unfocused;
1813 scr_recolour ();
1814 }
1815#endif
1816 }
1673} 1817}
1674 1818
1675#if TRANSPARENT 1819#if TRANSPARENT
1676void 1820void
1677rxvt_term::rootwin_cb (XEvent &ev) 1821rxvt_term::rootwin_cb (XEvent &ev)
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1835 return;
1692 1836
1693 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1694 case ReparentNotify: 1838 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1697 break; 1841 break;
1698 } 1842 }
1699} 1843}
1700#endif 1844#endif
… …
1703rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1704{ 1848{
1705 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1706 1850
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1708 if (!bypass_keystate) 1853 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1855
1711 /* 1856 /*
1712 * VT window processing of button press 1857 * VT window processing of button press
1713 */ 1858 */
1714 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1715 { 1860 {
1716#if ISO_14755 1861#if ISO_14755
1717 // 5.4 1862 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1864 {
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1734 { 1879 {
1735 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1736 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1737 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1738 { 1884 {
1739 /* only report double clicks */ 1885 /* only report double clicks */
1740 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1741 mouse_report (ev); 1887 mouse_report (ev);
… …
1761 else 1907 else
1762 { 1908 {
1763 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1764 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1765 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1766 switch (ev.button) 1913 switch (ev.button)
1767 { 1914 {
1768 case Button1: 1915 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1920#else
1774 selection.rect = false; 1921 selection.rect = false;
1775#endif 1922#endif
1776 1923
1777 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1779 { 1926 {
1780 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1782 else 1929 else
1783 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1784 } 1931 }
1785 else 1932 else
1786 { 1933 {
1787 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1788 MEvent.clicks++; 1935 MEvent.clicks++;
1789 else 1936 else
1790 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1791 1938
1792 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1793 } 1940 }
1794 1941
1795 MEvent.button = Button1; 1942 MEvent.button = Button1;
1796 break; 1943 break;
1797 1944
1798 case Button3: 1945 case Button3:
1799 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1800 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1801 else 1948 else
1802 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1803 1950
1804 MEvent.button = Button3; 1951 MEvent.button = Button3;
1805 break; 1952 break;
1806 } 1953 }
1807 } 1954 }
1808 1955
1809 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1810 return; 1957 return;
1811 } 1958 }
1812 1959
… …
1924 case Button3: 2071 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1926 { 2073 {
1927 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1930# else 2077# else
1931 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1932# endif 2079# endif
1933 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1936# else 2083# else
1937 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1938# endif 2085# endif
1939 else 2086 else
1940 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1941 } 2088 }
1942 else 2089 else
1943 { 2090 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2092 (nrow
1946 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2094 / scrollbar_size ()));
1948 } 2095 }
1949 2096
1950 break; 2097 break;
1951 } 2098 }
1952 } 2099 }
2100
1953 return; 2101 return;
1954 } 2102 }
2103
1955#if MENUBAR 2104#if MENUBAR
1956 /* 2105 /*
1957 * Menubar window processing of button press 2106 * Menubar window processing of button press
1958 */ 2107 */
1959 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
1982#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
1985#endif 2134#endif
1986 2135
1987 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1988 { 2137 {
1989#if ISO_14755 2138#if ISO_14755
1990 // 5.4 2139 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2141 return;
… …
2022 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2023 && bypass_keystate 2172 && bypass_keystate
2024 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2025 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2026 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2027 switch (ev.button) 2179 switch (ev.button)
2028 { 2180 {
2029 case Button1: 2181 case Button1:
2030 case Button3: 2182 case Button3:
2031 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2042 2194
2043 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2044 2196
2045 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2046 i = 1; 2198 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2200 i = nrow - 1;
2049 else 2201 else
2050 i = 5; 2202 i = 5;
2051 2203
2052# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
2054 { 2206 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2210
2059 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2213
2062 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2255 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2256 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2257 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2258 int i;
2107 2259
2108 Visual* visual = display->visual; 2260 Visual *visual = display->visual;
2109 2261
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2262 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2263
2112 /* for convenience */ 2264 /* for convenience */
2113 mask_r = visual->red_mask; 2265 mask_r = visual->red_mask;
… …
2334 Atom atype; 2486 Atom atype;
2335 unsigned char *prop = NULL; 2487 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2488 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2489 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2490 XWindowAttributes wattr, wrootattr;
2491 dDisp;
2339 2492
2340 pchanged = 0; 2493 pchanged = 0;
2341 2494
2342 if (!(options & Opt_transparent)) 2495 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2496 return pchanged; /* Don't try any more */
2344 2497
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2498 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2499 rootdepth = wrootattr.depth;
2347 2500
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2501 XGetWindowAttributes (disp, parent[0], &wattr);
2349 2502
2350 if (rootdepth != wattr.depth) 2503 if (rootdepth != wattr.depth)
2351 { 2504 {
2352 if (am_transparent) 2505 if (am_transparent)
2353 { 2506 {
2354 pchanged = 1; 2507 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2508 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2509 am_transparent = am_pixmap_trans = 0;
2357 } 2510 }
2358 2511
2359 return pchanged; /* Don't try any more */ 2512 return pchanged; /* Don't try any more */
2360 } 2513 }
2361 2514
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2515 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2516 XSync (disp, False);
2364 2517
2365 /* 2518 /*
2366 * Make the frame window set by the window manager have 2519 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2520 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2521 * windows for each client, so we have to take care about that.
2369 */ 2522 */
2370 i = (xa[XA_XROOTPMAP_ID] 2523 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2524 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2526 &nitems, &bytes_after, &prop) == Success);
2374 2527
2375 if (!i || prop == NULL) 2528 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2529 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2530 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2531 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2532 &nitems, &bytes_after, &prop) == Success);
2380 2533
2381 if (!i || prop == NULL 2534 if (!i || prop == NULL
2382#if TINTING 2535#if TINTING
… …
2401 Window cr; 2554 Window cr;
2402 XImage *image; 2555 XImage *image;
2403 GC gc; 2556 GC gc;
2404 XGCValues gcvalue; 2557 XGCValues gcvalue;
2405 2558
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2559 XTranslateCoordinates (disp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2560 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2561 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2562 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2563 nx = ny = 0;
2411 2564
… …
2421 nh += sy; 2574 nh += sy;
2422 ny = -sy; 2575 ny = -sy;
2423 sy = 0; 2576 sy = 0;
2424 } 2577 }
2425 2578
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2579 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2580 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2581
2429 XSync (display->display, False); 2582 XSync (disp, False);
2430 allowedxerror = -1; 2583 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2584 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2585
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2586 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2587 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2588 allowedxerror = 0;
2436 2589
2437 if (image == NULL) 2590 if (image == NULL)
2438 { 2591 {
2439 if (am_transparent && am_pixmap_trans) 2592 if (am_transparent && am_pixmap_trans)
2440 { 2593 {
2441 pchanged = 1; 2594 pchanged = 1;
2442 if (TermWin.pixmap != None) 2595 if (pixmap != None)
2443 { 2596 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2445 TermWin.pixmap = None; 2598 pixmap = None;
2446 } 2599 }
2447 } 2600 }
2448 2601
2449 am_pixmap_trans = 0; 2602 am_pixmap_trans = 0;
2450 } 2603 }
2451 else 2604 else
2452 { 2605 {
2453 if (TermWin.pixmap != None) 2606 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2607 XFreePixmap (disp, pixmap);
2455 2608
2456#if TINTING 2609#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2610 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2611 {
2459 unsigned short rm, gm, bm; 2612 unsigned short rm, gm, bm;
… …
2463 2616
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2617 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2618 }
2466#endif 2619#endif
2467 2620
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2621 pixmap = XCreatePixmap (disp, vt,
2469 szHint.width, szHint.height, image->depth); 2622 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2623 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2624 XPutImage (disp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2625 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2626 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2627 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2628 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2629 XClearWindow (disp, parent[0]);
2477 2630
2478 if (!am_transparent || !am_pixmap_trans) 2631 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2632 pchanged = 1;
2480 2633
2481 am_transparent = am_pixmap_trans = 1; 2634 am_transparent = am_pixmap_trans = 1;
2482 } 2635 }
2483 } 2636 }
2484 2637
2485 if (am_pixmap_trans) 2638 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487 else 2640 else
2488 { 2641 {
2489 unsigned int n; 2642 unsigned int n;
2490 /* 2643 /*
2491 * InheritPixmap transparency 2644 * InheritPixmap transparency
2492 */ 2645 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2647 {
2495 oldp = TermWin.parent[i]; 2648 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2649 XQueryTree (disp, parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2650 &parent[i], &list, &n);
2498 XFree (list); 2651 XFree (list);
2499 2652
2500 if (TermWin.parent[i] == display->root) 2653 if (parent[i] == display->root)
2501 { 2654 {
2502 if (oldp != None) 2655 if (oldp != None)
2503 pchanged = 1; 2656 pchanged = 1;
2504 2657
2505 break; 2658 break;
2506 } 2659 }
2507 2660
2508 if (oldp != TermWin.parent[i]) 2661 if (oldp != parent[i])
2509 pchanged = 1; 2662 pchanged = 1;
2510 } 2663 }
2511 2664
2512 n = 0; 2665 n = 0;
2513 2666
2514 if (pchanged) 2667 if (pchanged)
2515 { 2668 {
2516 for (; n < (unsigned int)i; n++) 2669 for (; n < (unsigned int)i; n++)
2517 { 2670 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2671 XGetWindowAttributes (disp, parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2672 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2673 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2674 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2675 break;
2523 } 2676 }
2524 } 2677 }
2525 } 2678 }
2526 2679
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2680 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528 { 2681 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2682 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2683 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2684 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2685 /* XXX: also turn off Opt_transparent? */
2533 } 2686 }
2534 else 2687 else
2535 { 2688 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2691 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2692 sleep (1);
2540#endif 2693#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2694 for (n = 0; n < (unsigned int)i; n++)
2542 { 2695 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2697 XClearWindow (disp, parent[n]);
2545 } 2698 }
2546 2699
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548 am_transparent = 1; 2701 am_transparent = 1;
2549 } 2702 }
2550 2703
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2704 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2705 parent[i] = None;
2553 } 2706 }
2554 2707
2555 if (scrollBar.win) 2708 if (scrollBar.win)
2556 { 2709 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2710 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2711 scrollBar.setIdle ();
2559 scrollbar_show (0); 2712 scrollbar_show (0);
2560 } 2713 }
2561 2714
2562 if (am_transparent) 2715 if (am_transparent)
… …
2574 2727
2575bool 2728bool
2576rxvt_term::cmd_parse () 2729rxvt_term::cmd_parse ()
2577{ 2730{
2578 bool flag = false; 2731 bool flag = false;
2579 unicode_t ch = NOCHAR; 2732 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2733 char *seq_begin; // remember start of esc-sequence here
2581 2734
2582 for (;;) 2735 for (;;)
2583 { 2736 {
2584 if (ch == NOCHAR) 2737 if (ch == NOCHAR)
2585 { 2738 {
2586 seq_begin = cmdbuf_ptr; 2739 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2740 ch = next_char ();
2588 }
2589 2741
2590 if (ch == NOCHAR) // TODO: improve 2742 if (ch == NOCHAR)
2591 break; 2743 break;
2744 }
2592 2745
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2746 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2747 {
2595 if (!seen_input) 2748 if (!seen_input)
2596 { 2749 {
… …
2600 // some window managers resize the window early, and these programs 2753 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2754 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2755 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2756 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2757 // resized.
2605 if (seen_resize) 2758 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2759 kill (-cmd_pid, SIGWINCH);
2607 } 2760 }
2608 2761
2609 /* Read a text string from the input buffer */ 2762 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2763 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2764 bool refreshnow = false;
2612 int nlines = 0; 2765 int nlines = 0;
2613 unicode_t *str = buf; 2766 wchar_t *str = buf;
2767 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2768
2615 for (;;) 2769 for (;;)
2616 { 2770 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2771 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2772 break;
2619 2773
2620 *str++ = ch; 2774 *str++ = ch;
2621 2775
2622 if (ch == C0_LF) 2776 if (ch == C0_LF || str >= eol)
2623 { 2777 {
2778 if (ch == C0_LF)
2624 nlines++; 2779 nlines++;
2780
2625 refresh_count++; 2781 refresh_count++;
2626 2782
2627 if (!(options & Opt_jumpScroll) 2783 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2784 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2785 {
2630 refreshnow = true; 2786 refreshnow = true;
2787 refresh_count = 0;
2631 ch = NOCHAR; 2788 ch = NOCHAR;
2632 break; 2789 break;
2633 } 2790 }
2634 2791
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2792 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2793 if (nlines >= nrow - 1)
2637 { 2794 {
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2638 scr_add_lines (buf, nlines, str - buf); 2796 scr_add_lines (buf, str - buf, nlines);
2797
2639 nlines = 0; 2798 nlines = 0;
2640 str = buf; 2799 str = buf;
2800 eol = str + min (ncol, UBUFSIZ);
2641 } 2801 }
2642 }
2643 2802
2644 if (str >= buf + UBUFSIZ) 2803 if (str >= eol)
2645 { 2804 {
2805 if (eol >= buf + UBUFSIZ)
2806 {
2646 ch = NOCHAR; 2807 ch = NOCHAR;
2647 break; 2808 break;
2809 }
2810 else
2811 eol = min (eol + ncol, buf + UBUFSIZ);
2812 }
2813
2648 } 2814 }
2649 2815
2650 seq_begin = cmdbuf_ptr; 2816 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2817 ch = next_char ();
2652 } 2818 }
2653 2819
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2654 scr_add_lines (buf, nlines, str - buf); 2821 scr_add_lines (buf, str - buf, nlines);
2655 2822
2656 /* 2823 /*
2657 * If there have been a lot of new lines, then update the screen 2824 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full. 2825 * What the heck I'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which 2826 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2827 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2828 */
2662 if (refreshnow) 2829 if (refreshnow)
2663 { 2830 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2832 refresh_limit++;
2666 else 2833 else
2667 { 2834 {
2668 flag = true; 2835 flag = true;
2669 scr_refresh (refresh_type); 2836 scr_refresh (refresh_type);
2837 flush_ev.stop ();
2670 } 2838 }
2671 } 2839 }
2672 2840
2673 } 2841 }
2674 else 2842 else
… …
2689 } 2857 }
2690 2858
2691 return flag; 2859 return flag;
2692} 2860}
2693 2861
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2862// read the next character
2704unicode_t 2863wchar_t
2705rxvt_term::next_char () 2864rxvt_term::next_char ()
2706{ 2865{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2866 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2867 {
2709 // assume 7-bit to be ascii ALWAYS 2868 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2870 return *cmdbuf_ptr++;
2712 2871
2713 wchar_t wc; 2872 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2873 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2874
2716 if (len == (size_t)-2) 2875 if (len == (size_t)-2)
2717 { 2876 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2877 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2878 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2879 break;
2721 } 2880 }
2722 2881
2723 if (len == (size_t)-1) 2882 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2883 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2884
2726 // assume wchar == unicode 2885 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2886 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2887 return wc & UNICODE_MASK;
2729 } 2888 }
2730 2889
2731 return NOCHAR; 2890 return NOCHAR;
2891}
2892
2893// read the next octet
2894uint32_t
2895rxvt_term::next_octet ()
2896{
2897 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR;
2732} 2900}
2733 2901
2734/* rxvt_cmd_getc () - Return next input character */ 2902/* rxvt_cmd_getc () - Return next input character */
2735/* 2903/*
2736 * Return the next input character after first passing any keyboard input 2904 * Return the next input character after first passing any keyboard input
2737 * to the command. 2905 * to the command.
2738 */ 2906 */
2739unicode_t 2907wchar_t
2740rxvt_term::cmd_getc () 2908rxvt_term::cmd_getc ()
2741{ 2909{
2742 unicode_t c = next_char (); 2910 wchar_t c = next_char ();
2743 2911
2744 if (c == NOCHAR) 2912 if (c == NOCHAR)
2745 throw out_of_input; 2913 throw out_of_input;
2746 2914
2747 return c; 2915 return c;
2748} 2916}
2749 2917
2750unicode_t 2918uint32_t
2751rxvt_term::cmd_get8 () 2919rxvt_term::cmd_get8 ()
2752{ 2920{
2753 unicode_t c = next_octet (); 2921 uint32_t c = next_octet ();
2754 2922
2755 if (c == NOCHAR) 2923 if (c == NOCHAR)
2756 throw out_of_input; 2924 throw out_of_input;
2757 2925
2758 return c; 2926 return c;
… …
2858 case C0_ESC: 3026 case C0_ESC:
2859 process_escape_seq (); 3027 process_escape_seq ();
2860 break; 3028 break;
2861 case C0_ENQ: /* terminal Status */ 3029 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 3030 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3031 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 3032 else
2866 tt_write ((unsigned char *)VT100_ANS, 3033 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 3034 break;
2869 case C0_BEL: /* bell */ 3035 case C0_BEL: /* bell */
2870 scr_bell (); 3036 scr_bell ();
2871 break; 3037 break;
2872 case C0_BS: /* backspace */ 3038 case C0_BS: /* backspace */
… …
3027 break; 3193 break;
3028 3194
3029 /* 8.3.87: NEXT LINE */ 3195 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3196 case C1_NEL: /* ESC E */
3031 { 3197 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3198 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3199 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3200 }
3035 break; 3201 break;
3036 3202
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3203 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3204 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3226 process_dcs_seq ();
3061 break; 3227 break;
3062 3228
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3229 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3230 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3231 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3232 break; /* steal obsolete ESC [ c */
3068 3233
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3234 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3235 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3236 process_csi_seq ();
… …
3196 { 3361 {
3197 switch (priv) 3362 switch (priv)
3198 { 3363 {
3199 case '>': 3364 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3365 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3366 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3367 break;
3203 case '?': 3368 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3369 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3370 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3371 break;
… …
3311 3476
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3477 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3478 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3479 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3480 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3481 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3482 break;
3318 3483
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3484 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3485 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3486 break;
3323 3487
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3488 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3489 process_sgr_mode (nargs, arg);
3326 break; 3490 break;
… …
3333 break; 3497 break;
3334 case 6: /* CPR requested */ 3498 case 6: /* CPR requested */
3335 scr_report_position (); 3499 scr_report_position ();
3336 break; 3500 break;
3337 case 7: /* unofficial extension */ 3501 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3502 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3503 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3504 break;
3341 case 8: /* unofficial extension */ 3505 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3506 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3507 break;
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3599rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3600{
3437 int x, y; 3601 int x, y;
3438 XWindowAttributes wattr; 3602 XWindowAttributes wattr;
3439 Window wdummy; 3603 Window wdummy;
3604 dDisp;
3440 3605
3441 if (nargs == 0) 3606 if (nargs == 0)
3442 return; 3607 return;
3443 3608
3444 switch (args[0]) 3609 switch (args[0])
3445 { 3610 {
3446 /* 3611 /*
3447 * commands 3612 * commands
3448 */ 3613 */
3449 case 1: /* deiconify window */ 3614 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3615 XMapWindow (disp, parent[0]);
3451 break; 3616 break;
3452 case 2: /* iconify window */ 3617 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3618 XIconifyWindow (disp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3619 break;
3456 case 3: /* set position (pixels) */ 3620 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3621 XMoveWindow (disp, parent[0], args[1], args[2]);
3458 break; 3622 break;
3459 case 4: /* set size (pixels) */ 3623 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3624 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3625 break;
3462 case 5: /* raise window */ 3626 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3627 XRaiseWindow (disp, parent[0]);
3464 break; 3628 break;
3465 case 6: /* lower window */ 3629 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3630 XLowerWindow (disp, parent[0]);
3467 break; 3631 break;
3468 case 7: /* refresh window */ 3632 case 7: /* refresh window */
3469 scr_touch (true); 3633 scr_touch (true);
3470 break; 3634 break;
3471 case 8: /* set size (chars) */ 3635 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3636 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3637 (unsigned int) (args[1] * fheight));
3474 break; 3638 break;
3475 3639
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3640 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3641 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3642 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3643 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3644 (unsigned int) (args[1] * fheight));
3481 break; 3645 break;
3482 3646
3483 3647
3484 /* 3648 /*
3485 * reports - some output format copied from XTerm 3649 * reports - some output format copied from XTerm
3486 */ 3650 */
3487 case 11: /* report window state */ 3651 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3652 XGetWindowAttributes (disp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3653 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3654 break;
3491 case 13: /* report window position */ 3655 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3656 XGetWindowAttributes (disp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3657 XTranslateCoordinates (disp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3658 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3659 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3660 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3661 break;
3498 case 14: /* report window size (pixels) */ 3662 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3663 XGetWindowAttributes (disp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3664 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3665 break;
3502 case 18: /* report text area size (chars) */ 3666 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3667 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3668 break;
3505 case 19: /* report window size (chars) */ 3669 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3670 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3671 break;
3508 case 20: /* report icon label */ 3672 case 20: /* report icon label */
3509 { 3673 {
3510 char *s; 3674 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3675 XGetIconName (disp, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3677 XFree (s);
3514 } 3678 }
3515 break; 3679 break;
3516 case 21: /* report window title */ 3680 case 21: /* report window title */
3517 { 3681 {
3518 char *s; 3682 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3683 XFetchName (disp, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3684 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3685 XFree (s);
3522 } 3686 }
3523 break; 3687 break;
3524 } 3688 }
3525} 3689}
… …
3528/*----------------------------------------------------------------------*/ 3692/*----------------------------------------------------------------------*/
3529/* 3693/*
3530 * get input up until STRING TERMINATOR (or BEL) 3694 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3695 * ends_how is terminator used. returned input must be free()'d
3532 */ 3696 */
3533unsigned char * 3697char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3698rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3699{
3536 unicode_t ch; 3700 unicode_t ch;
3537 bool seen_esc = false; 3701 bool seen_esc = false;
3538 unsigned int n = 0; 3702 unsigned int n = 0;
… …
3557 else if (ch < 0x20) 3721 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3722 return NULL; /* other control character - exit */
3559 3723
3560 seen_esc = false; 3724 seen_esc = false;
3561 3725
3562 if (n >= sizeof (string) - 1) 3726 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3727 // stop at some sane length
3564 return NULL; 3728 return NULL;
3565 3729
3566 if (ch == C0_SYN) 3730 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3731 string[n++] = cmd_get8 ();
… …
3571 3735
3572 string[n++] = '\0'; 3736 string[n++] = '\0';
3573 3737
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3738 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3739
3576 return (unsigned char *)rxvt_wcstombs (string); 3740 return rxvt_wcstombs (string);
3577} 3741}
3578 3742
3579/*----------------------------------------------------------------------*/ 3743/*----------------------------------------------------------------------*/
3580/* 3744/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3745 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3746 */
3583void 3747void
3584rxvt_term::process_dcs_seq () 3748rxvt_term::process_dcs_seq ()
3585{ 3749{
3586 unsigned char *s; 3750 char *s;
3587 unicode_t eh; 3751 unicode_t eh;
3588 3752
3589 /* 3753 /*
3590 * Not handled yet 3754 * Not handled yet
3591 */ 3755 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3774 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3775 arg = arg * 10 + (ch - '0');
3612 3776
3613 if (ch == ';') 3777 if (ch == ';')
3614 { 3778 {
3615 unsigned char *s = get_to_st (eh); 3779 char *s = get_to_st (eh);
3616 3780
3617 if (s) 3781 if (s)
3618 { 3782 {
3619 process_xterm_seq (arg, (char *)s, eh); 3783 process_xterm_seq (arg, s, eh);
3620 free (s); 3784 free (s);
3621 } 3785 }
3622 } 3786 }
3623} 3787}
3624 3788
3625void 3789void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3790rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3791{
3628 if (str[0] == '?' && !str[1]) 3792 if (str[0] == '?' && !str[1])
3629 { 3793 {
3630 unsigned short r, g, b; 3794 unsigned short r, g, b;
3631 pix_colors_focused[color].get (display, r, g, b); 3795 pix_colors_focused[color].get (display, r, g, b);
… …
3635 set_window_color (color, str); 3799 set_window_color (color, str);
3636} 3800}
3637 3801
3638/* 3802/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3803 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3804 */
3663void 3805void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3806rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3807{
3666 int changed = 0; 3808 int changed = 0;
3667 int color; 3809 int color;
3668 char *buf, *name; 3810 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3811 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3812 int saveop = op;
3813 dDisp;
3671 3814
3672 assert (str != NULL); 3815 assert (str != NULL);
3673 switch (op) 3816 switch (op)
3674 { 3817 {
3675 case XTerm_name: 3818 case XTerm_name:
… …
3691 unsigned long bytes_after; 3834 unsigned long bytes_after;
3692 unsigned char *value = 0; 3835 unsigned char *value = 0;
3693 const char *str = ""; 3836 const char *str = "";
3694 3837
3695 if (prop 3838 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3839 && XGetWindowProperty (disp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3840 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3841 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3842 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3843 && actual_type != None
3701 && actual_format == 8) 3844 && actual_format == 8)
… …
3713 { 3856 {
3714 *eq = 0; 3857 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3858 set_utf8_property (display->atom (str), eq + 1);
3716 } 3859 }
3717 else 3860 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3861 XDeleteProperty (disp, parent[0],
3719 display->atom (str)); 3862 display->atom (str));
3720 } 3863 }
3721 break; 3864 break;
3722 3865
3723 case XTerm_Color: 3866 case XTerm_Color:
… …
3764 break; 3907 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3908#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD: 3909 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break; 3911 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL: 3912 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break; 3914 break;
3775 case XTerm_Color_RV: 3915 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3917 break;
3918 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3920 break;
3778#endif 3921#endif
3779#if TRANSPARENT && TINTING 3922#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3923 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3924 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3925 check_our_parents ();
3783 if (am_transparent) 3926 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3927 want_full_refresh = want_refresh = 1;
3785 break; 3928 break;
3786#endif 3929#endif
… …
3798 { 3941 {
3799 str++; 3942 str++;
3800#if XPM_BACKGROUND 3943#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3944 changed += scale_pixmap (str);
3802#endif 3945#endif
3803
3804 } 3946 }
3947
3805 if (changed) 3948 if (changed)
3806 { 3949 {
3807#ifdef XPM_BACKGROUND 3950#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3951 resize_pixmap ();
3809#endif 3952#endif
… …
3820 3963
3821 case XTerm_logfile: 3964 case XTerm_logfile:
3822 // TODO, when secure mode? 3965 // TODO, when secure mode?
3823 break; 3966 break;
3824 3967
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0
3975 case XTerm_dumpscreen: /* no error notices */
3976 {
3977 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 {
3980 scr_dump (fd);
3981 close (fd);
3982 }
3983 }
3984 break;
3985#endif
3825 case XTerm_font: 3986 case XTerm_font:
3826 op = URxvt_font; 3987 op = URxvt_font;
3827 case URxvt_font: 3988 case URxvt_font:
3828#if ENABLE_STYLES 3989#if ENABLE_STYLES
3829 case URxvt_boldFont: 3990 case URxvt_boldFont:
3830 case URxvt_italicFont: 3991 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3992 case URxvt_boldItalicFont:
3832#endif 3993#endif
3833 if (query) 3994 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3995 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3996 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3997 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3998 resp);
3838 else 3999 else
3839 { 4000 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4001 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 4002
… …
3844 set_fonts (); 4005 set_fonts ();
3845 } 4006 }
3846 break; 4007 break;
3847 4008
3848#if ENABLE_FRILLS 4009#if ENABLE_FRILLS
3849 case XTerm_locale: 4010 case URxvt_locale:
3850 if (query) 4011 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 4013 else
3853 { 4014 {
3854 set_locale (str); 4015 set_locale (str);
3855# ifdef USE_XIM 4016 pty.set_utf8_mode (enc_utf8);
3856 im_cb (); 4017 init_xlocale ();
3857# endif
3858 } 4018 }
3859 break; 4019 break;
3860#endif
3861 4020
3862#ifdef MENUBAR 4021 case URxvt_view_up:
3863 case XTerm_Menu: 4022 case URxvt_view_down:
3864 if (options & Opt_insecure) 4023 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4024 int lines = atoi (str);
4025
4026 if (lines)
4027 scr_page (op == URxvt_view_up ? UP : DN, lines);
4028 else
4029 scr_erase_savelines ();
4030 }
4031
3866 break; 4032 break;
3867#endif 4033#endif
3868#if 0 4034
3869 case XTerm_dumpscreen: /* no error notices */ 4035#if ENABLE_PERL
3870 { 4036 case URxvt_perl:
3871 int fd; 4037 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4038 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 4039 break;
3879#endif 4040#endif
3880 } 4041 }
3881} 4042}
3882/*----------------------------------------------------------------------*/ 4043/*----------------------------------------------------------------------*/
… …
3991 } 4152 }
3992 4153
3993 /* extra handling for values with state unkept */ 4154 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4155 switch (arg[i])
3995 { 4156 {
4157#if ENABLE_STYLES
4158 case 1021:
4159 set_option (Opt_intensityStyles, mode);
4160
4161 scr_touch (true);
4162 break;
4163#endif
3996 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
3997 case 1049: 4165 case 1049:
3998 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4167 if (mode == 0)
4000 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
4001 else if (mode == 1) 4169 else if (mode == 1)
4002 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
4003 break; 4171 break;
… …
4015 */ 4183 */
4016 PrivMode (1, PrivMode_vt52); 4184 PrivMode (1, PrivMode_vt52);
4017 break; 4185 break;
4018 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4189 break;
4022 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4191 set_option (Opt_jumpScroll, !state);
4027 break; 4192 break;
4028 case 5: /* reverse video */ 4193 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4194 scr_rvideo_mode (state);
4030 break; 4195 break;
4031 case 6: /* relative/absolute origins */ 4196 case 6: /* relative/absolute origins */
… …
4072#if 0 4237#if 0
4073 case 1001: 4238 case 1001:
4074 break; /* X11 mouse highlighting */ 4239 break; /* X11 mouse highlighting */
4075#endif 4240#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4241 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4242 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4243 break;
4082 case 1011: /* scroll to bottom on key press */ 4244 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4245 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4246 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4247 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4248 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4250 scr_erase_screen (2);
4092 scr_change_screen (state); 4251 scr_change_screen (state);
4093 break; 4252 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4253 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4254 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4255 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4256 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4257 scr_erase_screen (2);
4099 break; 4258 break;
4100 default: 4259 default:
4101 break; 4260 break;
… …
4229 scr_color (Color_bg, Color_bg); 4388 scr_color (Color_bg, Color_bg);
4230 break; 4389 break;
4231 4390
4232 //case 50: // not variable spacing 4391 //case 50: // not variable spacing
4233 4392
4234#ifndef NO_BRIGHTCOLOR 4393#if ENABLE_FRILLS
4235 case 90: 4394 case 90:
4236 case 91: /* set bright fg color */ 4395 case 91: /* set bright fg color */
4237 case 92: 4396 case 92:
4238 case 93: 4397 case 93:
4239 case 94: 4398 case 94:
… …
4251 case 106: 4410 case 106:
4252 case 107: 4411 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4412 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4413 break;
4255#endif 4414#endif
4256
4257 } 4415 }
4258 } 4416 }
4259} 4417}
4260/*}}} */ 4418/*}}} */
4261 4419
… …
4285 */ 4443 */
4286void 4444void
4287rxvt_term::tt_printf (const char *fmt,...) 4445rxvt_term::tt_printf (const char *fmt,...)
4288{ 4446{
4289 va_list arg_ptr; 4447 va_list arg_ptr;
4290 unsigned char buf[256]; 4448 char buf[256];
4291 4449
4292 va_start (arg_ptr, fmt); 4450 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4451 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4452 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4453 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4458 * or generated by us in response to a query ESC sequence.
4301 */ 4459 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4461
4304void 4462void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4463rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4464{
4465 if (pty.pty < 0)
4466 return;
4467
4307 if (v_buflen == 0) 4468 if (v_buflen == 0)
4308 { 4469 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4310 4471
4311 if ((unsigned int)written == len) 4472 if ((unsigned int)written == len)
… …
4313 4474
4314 data += written; 4475 data += written;
4315 len -= written; 4476 len -= written;
4316 } 4477 }
4317 4478
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4480
4320 memcpy (v_buffer + v_buflen, data, len); 4481 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4482 v_buflen += len;
4322 4483
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4342 } 4503 }
4343 4504
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4505 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4506 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4508 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4509}
4350 4510
4351/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
4352 4512

Diff Legend

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