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.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 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#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
147 151
148 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
149 { 153 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
153 break; 156 break;
154 } 157 }
155 158
156 x--; 159 x--;
157 } 160 }
158
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
172
171#if ENABLE_COMBINING 173# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 char attr[80]; // plenty
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
212 243
244 free (fname);
245
213#if ENABLE_COMBINING 246# if ENABLE_COMBINING
214 if (alloc) 247 if (alloc)
215 delete [] alloc; 248 delete [] alloc;
216#endif 249# endif
217} 250}
218#endif 251#endif
219 252
220void 253void
221rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 271 mb[0] = ch[0];
239 len = 1; 272 len = 1;
240 } 273 }
241 274
242 if (len > 0) 275 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
244 else 277 else
245 scr_bell (); 278 scr_bell ();
246 } 279 }
247 280
248 iso14755buf = 0; 281 iso14755buf = 0;
… …
265 298
266 return -1; 299 return -1;
267} 300}
268#endif 301#endif
269 302
270/*{{{ Convert the keypress event into a string */
271void 303void
272rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
273{ 305{
274 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
275 unsigned int newlen; 307 unsigned int newlen;
276 KeySym keysym; 308 KeySym keysym;
277#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */
279#endif
280 int valid_keysym; 309 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
282 316
283 /* 317 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
286 * 320 *
… …
304 Status status_return; 338 Status status_return;
305 339
306#if 0 340#if 0
307#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
311 else 345 else
312#endif 346#endif
313#endif 347#endif
314 { 348 {
… …
316 350
317 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
321 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
324 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 361 SET_LOCALE (locale);
326 362
327 if (status_return == XLookupChars 363 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
350 } 386 }
351 else 387 else
352#endif 388#endif
353 { 389 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
356 } 392 }
357 393
358 if (valid_keysym) 394 if (valid_keysym)
359 { 395 {
360#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 398 return;
363#endif 399#endif
364 400
365 if (TermWin.saveLines) 401 if (saveLines)
366 { 402 {
367#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 404 if (!ctrl && !meta)
369#else 405#else
370 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
371#endif 407#endif
372 { 408 {
373 int lnsppg; 409 int lnsppg;
374 410
375#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 413#else
378 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
379#endif 415#endif
380 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
381 { 417 {
382 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
383 return; 419 return;
… …
411 scr_move_to (0, 1); 447 scr_move_to (0, 1);
412 return; 448 return;
413 } 449 }
414 else if (keysym == XK_End) 450 else if (keysym == XK_End)
415 { 451 {
416 scr_move_to (1, 0); 452 scr_move_to (1, 1);
417 return; 453 return;
418 } 454 }
419 } 455 }
420#endif 456#endif
421 } 457 }
… …
432 { 468 {
433 switch (keysym) 469 switch (keysym)
434 { 470 {
435 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
436 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
437 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
438 return; 474 return;
439#if TODO 475#if TODO
440 /* rxvt extras */ 476 /* rxvt extras */
441 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
442 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
461 { 497 {
462 commit_iso14755 (); 498 commit_iso14755 ();
463 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
464# if ISO_14755 500# if ISO_14755
465 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
466# endif 510# endif
467 return; 511 return;
468 } 512 }
469 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
470 { 514 {
… …
823 { 867 {
824#ifdef META8_OPTION 868#ifdef META8_OPTION
825 /* set 8-bit on */ 869 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
827 { 871 {
828 unsigned char *ch; 872 char *ch;
829 873
830 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 875 *ch |= 0x80;
832 876
833 meta = 0; 877 meta = 0;
… …
835#endif 879#endif
836 /* nil */ ; 880 /* nil */ ;
837 } 881 }
838 } 882 }
839 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
840 if (len <= 0) 887 if (len <= 0)
841 return; /* not mapped */ 888 return; /* not mapped */
842 889
843 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 891 if (view_start)
845 { 892 {
846 TermWin.view_start = 0; 893 view_start = 0;
847 want_refresh = 1; 894 want_refresh = 1;
848 } 895 }
849 896
850 /* 897 /*
851 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 913#ifdef META8_OPTION
867 && meta_char == C0_ESC 914 && meta_char == C0_ESC
868#endif 915#endif
869 ) 916 )
870 { 917 {
871 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
872 tt_write (&ch, 1); 919 tt_write (&ch, 1);
873 } 920 }
874 921
875#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */
877 unsigned char *p;
878 int i;
879
880 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
881 for (i = 0, p = kbuf; i < len; i++, p++)
882 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
883 fprintf (stderr, "'\n");
884#endif /* DEBUG_CMD */
885 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
886} 923}
887/*}}} */
888 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */
892unsigned int 1003unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 1005{
895 unsigned int n, s; 1006 unsigned int n, s;
896 1007
897 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 1046 }
936#endif 1047#endif
937 1048
938 if (want_refresh) 1049 if (want_refresh)
939 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
940 scr_refresh (refresh_type); 1089 scr_refresh ();
941 scrollbar_show (1); 1090 scrollbar_show (1);
942#ifdef USE_XIM 1091#ifdef USE_XIM
943 IMSendSpot (); 1092 IMSendSpot ();
944#endif 1093#endif
945 } 1094 }
… …
948} 1097}
949 1098
950void 1099void
951rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
952{ 1101{
953 SET_R (this); 1102 make_current ();
954 SET_LOCALE (locale);
955 1103
956 display->flush (); 1104 display->flush ();
957 1105
958 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1108}
961 1109
962void 1110void
963rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
964{ 1112{
965 SET_R (this); 1113 make_current ();
966 SET_LOCALE (locale);
967 1114
968 refresh_limit = 1; 1115 refresh_limit = 1;
969 refresh_count = 0; 1116 refresh_count = 0;
970 flush (); 1117 flush ();
971} 1118}
… …
975rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
976{ 1123{
977 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1125 want_refresh = 1;
979 1126
980 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
981} 1128}
982#endif 1129#endif
983 1130
984#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
985void 1132void
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1147{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1150 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1151 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1153 }
1008} 1154}
1009#endif 1155#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1160{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1162 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1164 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1166 }
1022} 1167}
1023#endif 1168#endif
… …
1028{ 1173{
1029 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1177 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1178 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1036 1180
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1181 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1183 }
1041} 1184}
1042#endif 1185#endif
1043 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1044bool 1212bool
1045rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1046{ 1214{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1216
1049 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1050 { 1218 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1220 n = 0;
1053 } 1221 }
1054 1222
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1058 1226
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1228
1061 if (n > 0) 1229 if (r > 0)
1062 { 1230 {
1063 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1064 return true; 1232 return true;
1065 } 1233 }
1066 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1067 destroy (); 1246 destroy ();
1247 }
1068 1248
1069 return false; 1249 return false;
1070} 1250}
1071 1251
1072void 1252void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1254{
1075 SET_R (this); 1255 make_current ();
1076 SET_LOCALE (locale);
1077 1256
1078 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1259 while (pty_fill ())
1081 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1086} 1265}
1087 1266
1088void 1267void
1089rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1090{ 1269{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1271 recolour_cursor ();
1093 1272
1094#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1274 hidden_pointer = 0;
1096 1275
1097 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1278#endif
1100} 1279}
1101 1280
1102#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1103void 1282void
1104rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1105{ 1284{
1106 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1107 return; 1286 return;
1108 1287
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1289 XFlush (dpy);
1111 1290
1112 hidden_pointer = 1; 1291 hidden_pointer = 1;
1113} 1292}
1114 1293
1115void 1294void
1116rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1117{ 1296{
1118 SET_R (this); 1297 make_current ();
1119 SET_LOCALE (locale);
1120 1298
1121 pointer_blank (); 1299 pointer_blank ();
1122} 1300}
1123#endif 1301#endif
1124 1302
… …
1189 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1190 (32 + x + 1), 1368 (32 + x + 1),
1191 (32 + y + 1)); 1369 (32 + y + 1));
1192} 1370}
1193 1371
1194#ifdef USING_W11LIB
1195void
1196rxvt_W11_process_x_event (XEvent *ev)
1197{
1198 rxvt_t *r = rxvt_get_r ();
1199
1200 x_cb (*ev);
1201}
1202#endif
1203
1204/*{{{ process an X event */ 1372/*{{{ process an X event */
1205void 1373void
1206rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1207{ 1375{
1208 dDisp; 1376 make_current ();
1209 1377
1210 SET_R (this); 1378 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1379
1213#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1383 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1384
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1388 unsigned int unused_mask;
1243 1389
1244 switch (ev.type) 1390 switch (ev.type)
1245 { 1391 {
1246 case KeyPress: 1392 case KeyPress:
1247#if ISO_14755 1393 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1394 break;
1253 1395
1254 case KeyRelease: 1396 case KeyRelease:
1255 { 1397 key_release (ev.xkey);
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
1315
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1320 mouse_slip_wheel_speed = 0;
1321#endif
1322 break; 1398 break;
1323 }
1324 1399
1325 case ButtonPress: 1400 case ButtonPress:
1326 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1327 break; 1402 break;
1328 1403
… …
1330 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1331 break; 1406 break;
1332 1407
1333 case ClientMessage: 1408 case ClientMessage:
1334 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1336 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1337 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1338 destroy (); 1419 destroy ();
1420 }
1339#if ENABLE_EWMH 1421#if ENABLE_EWMH
1340 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1342 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1343 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1344#endif 1437#endif
1345 } 1438 }
1346#if ENABLE_XEMBED
1347 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 {
1349 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1350 focus_in ();
1351 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1352 focus_out ();
1353 }
1354#endif
1355#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */
1357 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1358 && (ev.xclient.data.l[0] == DndFile
1359 || ev.xclient.data.l[0] == DndDir
1360 || ev.xclient.data.l[0] == DndLink))
1361 {
1362 /* Get Dnd data */
1363 Atom ActualType;
1364 int ActualFormat;
1365 unsigned char *data;
1366 unsigned long Size, RemainingBytes;
1367
1368 XGetWindowProperty (disp, display->root,
1369 xa[XA_DNDSELECTION],
1370 0L, 1000000L,
1371 False, AnyPropertyType,
1372 &ActualType, &ActualFormat,
1373 &Size, &RemainingBytes,
1374 &data);
1375 set_string_property (XA_CUT_BUFFER0, data);
1376 XFree (data);
1377 selection_paste (display->root, XA_CUT_BUFFER0, true);
1378 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1379 }
1380#endif /* OFFIX_DND */
1381 break; 1439 break;
1382 1440
1383 case MappingNotify: 1441 case MappingNotify:
1384 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1385 break; 1443 break;
… …
1408 break; 1466 break;
1409 } 1467 }
1410 break; 1468 break;
1411 1469
1412 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1413 focus_in (); 1474 focus_in ();
1414 break; 1475 break;
1415 1476
1416 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1417 focus_out (); 1481 focus_out ();
1418 break; 1482 break;
1419 1483
1420 case ConfigureNotify: 1484 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1422 { 1486 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ;
1432 1489
1433 if (szHint.width != width || szHint.height != height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1491 {
1435 seen_resize = 1; 1492 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1494 }
1438 1495
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1440 if (options & Opt_transparent) 1499 if (option (Opt_transparent))
1441 check_our_parents (); 1500 check_our_parents ();
1442#endif 1501#endif
1443 } 1502 }
1444 break; 1503 break;
1445 1504
1446 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1510
1451 break; 1511 break;
1452 1512
1453 case SelectionClear: 1513 case SelectionClear:
1454 selection_clear (); 1514 selection_clear ();
… …
1461 1521
1462 case SelectionRequest: 1522 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1464 break; 1524 break;
1465 1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break;
1533
1466 case UnmapNotify: 1534 case UnmapNotify:
1467 TermWin.mapped = 0; 1535 mapped = 0;
1468#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1470#endif 1538#endif
1471 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 TermWin.mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1540 break;
1479 1541
1480#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1481 case ReparentNotify: 1543 case ReparentNotify:
1482 rootwin_cb (ev); 1544 rootwin_cb (ev);
1483 break; 1545 break;
1484#endif /* TRANSPARENT */ 1546#endif /* TRANSPARENT */
1485 1547
1486 case GraphicsExpose: 1548 case GraphicsExpose:
1487 case Expose: 1549 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == vt)
1489 { 1551 {
1490 do 1552 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1494 1556
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1558
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1500 1562
1501 scr_refresh (refresh_type); 1563 want_refresh = 1;
1502 } 1564 }
1503 else 1565 else
1504 { 1566 {
1505 XEvent unused_event; 1567 XEvent unused_event;
1506 1568
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1508 ; 1570 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1572 ;
1511 1573
1512 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1513 { 1575 {
1514 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1515 scrollbar_show (0); 1577 scrollbar_show (0);
1516 } 1578 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1579
1522#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1525#endif 1583#endif
1526 } 1584 }
1527 break; 1585 break;
1528 1586
1529 case MotionNotify: 1587 case MotionNotify:
1530#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1589 if (hidden_pointer)
1532 pointer_unblank (); 1590 pointer_unblank ();
1533#endif 1591#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1593 break;
1543 1594
1544 if (ev.xany.window == TermWin.vt) 1595 if (ev.xany.window == vt)
1545 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1601 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1549 ; 1603 ;
1550 1604
1551 XQueryPointer (disp, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1552 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1609 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1568#endif 1622#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1625
1572#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1629 {
1576 int dist; 1630 int dist;
1577 1631
1578 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1644
1591 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1593 { 1647 {
1594 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1596 } 1650 }
1597 else 1651 else
1598 { 1652 {
1599 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1654 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1655 }
1602 1656
1603 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1659 + 1;
1606 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1608 } 1662 }
1609 else 1663 else
1610 { 1664 {
1611 /* we are within the text window, so we 1665 /* we are within the text window, so we
… …
1620#endif 1674#endif
1621 } 1675 }
1622 } 1676 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1624 { 1678 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1627 ; 1681 ;
1628 1682
1629 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1687 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1689 scrollbar_size ());
1636 scr_refresh (refresh_type); 1690 want_refresh = 1;
1637 refresh_limit = 0; 1691 refresh_limit = 0;
1638 scrollbar_show (1); 1692 scrollbar_show (1);
1639 } 1693 }
1640 break; 1694 break;
1641 } 1695 }
1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1642} 1723}
1643 1724
1644void 1725void
1645rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1646{ 1727{
1647 if (!TermWin.focus) 1728 if (!focus)
1648 { 1729 {
1649 TermWin.focus = 1; 1730 focus = 1;
1650 want_refresh = 1; 1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1651#ifdef USE_XIM 1735#if USE_XIM
1652 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1653 { 1737 {
1654 IMSetStatusPosition (); 1738 IMSetPosition ();
1655 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1656 } 1740 }
1657#endif 1741#endif
1658#ifdef CURSOR_BLINK 1742#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1743 if (option (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1745#endif
1662#ifdef OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1664 { 1748 {
1665 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1750 scr_recolour ();
1667 } 1751 }
1668#endif 1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif
1669 } 1766 }
1670} 1767}
1671 1768
1672void 1769void
1673rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1674{ 1771{
1675 if (TermWin.focus) 1772 if (focus)
1676 { 1773 {
1677 TermWin.focus = 0; 1774 focus = 0;
1678 want_refresh = 1; 1775 want_refresh = 1;
1679 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1680#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1681 iso14755buf = 0; 1782 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1784 scr_overlay_off ();
1685#endif 1785# endif
1786 }
1787#endif
1686#ifdef USE_XIM 1788#if USE_XIM
1687 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1689#endif 1791#endif
1690#ifdef CURSOR_BLINK 1792#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1793 if (option (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1795 hidden_cursor = 0;
1694#endif 1796#endif
1695#ifdef OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
1697 { 1799 {
1698 pix_colors = pix_colors_unfocused; 1800 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1801 scr_recolour ();
1700 } 1802 }
1701#endif 1803#endif
1702 } 1804 }
1703} 1805}
1704 1806
1705#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1706void 1821void
1707rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1823{
1709 SET_R (this); 1824 make_current ();
1710 SET_LOCALE (locale);
1711 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1712 switch (ev.type) 1831 switch (ev.type)
1713 { 1832 {
1714 case PropertyNotify: 1833 case PropertyNotify:
1715 /* 1834 /*
1716 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1840 return;
1722 1841
1723 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1724 case ReparentNotify: 1843 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1727 break; 1846 break;
1728 } 1847 }
1848# endif
1729} 1849}
1730#endif 1850#endif
1731 1851
1732void 1852void
1733rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1734{ 1854{
1735 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1736 1856
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1738 if (!bypass_keystate) 1859 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1861
1741 /* 1862 /*
1742 * VT window processing of button press 1863 * VT window processing of button press
1743 */ 1864 */
1744 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1745 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1746#if ISO_14755 1870#if ISO_14755
1747 // 5.4 1871 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1873 {
1750 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1764 { 1888 {
1765 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1766 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1767 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1768 { 1893 {
1769 /* only report double clicks */ 1894 /* only report double clicks */
1770 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1771 mouse_report (ev); 1896 mouse_report (ev);
… …
1803#else 1928#else
1804 selection.rect = false; 1929 selection.rect = false;
1805#endif 1930#endif
1806 1931
1807 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1934 {
1810 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1812 else 1937 else
1813 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1954 case Button3: 2079 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2080 if (scrollBar.style != R_SB_XTERM)
1956 { 2081 {
1957 if (scrollbar_above_slider (ev.y)) 2082 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2084 scr_page (UP, nrow - 1);
1960# else 2085# else
1961 scr_page (UP, TermWin.nrow / 4); 2086 scr_page (UP, nrow / 4);
1962# endif 2087# endif
1963 else if (scrollbar_below_slider (ev.y)) 2088 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2089# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2090 scr_page (DN, nrow - 1);
1966# else 2091# else
1967 scr_page (DN, TermWin.nrow / 4); 2092 scr_page (DN, nrow / 4);
1968# endif 2093# endif
1969 else 2094 else
1970 scrollBar.setMotion (); 2095 scrollBar.setMotion ();
1971 } 2096 }
1972 else 2097 else
1973 { 2098 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2099 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2100 (nrow
1976 * scrollbar_position (ev.y) 2101 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2102 / scrollbar_size ()));
1978 } 2103 }
1979 2104
1980 break; 2105 break;
1981 } 2106 }
1982 } 2107 }
2108
1983 return; 2109 return;
1984 } 2110 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2111}
1993 2112
1994void 2113void
1995rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1996{ 2115{
… …
2002 2121
2003 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2004 { 2123 {
2005 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2006 scrollbar_show (0); 2125 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2126 }
2011 2127
2012#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2015#endif 2131#endif
2016 2132
2017 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
2018 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2019#if ISO_14755 2138#if ISO_14755
2020 // 5.4 2139 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2141 return;
2023#endif 2142#endif
2143
2024 if (reportmode) 2144 if (reportmode)
2025 { 2145 {
2026 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2058 { 2178 {
2059 case Button1: 2179 case Button1:
2060 case Button3: 2180 case Button3:
2061 selection_make (ev.time); 2181 selection_make (ev.time);
2062 break; 2182 break;
2183
2063 case Button2: 2184 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2065 break; 2187 break;
2188
2066#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2067 case Button4: 2190 case Button4:
2068 case Button5: 2191 case Button5:
2069 { 2192 {
2070 int i; 2193 int i;
… …
2072 2195
2073 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2074 2197
2075 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2076 i = 1; 2199 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2201 i = nrow - 1;
2079 else 2202 else
2080 i = 5; 2203 i = 5;
2081 2204
2082# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
2084 { 2207 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2086 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;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2211
2089 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2214
2092 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2093 } 2216 }
2094 else 2217 else
2095 { 2218 {
2096# endif 2219# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2220 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2221 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2110 } 2223 }
2111#endif 2224# endif
2112 } 2225 }
2113 break; 2226 break;
2114#endif 2227#endif
2115 } 2228 }
2116 } 2229 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2230}
2122 2231
2123#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2124#if TINTING 2233#if TINTING
2125/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2126 2235
2127typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2128 2237
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{ 2239{
2131 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i; 2245 int i;
2137 2246
2138 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2139 2248
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141 2250
2142 /* for convenience */ 2251 /* for convenience */
2143 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2364 Atom atype; 2473 Atom atype;
2365 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2366 Window root, oldp, *list; 2475 Window root, oldp, *list;
2367 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370 2478
2371 pchanged = 0; 2479 pchanged = 0;
2372 2480
2373 if (!(options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2375 2483
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2378 2486
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2380 2488
2381 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2382 { 2490 {
2383 if (am_transparent) 2491 if (am_transparent)
2384 { 2492 {
2385 pchanged = 1; 2493 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2388 } 2496 }
2389 2497
2390 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2391 } 2499 }
2392 2500
2393 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False); 2502 XSync (dpy, False);
2395 2503
2396 /* 2504 /*
2397 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2400 */ 2508 */
2401 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2405 2513
2406 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2411 2519
2412 if (!i || prop == NULL 2520 if (!i || prop == NULL
2413#if TINTING 2521#if TINTING
2414 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2415#endif 2523#endif
2416 ) 2524 )
2417 have_pixmap = 0; 2525 have_pixmap = 0;
2418 else 2526 else
2419 { 2527 {
… …
2432 Window cr; 2540 Window cr;
2433 XImage *image; 2541 XImage *image;
2434 GC gc; 2542 GC gc;
2435 XGCValues gcvalue; 2543 XGCValues gcvalue;
2436 2544
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2549 nx = ny = 0;
2442 2550
… …
2452 nh += sy; 2560 nh += sy;
2453 ny = -sy; 2561 ny = -sy;
2454 sy = 0; 2562 sy = 0;
2455 } 2563 }
2456 2564
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2567
2460 XSync (disp, False); 2568 XSync (dpy, False);
2461 allowedxerror = -1; 2569 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2571
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2466 allowedxerror = 0; 2574 allowedxerror = 0;
2467 2575
2468 if (image == NULL) 2576 if (image == NULL)
2469 { 2577 {
2470 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2471 { 2579 {
2472 pchanged = 1; 2580 pchanged = 1;
2473 if (TermWin.pixmap != None) 2581 if (pixmap != None)
2474 { 2582 {
2475 XFreePixmap (disp, TermWin.pixmap); 2583 XFreePixmap (dpy, pixmap);
2476 TermWin.pixmap = None; 2584 pixmap = None;
2477 } 2585 }
2478 } 2586 }
2479 2587
2480 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2481 } 2589 }
2482 else 2590 else
2483 { 2591 {
2484 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2593 XFreePixmap (dpy, pixmap);
2486 2594
2487#if TINTING 2595#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2597 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492 2599
2600 rgba c;
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2494 2602
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2496 } 2604 }
2497#endif 2605#endif
2498 2606
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2505 XDestroyImage (image); 2612 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2614 XClearWindow (dpy, parent[0]);
2508 2615
2509 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2617 pchanged = 1;
2511 2618
2512 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2513 } 2620 }
2514 } 2621 }
2515 2622
2516 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 else 2625 else
2519 { 2626 {
2520 unsigned int n; 2627 unsigned int n;
2521 /* 2628 /*
2522 * InheritPixmap transparency 2629 * InheritPixmap transparency
2523 */ 2630 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2632 {
2526 oldp = TermWin.parent[i]; 2633 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2528 &TermWin.parent[i], &list, &n);
2529 XFree (list); 2635 XFree (list);
2530 2636
2531 if (TermWin.parent[i] == display->root) 2637 if (parent[i] == display->root)
2532 { 2638 {
2533 if (oldp != None) 2639 if (oldp != None)
2534 pchanged = 1; 2640 pchanged = 1;
2535 2641
2536 break; 2642 break;
2537 } 2643 }
2538 2644
2539 if (oldp != TermWin.parent[i]) 2645 if (oldp != parent[i])
2540 pchanged = 1; 2646 pchanged = 1;
2541 } 2647 }
2542 2648
2543 n = 0; 2649 n = 0;
2544 2650
2545 if (pchanged) 2651 if (pchanged)
2546 {
2547 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2548 { 2653 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2657 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2659 break;
2554 } 2660 }
2555 } 2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2556 } 2664 {
2557
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2559 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2667 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2564 } 2669 }
2565 else 2670 else
2566 { 2671 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2573 { 2673 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2675 XClearWindow (dpy, parent[n]);
2576 } 2676 }
2577 2677
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 am_transparent = 1; 2679 am_transparent = 1;
2580 } 2680 }
2581 2681
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2683 parent[i] = None;
2584 } 2684 }
2585 2685
2586 if (scrollBar.win) 2686 if (scrollBar.win)
2587 { 2687 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2590 scrollbar_show (0); 2690 scrollbar_show (0);
2591 } 2691 }
2592 2692
2593 if (am_transparent) 2693 if (am_transparent)
… …
2605 2705
2606bool 2706bool
2607rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2608{ 2708{
2609 bool flag = false; 2709 bool flag = false;
2610 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2612 2712
2613 for (;;) 2713 for (;;)
2614 { 2714 {
2615 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2616 { 2716 {
2617 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2718 ch = next_char ();
2619 }
2620 2719
2621 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2622 break; 2721 break;
2722 }
2623 2723
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2725 {
2626 if (!seen_input) 2726 if (!seen_input)
2627 { 2727 {
… …
2636 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2638 } 2738 }
2639 2739
2640 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2742 bool refreshnow = false;
2643 int nlines = 0; 2743 int nlines = 0;
2644 unicode_t *str = buf; 2744 wchar_t *str = buf;
2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2746
2646 for (;;) 2747 for (;;)
2647 { 2748 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2750 break;
2650 2751
2651 *str++ = ch; 2752 *str++ = ch;
2652 2753
2653 if (ch == C0_LF) 2754 if (ch == C0_LF || str >= eol)
2654 { 2755 {
2756 if (ch == C0_LF)
2655 nlines++; 2757 nlines++;
2758
2656 refresh_count++; 2759 refresh_count++;
2657 2760
2658 if (!(options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2763 {
2661 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2662 ch = NOCHAR; 2766 ch = NOCHAR;
2663 break; 2767 break;
2664 } 2768 }
2665 2769
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2771 if (nlines >= nrow - 1)
2668 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2669 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2670 nlines = 0; 2777 nlines = 0;
2671 str = buf; 2778 str = buf;
2779 eol = str + min (ncol, UBUFSIZ);
2672 } 2780 }
2673 }
2674 2781
2675 if (str >= buf + UBUFSIZ) 2782 if (str >= eol)
2676 { 2783 {
2784 if (eol >= buf + UBUFSIZ)
2785 {
2677 ch = NOCHAR; 2786 ch = NOCHAR;
2678 break; 2787 break;
2788 }
2789 else
2790 eol = min (eol + ncol, buf + UBUFSIZ);
2791 }
2792
2679 } 2793 }
2680 2794
2681 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2796 ch = next_char ();
2683 } 2797 }
2684 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2685 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2686 2802
2687 /* 2803 /*
2688 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2689 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2690 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2808 */
2693 if (refreshnow) 2809 if (refreshnow)
2694 { 2810 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2812 refresh_limit++;
2697 else 2813 else
2698 { 2814 {
2699 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2700 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2701 } 2819 }
2702 } 2820 }
2703 2821
2704 } 2822 }
2705 else 2823 else
… …
2720 } 2838 }
2721 2839
2722 return flag; 2840 return flag;
2723} 2841}
2724 2842
2725// read the next octet
2726unicode_t
2727rxvt_term::next_octet ()
2728{
2729 return cmdbuf_ptr < cmdbuf_endp
2730 ? *cmdbuf_ptr++
2731 : NOCHAR;
2732}
2733
2734// read the next character 2843// read the next character
2735unicode_t 2844wchar_t
2736rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2737{ 2846{
2738 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2739 { 2848 {
2740 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2741 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2742 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2743 2852
2744 wchar_t wc; 2853 wchar_t wc;
2745 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2854 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2746 2855
2747 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2748 { 2857 {
2749 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2750 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2751 break; 2860 break;
2752 } 2861 }
2753 2862
2754 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2756 2865
2757 // assume wchar == unicode 2866 // assume wchar == unicode
2758 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2759 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2760 } 2869 }
2761 2870
2762 return NOCHAR; 2871 return NOCHAR;
2763} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2764 2884
2765/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2766/* 2886/*
2767 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2768 * to the command. 2888 * to the command.
2769 */ 2889 */
2770unicode_t 2890wchar_t
2771rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2772{ 2892{
2773 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2774 2894
2775 if (c == NOCHAR) 2895 if (c == NOCHAR)
2776 throw out_of_input; 2896 throw out_of_input;
2777 2897
2778 return c; 2898 return c;
2779} 2899}
2780 2900
2781unicode_t 2901uint32_t
2782rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2783{ 2903{
2784 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2785 2905
2786 if (c == NOCHAR) 2906 if (c == NOCHAR)
2787 throw out_of_input; 2907 throw out_of_input;
2788 2908
2789 return c; 2909 return c;
… …
2889 case C0_ESC: 3009 case C0_ESC:
2890 process_escape_seq (); 3010 process_escape_seq ();
2891 break; 3011 break;
2892 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2893 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2896 else 3015 else
2897 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2898 (unsigned int)strlen (VT100_ANS));
2899 break; 3017 break;
2900 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2901 scr_bell (); 3019 scr_bell ();
2902 break; 3020 break;
2903 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
3027 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3028 break; 3146 break;
3029 case '+': 3147 case '+':
3030 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3031 break; 3149 break;
3032#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3033 case '6': 3151 case '6':
3034 scr_backindex (); 3152 scr_backindex ();
3035 break; 3153 break;
3036#endif 3154#endif
3037 case '7': 3155 case '7':
3038 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3039 break; 3157 break;
3040 case '8': 3158 case '8':
3041 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3042 break; 3160 break;
3043#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3044 case '9': 3162 case '9':
3045 scr_forwardindex (); 3163 scr_forwardindex ();
3046 break; 3164 break;
3047#endif 3165#endif
3048 case '=': 3166 case '=':
… …
3058 break; 3176 break;
3059 3177
3060 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3061 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3062 { 3180 {
3063 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3064 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3065 } 3183 }
3066 break; 3184 break;
3067 3185
3068 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3069 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3091 process_dcs_seq (); 3209 process_dcs_seq ();
3092 break; 3210 break;
3093 3211
3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3095 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
3096 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3098 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
3099 3216
3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3101 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
3102 process_csi_seq (); 3219 process_csi_seq ();
… …
3211 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3212 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3213 if (arg[p] == -1) 3330 if (arg[p] == -1)
3214 arg[p] = ndef; 3331 arg[p] = ndef;
3215 3332
3216#ifdef DEBUG_CMD
3217 fprintf (stderr, "CSI ");
3218 for (p = 0; p < nargs; p++)
3219 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3220 fprintf (stderr, "%c\n", ch);
3221#endif
3222
3223 /* 3333 /*
3224 * private mode handling 3334 * private mode handling
3225 */ 3335 */
3226 if (priv) 3336 if (priv)
3227 { 3337 {
3228 switch (priv) 3338 switch (priv)
3229 { 3339 {
3230 case '>': 3340 case '>':
3231 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3232 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3233 break; 3352 break;
3234 case '?': 3353 case '?':
3235 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3236 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3237 break; 3356 break;
… …
3342 3461
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3462 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3463 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3464 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3467 break;
3349 3468
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3352 (unsigned int) (sizeof (VT100_ANS) - 1));
3353 break; 3471 break;
3354 3472
3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3356 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3357 break; 3475 break;
… …
3364 break; 3482 break;
3365 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3366 scr_report_position (); 3484 scr_report_position ();
3367 break; 3485 break;
3368 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3487 if (option (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3489 break;
3372 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3492 break;
… …
3441 break; 3559 break;
3442 case CSI_75: 3560 case CSI_75:
3443 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3444 break; 3562 break;
3445 3563
3446#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3447 case CSI_74: 3565 case CSI_74:
3448 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3449 break; 3567 break;
3450#endif 3568#endif
3451 3569
… …
3458 break; 3576 break;
3459 } 3577 }
3460} 3578}
3461/*}}} */ 3579/*}}} */
3462 3580
3463#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3464/* ARGSUSED */ 3582/* ARGSUSED */
3465void 3583void
3466rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3467{ 3585{
3468 int x, y; 3586 int x, y;
3469 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3470 Window wdummy; 3588 Window wdummy;
3471 dDisp; 3589
3590 dLocal (Display *, dpy);
3472 3591
3473 if (nargs == 0) 3592 if (nargs == 0)
3474 return; 3593 return;
3475 3594
3476 switch (args[0]) 3595 switch (args[0])
3477 { 3596 {
3478 /* 3597 /*
3479 * commands 3598 * commands
3480 */ 3599 */
3481 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3601 XMapWindow (dpy, parent[0]);
3483 break; 3602 break;
3484 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3486 break; 3605 break;
3487 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3489 break; 3608 break;
3490 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3611 break;
3493 case 5: /* raise window */ 3612 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3495 break; 3614 break;
3496 case 6: /* lower window */ 3615 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3498 break; 3617 break;
3499 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3500 scr_touch (true); 3619 scr_touch (true);
3501 break; 3620 break;
3502 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3622 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3623 (unsigned int) (args[1] * fheight));
3505 break; 3624 break;
3506 3625
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3626 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3627 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3629 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3512 break; 3631 break;
3513
3514 3632
3515 /* 3633 /*
3516 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3517 */ 3635 */
3518 case 11: /* report window state */ 3636 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3639 break;
3522 case 13: /* report window position */ 3640 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3646 break;
3529 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3650 break;
3533 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3653 break;
3536 case 19: /* report window size (chars) */ 3654 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3656 break;
3539 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3540 { 3658 {
3541 char *s; 3659 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3662 XFree (s);
3545 } 3663 }
3546 break; 3664 break;
3547 case 21: /* report window title */ 3665 case 21: /* report window title */
3548 { 3666 {
3549 char *s; 3667 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3670 XFree (s);
3553 } 3671 }
3554 break; 3672 break;
3555 } 3673 }
3556} 3674}
… …
3559/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3560/* 3678/*
3561 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3562 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3563 */ 3681 */
3564unsigned char * 3682char *
3565rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3566{ 3684{
3567 unicode_t ch; 3685 unicode_t ch;
3568 bool seen_esc = false; 3686 bool seen_esc = false;
3569 unsigned int n = 0; 3687 unsigned int n = 0;
… …
3583 seen_esc = true; 3701 seen_esc = true;
3584 continue; 3702 continue;
3585 } 3703 }
3586 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3587 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3588 else if (ch < 0x20) 3708 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3590 3710
3591 seen_esc = false; 3711 seen_esc = false;
3592 3712
3593 if (n >= sizeof (string) - 1) 3713 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3714 // stop at some sane length
3595 return NULL; 3715 return NULL;
3596 3716
3597 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 ();
3599 else
3600 string[n++] = ch; 3717 string[n++] = ch;
3601 } 3718 }
3602 3719
3603 string[n++] = '\0'; 3720 string[n++] = '\0';
3604 3721
3605 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3606 3723
3607 return (unsigned char *)rxvt_wcstombs (string); 3724 return rxvt_wcstombs (string);
3608} 3725}
3609 3726
3610/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3611/* 3728/*
3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3729 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3613 */ 3730 */
3614void 3731void
3615rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3616{ 3733{
3617 unsigned char *s; 3734 char *s;
3618 unicode_t eh; 3735 unicode_t eh;
3619 3736
3620 /* 3737 /*
3621 * Not handled yet 3738 * Not handled yet
3622 */ 3739 */
… …
3641 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3642 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3643 3760
3644 if (ch == ';') 3761 if (ch == ';')
3645 { 3762 {
3646 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3647 3764
3648 if (s) 3765 if (s)
3649 { 3766 {
3650 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3651 free (s); 3768 free (s);
3652 } 3769 }
3653 } 3770 }
3654} 3771}
3655 3772
3656void 3773void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3658{ 3775{
3659 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3660 { 3777 {
3661 unsigned short r, g, b; 3778 rgba c;
3662 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3663 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3664 } 3787 }
3665 else 3788 else
3666 set_window_color (color, str); 3789 set_window_color (color, str);
3667} 3790}
3668 3791
3669/* 3792/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 */ 3794 */
3672void 3795void
3673rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3674{ 3797{
3675 int changed = 0;
3676 int color; 3798 int color;
3677 char *buf, *name; 3799 char *buf, *name;
3678 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3679 int saveop = op; 3801 int saveop = op;
3680 dDisp; 3802
3803 dLocal (Display *, dpy);
3681 3804
3682 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3683 switch (op) 3810 switch (op)
3684 { 3811 {
3685 case XTerm_name: 3812 case XTerm_name:
3686 set_title (str); 3813 set_title (str);
3687 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3701 unsigned long bytes_after; 3828 unsigned long bytes_after;
3702 unsigned char *value = 0; 3829 unsigned char *value = 0;
3703 const char *str = ""; 3830 const char *str = "";
3704 3831
3705 if (prop 3832 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None 3837 && actual_type != None
3711 && actual_format == 8) 3838 && actual_format == 8)
3712 str = (const char *)(value); 3839 str = (const char *)(value);
3713 3840
3714 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3715 3842
3716 XFree (value); 3843 XFree (value);
3717 } 3844 }
3718 else 3845 else
3719 { 3846 {
… …
3723 { 3850 {
3724 *eq = 0; 3851 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3726 } 3853 }
3727 else 3854 else
3728 XDeleteProperty (disp, TermWin.parent[0], 3855 XDeleteProperty (dpy, parent[0],
3729 display->atom (str)); 3856 display->atom (str));
3730 } 3857 }
3731 break; 3858 break;
3732 3859
3733 case XTerm_Color: 3860 case XTerm_Color:
… …
3735 { 3862 {
3736 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3737 break; 3864 break;
3738 3865
3739 *name++ = '\0'; 3866 *name++ = '\0';
3740 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3741 3868
3742 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3743 break; 3870 break;
3744 3871
3745 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3746 *buf++ = '\0'; 3873 *buf++ = '\0';
3747 3874
3748 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3749 {
3750 unsigned short r, g, b;
3751 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3752 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3753 }
3754 else
3755 set_window_color (color + minCOLOR, name);
3756 } 3876 }
3757 break; 3877 break;
3758 case XTerm_Color00: 3878 case XTerm_Color00:
3759 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3760 break; 3880 break;
3761 case XTerm_Color01: 3881 case XTerm_Color01:
3762 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3763 break; 3883 break;
3764#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3765 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3766 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3767 break; 3887 break;
3768#endif 3888#endif
3769 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3770 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3771 break; 3891 break;
3772 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3773 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3774 break; 3894 break;
3775#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3776 case XTerm_Color_BD:
3777 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3778 break;
3779 case XTerm_Color_UL:
3780 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3781 break;
3782 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3783 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3784 break; 3906 break;
3785 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3786 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3787 break; 3909 break;
3788#endif 3910#endif
3789#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3790 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3791 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3792 check_our_parents (); 3915 check_our_parents ();
3916
3793 if (am_transparent) 3917 if (am_transparent)
3794 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3795 break;
3796#endif
3797 3919
3920 break;
3921#endif
3922
3798 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3799 if (*str != ';') 3925 if (*str != ';')
3800 { 3926 {
3801#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3802 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3803 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3804#endif
3805 scr_touch (true); 3930 scr_touch (true);
3931#endif
3806 } 3932 }
3933
3934 int changed = 0;
3935
3807 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3808 { 3937 {
3809 str++; 3938 str++;
3810#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3811 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3812#endif 3941#endif
3813 } 3942 }
3814 3943
3815 if (changed) 3944 if (changed)
3816 { 3945 {
3817#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3818 resize_pixmap (); 3947 resize_pixmap ();
3819#endif
3820 scr_touch (true); 3948 scr_touch (true);
3949#endif
3821 } 3950 }
3951 }
3822 break; 3952 break;
3823 3953
3824 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3825 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3826 break; 3956 break;
3827 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3828 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3829 break; 3959 break;
3830 3960
3831 case XTerm_logfile: 3961 case XTerm_logfile:
3832 // TODO, when secure mode? 3962 // TODO, when secure mode?
3833 break; 3963 break;
3834 3964
3835#ifdef MENUBAR
3836 case URxvt_Menu:
3837 if (options & Opt_insecure)
3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3839 break;
3840#endif
3841#if 0 3965#if 0
3842 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3843 { 3967 {
3844 int fd; 3968 int fd;
3845 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3846 { 3970 {
3847 scr_dump (fd); 3971 scr_dump (fd);
… …
3858 case URxvt_italicFont: 3982 case URxvt_italicFont:
3859 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3860#endif 3984#endif
3861 if (query) 3985 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3865 resp); 3989 resp);
3866 else 3990 else
3867 { 3991 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869 3993
… …
3871 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3872 set_fonts (); 3996 set_fonts ();
3873 } 3997 }
3874 break; 3998 break;
3875 3999
3876#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
3877 case URxvt_locale: 4009 case URxvt_locale:
3878 if (query) 4010 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3880 else 4012 else
3881 { 4013 {
3882 set_locale (str); 4014 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3884 init_xlocale (); 4016 init_xlocale ();
3885 } 4017 }
3886 break; 4018 break;
3887 4019
3888 case URxvt_view_up: 4020 case URxvt_view_up:
3889 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3890 int lines = atoi (str); 4023 int lines = atoi (str);
3891 4024
3892 if (lines) 4025 if (lines)
3893 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894 else 4027 else
3895 {
3896 scr_erase_savelines (); 4028 scr_erase_savelines ();
3897 } 4029 }
3898 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet
3899 break; 4038 break;
3900#endif 4039#endif
3901 } 4040 }
3902} 4041}
3903/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3934 return state; 4073 return state;
3935} 4074}
3936 4075
3937/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3938void 4077void
3939rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3940{ 4079{
3941 unsigned int i, j; 4080 unsigned int i, j;
3942 int state; 4081 int state;
3943 4082
3944 static const struct 4083 static const struct
… …
3955 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3956 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3957 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
3958 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
3959 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3960#ifdef menuBar_esc
3961 { menuBar_esc, PrivMode_menuBar },
3962#endif
3963 // 18, 19 printing-related 4099 // 18, 19 printing-related
3964 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
3965#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3966 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3967#endif 4103#endif
… …
4012 } 4148 }
4013 4149
4014 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4015 switch (arg[i]) 4151 switch (arg[i])
4016 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
4017 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4018 case 1049: 4161 case 1049:
4019 if (options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
4020 if (mode == 0) 4163 if (mode == 0)
4021 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4022 else if (mode == 1) 4165 else if (mode == 1)
4023 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4024 break; 4167 break;
… …
4036 */ 4179 */
4037 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
4038 break; 4181 break;
4039 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4040 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4042 break; 4185 break;
4043 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4044 if (state)
4045 options &= ~Opt_jumpScroll;
4046 else
4047 options |= Opt_jumpScroll; 4187 set_option (Opt_jumpScroll, !state);
4048 break; 4188 break;
4049 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4050 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4051 break; 4191 break;
4052 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4058 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4059 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4060 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4061 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4062 break; 4202 break;
4063#ifdef menuBar_esc
4064 case menuBar_esc:
4065#ifdef MENUBAR
4066 map_menuBar (state);
4067#endif
4068 break;
4069#endif
4070#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4071 case scrollBar_esc: 4204 case scrollBar_esc:
4072 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4073 { 4206 {
4074 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4093#if 0 4226#if 0
4094 case 1001: 4227 case 1001:
4095 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4096#endif 4229#endif
4097 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4098 if (state)
4099 options &= ~Opt_scrollTtyOutput;
4100 else
4101 options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
4102 break; 4232 break;
4103 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4104 if (state)
4105 options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
4106 else
4107 options &= ~Opt_scrollTtyKeypress;
4108 break; 4235 break;
4109 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4110 if (options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
4111 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4112 scr_erase_screen (2); 4239 scr_erase_screen (2);
4113 scr_change_screen (state); 4240 scr_change_screen (state);
4114 break; 4241 break;
4115 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4116 scr_change_screen (state); 4243 scr_change_screen (state);
4117 if (options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
4118 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4119 scr_erase_screen (2); 4246 scr_erase_screen (2);
4120 break; 4247 break;
4121 default: 4248 default:
4122 break; 4249 break;
… …
4250 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4251 break; 4378 break;
4252 4379
4253 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4254 4381
4255#ifndef NO_BRIGHTCOLOR 4382#if !ENABLE_MINIMAL
4256 case 90: 4383 case 90:
4257 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4258 case 92: 4385 case 92:
4259 case 93: 4386 case 93:
4260 case 94: 4387 case 94:
… …
4272 case 106: 4399 case 106:
4273 case 107: 4400 case 107:
4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4275 break; 4402 break;
4276#endif 4403#endif
4277
4278 } 4404 }
4279 } 4405 }
4280} 4406}
4281/*}}} */ 4407/*}}} */
4282 4408
… …
4306 */ 4432 */
4307void 4433void
4308rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
4309{ 4435{
4310 va_list arg_ptr; 4436 va_list arg_ptr;
4311 unsigned char buf[256]; 4437 char buf[256];
4312 4438
4313 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
4314 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4315 va_end (arg_ptr); 4441 va_end (arg_ptr);
4316 tt_write (buf, strlen (buf)); 4442 tt_write (buf, strlen (buf));
… …
4321 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
4322 */ 4448 */
4323const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4324 4450
4325void 4451void
4326rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4327{ 4453{
4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
4456
4457 if (pty->pty < 0)
4458 return;
4459
4328 if (v_buflen == 0) 4460 if (v_buflen == 0)
4329 { 4461 {
4330 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4331 4463
4332 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4333 return; 4465 return;
4334 4466
4335 data += written; 4467 data += written;
4336 len -= written; 4468 len -= written;
4337 } 4469 }
4338 4470
4339 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4340 4472
4341 memcpy (v_buffer + v_buflen, data, len); 4473 memcpy (v_buffer + v_buflen, data, len);
4342 v_buflen += len; 4474 v_buflen += len;
4343 4475
4344 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4345} 4477}
4346 4478
4347void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4348{ 4480{
4349 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4350 4482
4351 if (written > 0) 4483 if (written > 0)
4352 { 4484 {
4353 v_buflen -= written; 4485 v_buflen -= written;
4354 4486
… …
4363 } 4495 }
4364 4496
4365 memmove (v_buffer, v_buffer + written, v_buflen); 4497 memmove (v_buffer, v_buffer + written, v_buflen);
4366 } 4498 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this... 4500 pty_ev.set (EVENT_READ);
4369 destroy ();
4370} 4501}
4371 4502
4372/*----------------------- end-of-file (C source) -----------------------*/ 4503/*----------------------- end-of-file (C source) -----------------------*/
4373 4504

Diff Legend

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