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.211 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.338 by ayin, Tue Jul 31 17:39:39 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)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(-view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
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, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
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
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 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);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */
275void 303void
276rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
277{ 305{
278 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
279 unsigned int newlen; 307 unsigned int newlen;
280 KeySym keysym; 308 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 309 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
286 316
287 /* 317 /*
288 * 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
289 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
290 * 320 *
… …
308 Status status_return; 338 Status status_return;
309 339
310#if 0 340#if 0
311#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
312 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
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
315 else 345 else
316#endif 346#endif
317#endif 347#endif
318 { 348 {
… …
355 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
356 } 386 }
357 else 387 else
358#endif 388#endif
359 { 389 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
362 } 392 }
363 393
364 if (valid_keysym) 394 if (valid_keysym)
365 { 395 {
… …
417 scr_move_to (0, 1); 447 scr_move_to (0, 1);
418 return; 448 return;
419 } 449 }
420 else if (keysym == XK_End) 450 else if (keysym == XK_End)
421 { 451 {
422 scr_move_to (1, 0); 452 scr_move_to (1, 1);
423 return; 453 return;
424 } 454 }
425 } 455 }
426#endif 456#endif
427 } 457 }
… …
438 { 468 {
439 switch (keysym) 469 switch (keysym)
440 { 470 {
441 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
444 return; 474 return;
445#if TODO 475#if TODO
446 /* rxvt extras */ 476 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
467 { 497 {
468 commit_iso14755 (); 498 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
470# if ISO_14755 500# if ISO_14755
471 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);
472# endif 510# endif
473 return; 511 return;
474 } 512 }
475 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
476 { 514 {
… …
481# endif 519# endif
482 return; 520 return;
483 } 521 }
484 else 522 else
485 { 523 {
486# if ENABLE_OVERLAY 524# if ISO_14755
487 scr_overlay_off (); 525 scr_overlay_off ();
488# endif 526# endif
489 iso14755buf = 0; 527 iso14755buf = 0;
490 } 528 }
491 } 529 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
495 { 533 {
496 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 535# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 538# endif
501 } 539 }
502#endif 540#endif
503 541
504#ifdef PRINTPIPE 542#ifdef PRINTPIPE
505 if (keysym == XK_Print) 543 if (keysym == XK_Print)
506 { 544 {
507 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
508 return; 546 return;
… …
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
694 732
695#ifdef XK_KP_End 733#ifdef XK_KP_Insert
696 case XK_KP_Insert: 734 case XK_KP_Insert:
697 /* allow shift to override */ 735 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 { 737 {
700 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
829 { 867 {
830#ifdef META8_OPTION 868#ifdef META8_OPTION
831 /* set 8-bit on */ 869 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
833 { 871 {
834 unsigned char *ch; 872 char *ch;
835 873
836 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 875 *ch |= 0x80;
838 876
839 meta = 0; 877 meta = 0;
… …
841#endif 879#endif
842 /* nil */ ; 880 /* nil */ ;
843 } 881 }
844 } 882 }
845 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
846 if (len <= 0) 887 if (len <= 0)
847 return; /* not mapped */ 888 return; /* not mapped */
848 889
849 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 891 if (view_start)
851 { 892 {
852 view_start = 0; 893 view_start = 0;
853 want_refresh = 1; 894 want_refresh = 1;
854 } 895 }
… …
872#ifdef META8_OPTION 913#ifdef META8_OPTION
873 && meta_char == C0_ESC 914 && meta_char == C0_ESC
874#endif 915#endif
875 ) 916 )
876 { 917 {
877 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
878 tt_write (&ch, 1); 919 tt_write (&ch, 1);
879 } 920 }
880 921
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
892} 923}
893/*}}} */
894 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 ISO_14755
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 ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && 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
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 1003unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 1005{
901 unsigned int n, s; 1006 unsigned int n, s;
902 1007
903 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 1035void
931rxvt_term::flush () 1036rxvt_term::flush ()
932{ 1037{
933 flush_ev.stop (); 1038 flush_ev.stop ();
934 1039
935#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
936 if (want_full_refresh) 1041 if (want_full_refresh)
937 { 1042 {
938 want_full_refresh = 0; 1043 want_full_refresh = 0;
939 scr_clear (); 1044 scr_clear ();
940 scr_touch (false); 1045 scr_touch (false);
941 } 1046 }
942#endif 1047#endif
943 1048
944 if (want_refresh) 1049 if (want_refresh)
945 { 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
946 scr_refresh (refresh_type); 1089 scr_refresh ();
947 scrollbar_show (1); 1090 scrollbar_show (1);
948#ifdef USE_XIM 1091#ifdef USE_XIM
949 IMSendSpot (); 1092 IMSendSpot ();
950#endif 1093#endif
951 } 1094 }
… …
954} 1097}
955 1098
956void 1099void
957rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
958{ 1101{
959 SET_R (this); 1102 make_current ();
960 SET_LOCALE (locale);
961 1103
962 display->flush (); 1104 display->flush ();
963 1105
964 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1108}
967 1109
968void 1110void
969rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
970{ 1112{
971 SET_R (this); 1113 make_current ();
972 SET_LOCALE (locale);
973 1114
974 refresh_limit = 1;
975 refresh_count = 0; 1115 refresh_count = 0;
976 flush (); 1116 flush ();
977} 1117}
978 1118
979#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1122{
983 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1124 want_refresh = 1;
985 1125
986 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1127}
988#endif 1128#endif
989 1129
990#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
991void 1131void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1146{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1149 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1150 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1152 }
1014} 1153}
1015#endif 1154#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1159{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1161 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1163 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1165 }
1028} 1166}
1029#endif 1167#endif
… …
1034{ 1172{
1035 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1176 {
1039 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1042 1179
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1180 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1182 }
1047} 1183}
1048#endif 1184#endif
1049 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
1050bool 1211bool
1051rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1052{ 1213{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1215
1055 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1056 { 1217 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1219 n = 0;
1059 } 1220 }
1060 1221
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1064 1225
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1227
1067 if (n > 0) 1228 if (r > 0)
1068 { 1229 {
1069 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
1070 return true; 1231 return true;
1071 } 1232 }
1072 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
1073 destroy (); 1245 destroy ();
1074 1246 }
1247
1075 return false; 1248 return false;
1076} 1249}
1077 1250
1078void 1251void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1253{
1081 SET_R (this); 1254 make_current ();
1082 SET_LOCALE (locale);
1083 1255
1084 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1258 while (pty_fill ())
1087 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1092} 1264}
1093 1265
1094void 1266void
1095rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1096{ 1268{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1270 recolour_cursor ();
1099 1271
1100#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1273 hidden_pointer = 0;
1102 1274
1103 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1277#endif
1106} 1278}
1107 1279
1108#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1109void 1281void
1110rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1111{ 1283{
1112 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1113 return; 1285 return;
1114 1286
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1288 XFlush (dpy);
1117 1289
1118 hidden_pointer = 1; 1290 hidden_pointer = 1;
1119} 1291}
1120 1292
1121void 1293void
1122rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1123{ 1295{
1124 SET_R (this); 1296 make_current ();
1125 SET_LOCALE (locale);
1126 1297
1127 pointer_blank (); 1298 pointer_blank ();
1128} 1299}
1129#endif 1300#endif
1130 1301
… …
1195 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1196 (32 + x + 1), 1367 (32 + x + 1),
1197 (32 + y + 1)); 1368 (32 + y + 1));
1198} 1369}
1199 1370
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209
1210/*{{{ process an X event */ 1371/*{{{ process an X event */
1211void 1372void
1212rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1213{ 1374{
1214 dDisp; 1375 make_current ();
1215 1376
1216 SET_R (this); 1377 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1378
1219#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1382 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1383
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1387 unsigned int unused_mask;
1249 1388
1250 switch (ev.type) 1389 switch (ev.type)
1251 { 1390 {
1252 case KeyPress: 1391 case KeyPress:
1253#if ISO_14755 1392 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1393 break;
1259 1394
1260 case KeyRelease: 1395 case KeyRelease:
1261 { 1396 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1397 break;
1329 }
1330 1398
1331 case ButtonPress: 1399 case ButtonPress:
1332 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1333 break; 1401 break;
1334 1402
… …
1336 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1337 break; 1405 break;
1338 1406
1339 case ClientMessage: 1407 case ClientMessage:
1340 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1418 destroy ();
1419 }
1345#if ENABLE_EWMH 1420#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1350#endif 1436#endif
1351 } 1437 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break;
1388
1389 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1438 break;
1392 1439
1393 /* 1440 /*
1394 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1414 break; 1461 break;
1415 } 1462 }
1416 break; 1463 break;
1417 1464
1418 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1469 focus_in ();
1420 break; 1470 break;
1421 1471
1422 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1476 focus_out ();
1424 break; 1477 break;
1425 1478
1426 case ConfigureNotify: 1479 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1428 { 1481 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1483 ;
1431 1484
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1486 {
1434 seen_resize = 1; 1487 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1436 } 1496 }
1437 1497
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1439 if (options & Opt_transparent) 1501 if (option (Opt_transparent))
1440 check_our_parents (); 1502 check_our_parents ();
1441#endif 1503#endif
1442 } 1504 }
1443 break; 1505 break;
1444 1506
1445 case PropertyNotify: 1507 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1510 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1512
1450 break; 1513 break;
1451 1514
1452 case SelectionClear: 1515 case SelectionClear:
1453 selection_clear (); 1516 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1522 break;
1460 1523
1461 case SelectionRequest: 1524 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1526 break;
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1534 break;
1464 1535
1465 case UnmapNotify: 1536 case UnmapNotify:
1466 mapped = 0; 1537 mapped = 0;
1467#ifdef TEXT_BLINK 1538#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1469#endif 1540#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 break; 1542 break;
1471 1543
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break;
1478
1479#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1480 case ReparentNotify: 1545 case ReparentNotify:
1481 rootwin_cb (ev); 1546 rootwin_cb (ev);
1482 break; 1547 break;
1483#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1484 1549
1485 case GraphicsExpose: 1550 case GraphicsExpose:
1486 case Expose: 1551 case Expose:
1487 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1488 { 1553 {
1489 do 1554 do
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1558
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1560
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1499 1564
1500 scr_refresh (refresh_type); 1565 want_refresh = 1;
1501 } 1566 }
1502 else 1567 else
1503 { 1568 {
1504 XEvent unused_event; 1569 XEvent unused_event;
1505 1570
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1572 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1574 ;
1510 1575
1511 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1512 { 1577 {
1513 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1514 scrollbar_show (0); 1579 scrollbar_show (0);
1515 } 1580 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520 1581
1521#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1522 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1524#endif 1585#endif
1525 } 1586 }
1526 break; 1587 break;
1527 1588
1528 case MotionNotify: 1589 case MotionNotify:
1529#ifdef POINTER_BLANK 1590#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1591 if (hidden_pointer)
1531 pointer_unblank (); 1592 pointer_unblank ();
1532#endif 1593#endif
1533#if MENUBAR
1534 if (isMenuBarWindow (ev.xany.window))
1535 {
1536 menubar_control (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1595 break;
1542 1596
1543 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1544 { 1598 {
1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1601 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1603 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1605 ;
1549 1606
1550 XQueryPointer (disp, vt, 1607 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1611 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1600 } 1657 }
1601 1658
1602 scroll_selection_lines = Pixel2Height (dist) 1659 scroll_selection_lines = Pixel2Height (dist)
1603 / SELECTION_SCROLL_LINE_SPEEDUP 1660 / SELECTION_SCROLL_LINE_SPEEDUP
1604 + 1; 1661 + 1;
1605 MIN_IT (scroll_selection_lines, 1662 min_it (scroll_selection_lines,
1606 SELECTION_SCROLL_MAX_LINES); 1663 SELECTION_SCROLL_MAX_LINES);
1607 } 1664 }
1608 else 1665 else
1609 { 1666 {
1610 /* we are within the text window, so we 1667 /* we are within the text window, so we
… …
1619#endif 1676#endif
1620 } 1677 }
1621 } 1678 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1680 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1626 ; 1683 ;
1627 1684
1628 XQueryPointer (disp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1689 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1691 scrollbar_size ());
1635 scr_refresh (refresh_type);
1636 refresh_limit = 0; 1692 want_refresh = 1;
1637 scrollbar_show (1); 1693 scrollbar_show (1);
1638 } 1694 }
1639 break; 1695 break;
1640 } 1696 }
1697
1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1641} 1724}
1642 1725
1643void 1726void
1644rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1645{ 1728{
1646 if (!focus) 1729 if (!focus)
1647 { 1730 {
1648 focus = 1; 1731 focus = 1;
1649 want_refresh = 1; 1732 want_refresh = 1;
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1650#if USE_XIM 1736#if USE_XIM
1651 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1652 { 1738 {
1653 IMSetStatusPosition (); 1739 IMSetPosition ();
1654 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1655 } 1741 }
1656#endif 1742#endif
1657#if CURSOR_BLINK 1743#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1744 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1746#endif
1661#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1663 { 1749 {
1664 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1751 scr_recolour ();
1666 } 1752 }
1667#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1668 } 1767 }
1669} 1768}
1670 1769
1671void 1770void
1672rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1674 if (focus) 1773 if (focus)
1675 { 1774 {
1676 focus = 0; 1775 focus = 0;
1677 want_refresh = 1; 1776 want_refresh = 1;
1678 1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779
1679#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf)
1782 {
1680 iso14755buf = 0; 1783 iso14755buf = 0;
1681#endif 1784# if ISO_14755
1682#if ENABLE_OVERLAY
1683 scr_overlay_off (); 1785 scr_overlay_off ();
1786# endif
1787 }
1684#endif 1788#endif
1685#if USE_XIM 1789#if USE_XIM
1686 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1688#endif 1792#endif
1689#if CURSOR_BLINK 1793#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1794 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1796 hidden_cursor = 0;
1693#endif 1797#endif
1694#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1699 } 1803 }
1700#endif 1804#endif
1701 } 1805 }
1702} 1806}
1703 1807
1704#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1705void 1822void
1706rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1824{
1708 SET_R (this); 1825 make_current ();
1709 SET_LOCALE (locale);
1710 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1711 switch (ev.type) 1832 switch (ev.type)
1712 { 1833 {
1713 case PropertyNotify: 1834 case PropertyNotify:
1714 /* 1835 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1841 return;
1721 1842
1722 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1723 case ReparentNotify: 1844 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1725 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1726 break; 1847 break;
1727 } 1848 }
1849# endif
1728} 1850}
1729#endif 1851#endif
1730 1852
1731void 1853void
1732rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
1733{ 1855{
1734 int reportmode = 0, clickintime; 1856 int reportmode = 0, clickintime;
1735 1857
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1858 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1859
1737 if (!bypass_keystate) 1860 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1861 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1862
1740 /* 1863 /*
1741 * VT window processing of button press 1864 * VT window processing of button press
1742 */ 1865 */
1743 if (ev.window == vt) 1866 if (ev.window == vt)
1744 { 1867 {
1868 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1869 return;
1870
1745#if ISO_14755 1871#if ISO_14755
1746 // 5.4 1872 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1873 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1874 {
1749 iso14755_54 (ev.x, ev.y); 1875 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1887#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1888 if (ev.button == MEvent.button && clickintime)
1763 { 1889 {
1764 /* same button, within alloted time */ 1890 /* same button, within alloted time */
1765 MEvent.clicks++; 1891 MEvent.clicks++;
1892
1766 if (MEvent.clicks > 1) 1893 if (MEvent.clicks > 1)
1767 { 1894 {
1768 /* only report double clicks */ 1895 /* only report double clicks */
1769 MEvent.clicks = 2; 1896 MEvent.clicks = 2;
1770 mouse_report (ev); 1897 mouse_report (ev);
… …
1802#else 1929#else
1803 selection.rect = false; 1930 selection.rect = false;
1804#endif 1931#endif
1805 1932
1806 /* allow shift+left click to extend selection */ 1933 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1934 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1935 {
1809 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1811 else 1938 else
1812 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2104 }
1978 2105
1979 break; 2106 break;
1980 } 2107 }
1981 } 2108 }
2109
1982 return; 2110 return;
1983 } 2111 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2112}
1992 2113
1993void 2114void
1994rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
1995{ 2116{
… …
2001 2122
2002 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
2003 { 2124 {
2004 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
2005 scrollbar_show (0); 2126 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2127 }
2010 2128
2011#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2130 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2014#endif 2132#endif
2015 2133
2016 if (ev.window == vt) 2134 if (ev.window == vt)
2017 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2018#if ISO_14755 2139#if ISO_14755
2019 // 5.4 2140 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2142 return;
2022#endif 2143#endif
2144
2023 if (reportmode) 2145 if (reportmode)
2024 { 2146 {
2025 /* mouse report from vt window */ 2147 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
2057 { 2179 {
2058 case Button1: 2180 case Button1:
2059 case Button3: 2181 case Button3:
2060 selection_make (ev.time); 2182 selection_make (ev.time);
2061 break; 2183 break;
2184
2062 case Button2: 2185 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2188 break;
2189
2065#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2066 case Button4: 2191 case Button4:
2067 case Button5: 2192 case Button5:
2068 { 2193 {
2069 int i; 2194 int i;
… …
2071 2196
2072 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2073 2198
2074 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2075 i = 1; 2200 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2201 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2202 i = nrow - 1;
2078 else 2203 else
2079 i = 5; 2204 i = 5;
2080 2205
2081# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2092 } 2217 }
2093 else 2218 else
2094 { 2219 {
2095# endif 2220# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2221 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2222 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2109 } 2224 }
2110#endif 2225# endif
2111 } 2226 }
2112 break; 2227 break;
2113#endif 2228#endif
2114 } 2229 }
2115 } 2230 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2231}
2121
2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
2354/*
2355 * Check our parents are still who we think they are.
2356 * Do transparency updates if required
2357 */
2358int
2359rxvt_term::check_our_parents ()
2360{
2361 int i, pchanged, aformat, have_pixmap, rootdepth;
2362 unsigned long nitems, bytes_after;
2363 Atom atype;
2364 unsigned char *prop = NULL;
2365 Window root, oldp, *list;
2366 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369
2370 pchanged = 0;
2371
2372 if (!(options & Opt_transparent))
2373 return pchanged; /* Don't try any more */
2374
2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth;
2377
2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
2380 if (rootdepth != wattr.depth)
2381 {
2382 if (am_transparent)
2383 {
2384 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0;
2387 }
2388
2389 return pchanged; /* Don't try any more */
2390 }
2391
2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False);
2394
2395 /*
2396 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that.
2399 */
2400 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
2416 have_pixmap = 0;
2417 else
2418 {
2419 have_pixmap = 1;
2420 rootpixmap = *(Pixmap *)prop;
2421 XFree (prop);
2422 }
2423
2424 if (have_pixmap)
2425 {
2426 /*
2427 * Copy display->root pixmap transparency
2428 */
2429 int sx, sy, nx, ny;
2430 unsigned int nw, nh;
2431 Window cr;
2432 XImage *image;
2433 GC gc;
2434 XGCValues gcvalue;
2435
2436 XTranslateCoordinates (disp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height;
2440 nx = ny = 0;
2441
2442 if (sx < 0)
2443 {
2444 nw += sx;
2445 nx = -sx;
2446 sx = 0;
2447 }
2448
2449 if (sy < 0)
2450 {
2451 nh += sy;
2452 ny = -sy;
2453 sy = 0;
2454 }
2455
2456 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2457 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2460 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */
2465 allowedxerror = 0;
2466
2467 if (image == NULL)
2468 {
2469 if (am_transparent && am_pixmap_trans)
2470 {
2471 pchanged = 1;
2472 if (pixmap != None)
2473 {
2474 XFreePixmap (disp, pixmap);
2475 pixmap = None;
2476 }
2477 }
2478
2479 am_pixmap_trans = 0;
2480 }
2481 else
2482 {
2483 if (pixmap != None)
2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2498 pixmap = XCreatePixmap (disp, vt,
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc);
2504 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]);
2507
2508 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1;
2510
2511 am_transparent = am_pixmap_trans = 1;
2512 }
2513 }
2514
2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2518 {
2519 unsigned int n;
2520 /*
2521 * InheritPixmap transparency
2522 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 {
2525 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root,
2527 &parent[i], &list, &n);
2528 XFree (list);
2529
2530 if (parent[i] == display->root)
2531 {
2532 if (oldp != None)
2533 pchanged = 1;
2534
2535 break;
2536 }
2537
2538 if (oldp != parent[i])
2539 pchanged = 1;
2540 }
2541
2542 n = 0;
2543
2544 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++)
2547 {
2548 XGetWindowAttributes (disp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break;
2553 }
2554 }
2555 }
2556
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */
2563 }
2564 else
2565 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++)
2572 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]);
2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2578 am_transparent = 1;
2579 }
2580
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2599 return pchanged;
2600}
2601#endif
2602 2232
2603/*}}} */ 2233/*}}} */
2604 2234
2605bool 2235bool
2606rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
2607{ 2237{
2608 bool flag = false; 2238 bool flag = false;
2609 unicode_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2611 2241
2612 for (;;) 2242 for (;;)
2613 { 2243 {
2614 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2615 { 2245 {
2616 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2247 ch = next_char ();
2618 }
2619 2248
2620 if (ch == NOCHAR) // TODO: improve 2249 if (ch == NOCHAR)
2621 break; 2250 break;
2251 }
2622 2252
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2254 {
2625 if (!seen_input) 2255 if (!seen_input)
2626 { 2256 {
… …
2635 if (seen_resize && cmd_pid) 2265 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2266 kill (-cmd_pid, SIGWINCH);
2637 } 2267 }
2638 2268
2639 /* Read a text string from the input buffer */ 2269 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2270 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2271 bool refreshnow = false;
2642 int nlines = 0; 2272 int nlines = 0;
2643 unicode_t *str = buf; 2273 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2275
2646 for (;;) 2276 for (;;)
2647 { 2277 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2279 break;
… …
2655 if (ch == C0_LF) 2285 if (ch == C0_LF)
2656 nlines++; 2286 nlines++;
2657 2287
2658 refresh_count++; 2288 refresh_count++;
2659 2289
2660 if (!(options & Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2291 {
2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2663 refreshnow = true; 2296 refreshnow = true;
2664 ch = NOCHAR; 2297 ch = NOCHAR;
2665 break; 2298 break;
2299 }
2666 } 2300 }
2667 2301
2668 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2670 { 2304 {
2305 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2306 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2307 scr_add_lines (buf, str - buf, nlines);
2308
2672 nlines = 0; 2309 nlines = 0;
2673 str = buf; 2310 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2311 eol = str + min (ncol, UBUFSIZ);
2675 } 2312 }
2676 2313
… …
2689 2326
2690 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2328 ch = next_char ();
2692 } 2329 }
2693 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2333 scr_add_lines (buf, str - buf, nlines);
2695 2334
2696 /* 2335 /*
2697 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2339 */
2702 if (refreshnow) 2340 if (refreshnow)
2703 { 2341 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true; 2342 flag = true;
2709 scr_refresh (refresh_type); 2343 scr_refresh ();
2710 } 2344 want_refresh = 1;
2711 } 2345 }
2712 2346
2713 } 2347 }
2714 else 2348 else
2715 { 2349 {
… …
2729 } 2363 }
2730 2364
2731 return flag; 2365 return flag;
2732} 2366}
2733 2367
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2368// read the next character
2744unicode_t 2369wchar_t
2745rxvt_term::next_char () 2370rxvt_term::next_char () NOTHROW
2746{ 2371{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2372 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2373 {
2749 // assume 7-bit to be ascii ALWAYS 2374 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2376 return *cmdbuf_ptr++;
2752 2377
2753 wchar_t wc; 2378 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2380
2756 if (len == (size_t)-2) 2381 if (len == (size_t)-2)
2757 { 2382 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2383 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2384 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2385 break;
2761 } 2386 }
2762 2387
2763 if (len == (size_t)-1) 2388 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2390
2766 // assume wchar == unicode 2391 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2769 } 2394 }
2770 2395
2771 return NOCHAR; 2396 return NOCHAR;
2772} 2397}
2398
2399// read the next octet
2400uint32_t
2401rxvt_term::next_octet () NOTHROW
2402{
2403 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR;
2406}
2407
2408static class out_of_input out_of_input;
2773 2409
2774/* rxvt_cmd_getc () - Return next input character */ 2410/* rxvt_cmd_getc () - Return next input character */
2775/* 2411/*
2776 * Return the next input character after first passing any keyboard input 2412 * Return the next input character after first passing any keyboard input
2777 * to the command. 2413 * to the command.
2778 */ 2414 */
2779unicode_t 2415wchar_t
2780rxvt_term::cmd_getc () 2416rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2417{
2782 unicode_t c = next_char (); 2418 wchar_t c = next_char ();
2783 2419
2784 if (c == NOCHAR) 2420 if (c == NOCHAR)
2785 throw out_of_input; 2421 throw out_of_input;
2786 2422
2787 return c; 2423 return c;
2788} 2424}
2789 2425
2790unicode_t 2426uint32_t
2791rxvt_term::cmd_get8 () 2427rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2428{
2793 unicode_t c = next_octet (); 2429 uint32_t c = next_octet ();
2794 2430
2795 if (c == NOCHAR) 2431 if (c == NOCHAR)
2796 throw out_of_input; 2432 throw out_of_input;
2797 2433
2798 return c; 2434 return c;
… …
2862 { 2498 {
2863 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2864 break; /* done = 1 */ 2500 break; /* done = 1 */
2865 } 2501 }
2866 } 2502 }
2867 2503
2868 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2869 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2870 { 2506 {
2871 done = 1; 2507 done = 1;
2872 break; 2508 break;
… …
2898 case C0_ESC: 2534 case C0_ESC:
2899 process_escape_seq (); 2535 process_escape_seq ();
2900 break; 2536 break;
2901 case C0_ENQ: /* terminal Status */ 2537 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2538 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2539 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2540 else
2906 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2542 break;
2909 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2910 scr_bell (); 2544 scr_bell ();
2911 break; 2545 break;
2912 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2936 process_dcs_seq (); 2570 process_dcs_seq ();
2937 break; 2571 break;
2938 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
2939 process_csi_seq (); 2573 process_csi_seq ();
2940 break; 2574 break;
2941 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
2942 process_osc_seq (); 2576 process_osc_seq ();
2943 break; 2577 break;
2944#endif 2578#endif
2945 } 2579 }
2946} 2580}
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 2671 break;
3038 case '+': 2672 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 2674 break;
3041#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3042 case '6': 2676 case '6':
3043 scr_backindex (); 2677 scr_backindex ();
3044 break; 2678 break;
3045#endif 2679#endif
3046 case '7': 2680 case '7':
3047 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
3048 break; 2682 break;
3049 case '8': 2683 case '8':
3050 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
3051 break; 2685 break;
3052#if ENABLE_FRILLS 2686#if !ENABLE_MINIMAL
3053 case '9': 2687 case '9':
3054 scr_forwardindex (); 2688 scr_forwardindex ();
3055 break; 2689 break;
3056#endif 2690#endif
3057 case '=': 2691 case '=':
… …
3067 break; 2701 break;
3068 2702
3069 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
3071 { 2705 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 2708 }
3075 break; 2709 break;
3076 2710
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 2734 process_dcs_seq ();
3101 break; 2735 break;
3102 2736
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
3108 2741
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 2744 process_csi_seq ();
… …
3175 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3176 unsigned int nargs, p; 2809 unsigned int nargs, p;
3177 int n, ndef; 2810 int n, ndef;
3178 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3179 2812
3180 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3181 arg[--nargs] = 0; 2814 nargs = 0;
3182 2815
3183 priv = 0; 2816 priv = 0;
3184 ch = cmd_getc (); 2817 ch = cmd_getc ();
3185 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3186 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 2855 if (arg[p] == -1)
3223 arg[p] = ndef; 2856 arg[p] = ndef;
3224 2857
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 2858 /*
3233 * private mode handling 2859 * private mode handling
3234 */ 2860 */
3235 if (priv) 2861 if (priv)
3236 { 2862 {
3237 switch (priv) 2863 switch (priv)
3238 { 2864 {
3239 case '>': 2865 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2873 // that we do not support xterm mouse reporting (should be 95 when we do).
2874 //
2875 tt_printf ("\033[>%d;94;0c", 'U');
2876 }
3242 break; 2877 break;
3243 case '?': 2878 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 2881 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 2992 break;
3358 2993
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 2995 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 2996 break;
3363 2997
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 2999 process_sgr_mode (nargs, arg);
3366 break; 3000 break;
… …
3373 break; 3007 break;
3374 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3375 scr_report_position (); 3009 scr_report_position ();
3376 break; 3010 break;
3377 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3012 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3014 break;
3381 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3017 break;
… …
3450 break; 3084 break;
3451 case CSI_75: 3085 case CSI_75:
3452 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
3453 break; 3087 break;
3454 3088
3455#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3456 case CSI_74: 3090 case CSI_74:
3457 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
3458 break; 3092 break;
3459#endif 3093#endif
3460 3094
… …
3467 break; 3101 break;
3468 } 3102 }
3469} 3103}
3470/*}}} */ 3104/*}}} */
3471 3105
3472#if ENABLE_FRILLS 3106#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3107/* ARGSUSED */
3474void 3108void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3110{
3477 int x, y; 3111 int x, y;
3478 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3479 Window wdummy; 3113 Window wdummy;
3480 dDisp; 3114
3115 dLocal (Display *, dpy);
3481 3116
3482 if (nargs == 0) 3117 if (nargs == 0)
3483 return; 3118 return;
3484 3119
3485 switch (args[0]) 3120 switch (args[0])
3486 { 3121 {
3487 /* 3122 /*
3488 * commands 3123 * commands
3489 */ 3124 */
3490 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3492 break; 3127 break;
3493 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3130 break;
3496 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3133 break;
3499 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3136 break;
3502 case 5: /* raise window */ 3137 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3504 break; 3139 break;
3505 case 6: /* lower window */ 3140 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3507 break; 3142 break;
3508 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3509 scr_touch (true); 3144 scr_touch (true);
3510 break; 3145 break;
3511 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3154 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3155 (unsigned int) (args[1] * fheight));
3521 break; 3156 break;
3522 3157
3523
3524 /* 3158 /*
3525 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3526 */ 3160 */
3527 case 11: /* report window state */ 3161 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3164 break;
3531 case 13: /* report window position */ 3165 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3171 break;
3538 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3175 break;
3542 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3178 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3181 break;
3548 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3549 { 3183 {
3550 char *s; 3184 char *s;
3551 XGetIconName (disp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3187 XFree (s);
3554 } 3188 }
3555 break; 3189 break;
3556 case 21: /* report window title */ 3190 case 21: /* report window title */
3557 { 3191 {
3558 char *s; 3192 char *s;
3559 XFetchName (disp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3195 XFree (s);
3562 } 3196 }
3563 break; 3197 break;
3564 } 3198 }
3565} 3199}
… …
3568/*----------------------------------------------------------------------*/ 3202/*----------------------------------------------------------------------*/
3569/* 3203/*
3570 * get input up until STRING TERMINATOR (or BEL) 3204 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3205 * ends_how is terminator used. returned input must be free()'d
3572 */ 3206 */
3573unsigned char * 3207char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3208rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3209{
3576 unicode_t ch; 3210 unicode_t ch;
3577 bool seen_esc = false; 3211 bool seen_esc = false;
3578 unsigned int n = 0; 3212 unsigned int n = 0;
… …
3592 seen_esc = true; 3226 seen_esc = true;
3593 continue; 3227 continue;
3594 } 3228 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3233 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3599 3235
3600 seen_esc = false; 3236 seen_esc = false;
3601 3237
3602 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3603 // stop at some sane length 3239 // stop at some sane length
3604 return NULL; 3240 return NULL;
3605 3241
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3242 string[n++] = ch;
3610 } 3243 }
3611 3244
3612 string[n++] = '\0'; 3245 string[n++] = '\0';
3613 3246
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3248
3616 return (unsigned char *)rxvt_wcstombs (string); 3249 return rxvt_wcstombs (string);
3617} 3250}
3618 3251
3619/*----------------------------------------------------------------------*/ 3252/*----------------------------------------------------------------------*/
3620/* 3253/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3255 */
3623void 3256void
3624rxvt_term::process_dcs_seq () 3257rxvt_term::process_dcs_seq ()
3625{ 3258{
3626 unsigned char *s; 3259 char *s;
3627 unicode_t eh; 3260 unicode_t eh;
3628 3261
3629 /* 3262 /*
3630 * Not handled yet 3263 * Not handled yet
3631 */ 3264 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3283 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3284 arg = arg * 10 + (ch - '0');
3652 3285
3653 if (ch == ';') 3286 if (ch == ';')
3654 { 3287 {
3655 unsigned char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3656 3289
3657 if (s) 3290 if (s)
3658 { 3291 {
3659 process_xterm_seq (arg, (char *)s, eh); 3292 process_xterm_seq (arg, s, eh);
3660 free (s); 3293 free (s);
3661 } 3294 }
3662 } 3295 }
3663} 3296}
3664 3297
3665void 3298void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3300{
3668 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3669 { 3302 {
3670 unsigned short r, g, b; 3303 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3304 pix_colors_focused[color].get (c);
3305
3306#if XFT
3307 if (c.a != rgba::MAX_CC)
3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3309 else
3310#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3312 }
3674 else 3313 else
3675 set_window_color (color, str); 3314 set_window_color (color, str);
3676} 3315}
3677 3316
3678/* 3317/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3319 */
3681void 3320void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3321rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3322{
3684 int changed = 0;
3685 int color; 3323 int color;
3686 char *buf, *name; 3324 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3326 int saveop = op;
3689 dDisp; 3327
3328 dLocal (Display *, dpy);
3690 3329
3691 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3692 switch (op) 3335 switch (op)
3693 { 3336 {
3694 case XTerm_name: 3337 case XTerm_name:
3695 set_title (str); 3338 set_title (str);
3696 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3353 unsigned long bytes_after;
3711 unsigned char *value = 0; 3354 unsigned char *value = 0;
3712 const char *str = ""; 3355 const char *str = "";
3713 3356
3714 if (prop 3357 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3362 && actual_type != None
3720 && actual_format == 8) 3363 && actual_format == 8)
3721 str = (const char *)(value); 3364 str = (const char *)(value);
3722 3365
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3366 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3367
3725 XFree (value); 3368 XFree (value);
3726 } 3369 }
3727 else 3370 else
3728 { 3371 {
… …
3732 { 3375 {
3733 *eq = 0; 3376 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3735 } 3378 }
3736 else 3379 else
3737 XDeleteProperty (disp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3381 display->atom (str));
3739 } 3382 }
3740 break; 3383 break;
3741 3384
3742 case XTerm_Color: 3385 case XTerm_Color:
… …
3744 { 3387 {
3745 if ((name = strchr (buf, ';')) == NULL) 3388 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3389 break;
3747 3390
3748 *name++ = '\0'; 3391 *name++ = '\0';
3749 color = atoi (buf); 3392 color = atoi (buf) + minCOLOR;
3750 3393
3751 if (color < 0 || color >= TOTAL_COLORS) 3394 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3395 break;
3753 3396
3754 if ((buf = strchr (name, ';')) != NULL) 3397 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3398 *buf++ = '\0';
3756 3399
3757 if (name[0] == '?' && !name[1]) 3400 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3401 }
3766 break; 3402 break;
3767 case XTerm_Color00: 3403 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3404 process_color_seq (op, Color_fg, str, resp);
3769 break; 3405 break;
3770 case XTerm_Color01: 3406 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3772 break; 3408 break;
3773#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3411 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3412 break;
3777#endif 3413#endif
3778 case XTerm_Color_pointer_fg: 3414 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3416 break;
3781 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3419 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3420#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3421 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp);
3427 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3793 break; 3431 break;
3794 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3796 break; 3434 break;
3797#endif 3435#endif
3798#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3799 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3439
3801 check_our_parents (); 3440 check_our_parents ();
3441
3802 if (am_transparent) 3442 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3444
3445 break;
3446#endif
3447
3807 case XTerm_Pixmap: 3448 case Rxvt_Pixmap:
3449 {
3808 if (*str != ';') 3450 if (*str != ';')
3809 { 3451 {
3810#if XPM_BACKGROUND 3452#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3455 scr_touch (true);
3456#endif
3815 } 3457 }
3458
3459 int changed = 0;
3460
3816 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3817 { 3462 {
3818 str++; 3463 str++;
3819#if XPM_BACKGROUND 3464#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3465 changed += scale_pixmap (str);
3821#endif 3466#endif
3822 } 3467 }
3823 3468
3824 if (changed) 3469 if (changed)
3825 { 3470 {
3826#ifdef XPM_BACKGROUND 3471#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3472 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3473 scr_touch (true);
3474#endif
3830 } 3475 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 }
3831 break; 3481 break;
3832 3482
3833 case XTerm_restoreFG: 3483 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3484 set_window_color (Color_fg, str);
3835 break; 3485 break;
3836 case XTerm_restoreBG: 3486 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3487 set_window_color (Color_bg, str);
3838 break; 3488 break;
3839 3489
3840 case XTerm_logfile: 3490 case XTerm_logfile:
3841 // TODO, when secure mode? 3491 // TODO, when secure mode?
3842 break; 3492 break;
3843 3493
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3494#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3495 case Rxvt_dumpscreen: /* no error notices */
3852 { 3496 {
3853 int fd; 3497 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3498 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3499 {
3856 scr_dump (fd); 3500 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3511 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3512 case URxvt_boldItalicFont:
3869#endif 3513#endif
3870 if (query) 3514 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3515 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3516 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3517 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3518 resp);
3875 else 3519 else
3876 { 3520 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3521 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3524 allocated.push_back ((void *)res);
3881 set_fonts (); 3525 set_fonts ();
3882 } 3526 }
3883 break; 3527 break;
3884 3528
3885#if ENABLE_FRILLS 3529 case URxvt_version:
3530 if (query)
3531 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3532 op,
3533 rs[Rs_name], VERSION[0], VERSION[2],
3534 resp);
3535 break;
3536
3537#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3538 case URxvt_locale:
3887 if (query) 3539 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3540 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 3541 else
3890 { 3542 {
3891 set_locale (str); 3543 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3544 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3545 init_xlocale ();
3894 } 3546 }
3895 break; 3547 break;
3896 3548
3897 case URxvt_view_up: 3549 case URxvt_view_up:
3898 case URxvt_view_down: 3550 case URxvt_view_down:
3551 {
3899 int lines = atoi (str); 3552 int lines = atoi (str);
3900 3553
3901 if (lines) 3554 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3555 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3556 else
3904 {
3905 scr_erase_savelines (); 3557 scr_erase_savelines ();
3906 } 3558 }
3907 3559
3560 break;
3561#endif
3562
3563#if ENABLE_PERL
3564 case URxvt_perl:
3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3566 ; // no responses yet
3908 break; 3567 break;
3909#endif 3568#endif
3910 } 3569 }
3911} 3570}
3912/*----------------------------------------------------------------------*/ 3571/*----------------------------------------------------------------------*/
… …
3943 return state; 3602 return state;
3944} 3603}
3945 3604
3946/* we're not using priv _yet_ */ 3605/* we're not using priv _yet_ */
3947void 3606void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3607rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 3608{
3950 unsigned int i, j; 3609 unsigned int i, j;
3951 int state; 3610 int state;
3952 3611
3953 static const struct 3612 static const struct
… …
3964 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 3626 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 3628 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 3629 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 3630#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 3631 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 3632#endif
… …
4021 } 3677 }
4022 3678
4023 /* extra handling for values with state unkept */ 3679 /* extra handling for values with state unkept */
4024 switch (arg[i]) 3680 switch (arg[i])
4025 { 3681 {
3682#if ENABLE_STYLES
3683 case 1021:
3684 set_option (Opt_intensityStyles, mode);
3685
3686 scr_touch (true);
3687 break;
3688#endif
4026 case 1048: /* alternative cursor save */ 3689 case 1048: /* alternative cursor save */
4027 case 1049: 3690 case 1049:
4028 if (options & Opt_secondaryScreen) 3691 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 3692 if (mode == 0)
4030 scr_cursor (RESTORE); 3693 scr_cursor (RESTORE);
4031 else if (mode == 1) 3694 else if (mode == 1)
4032 scr_cursor (SAVE); 3695 scr_cursor (SAVE);
4033 break; 3696 break;
… …
4048 case 3: /* 80/132 */ 3711 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 3712 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 3713 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 3714 break;
4052 case 4: /* smooth scrolling */ 3715 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 3716 set_option (Opt_jumpScroll, !state);
4057 break; 3717 break;
4058 case 5: /* reverse video */ 3718 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 3719 scr_rvideo_mode (state);
4060 break; 3720 break;
4061 case 6: /* relative/absolute origins */ 3721 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 3727 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 3728 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 3730 priv_modes &= ~PrivMode_MouseX11;
4071 break; 3731 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 3732#ifdef scrollBar_esc
4080 case scrollBar_esc: 3733 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 3734 if (scrollbar_mapping (state))
4082 { 3735 {
4083 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
… …
4102#if 0 3755#if 0
4103 case 1001: 3756 case 1001:
4104 break; /* X11 mouse highlighting */ 3757 break; /* X11 mouse highlighting */
4105#endif 3758#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 3759 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 3760 set_option (Opt_scrollTtyOutput, !state);
4111 break; 3761 break;
4112 case 1011: /* scroll to bottom on key press */ 3762 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 3763 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 3764 break;
4118 case 1047: /* secondary screen w/ clearing last */ 3765 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 3766 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3767 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 3768 scr_erase_screen (2);
4122 scr_change_screen (state); 3769 scr_change_screen (state);
4123 break; 3770 break;
4124 case 1049: /* secondary screen w/ clearing first */ 3771 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 3772 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 3773 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3775 scr_erase_screen (2);
4129 break; 3776 break;
4130 default: 3777 default:
4131 break; 3778 break;
… …
4259 scr_color (Color_bg, Color_bg); 3906 scr_color (Color_bg, Color_bg);
4260 break; 3907 break;
4261 3908
4262 //case 50: // not variable spacing 3909 //case 50: // not variable spacing
4263 3910
4264#ifndef NO_BRIGHTCOLOR 3911#if !ENABLE_MINIMAL
4265 case 90: 3912 case 90:
4266 case 91: /* set bright fg color */ 3913 case 91: /* set bright fg color */
4267 case 92: 3914 case 92:
4268 case 93: 3915 case 93:
4269 case 94: 3916 case 94:
… …
4281 case 106: 3928 case 106:
4282 case 107: 3929 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3930 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 3931 break;
4285#endif 3932#endif
4286
4287 } 3933 }
4288 } 3934 }
4289} 3935}
4290/*}}} */ 3936/*}}} */
4291 3937
… …
4315 */ 3961 */
4316void 3962void
4317rxvt_term::tt_printf (const char *fmt,...) 3963rxvt_term::tt_printf (const char *fmt,...)
4318{ 3964{
4319 va_list arg_ptr; 3965 va_list arg_ptr;
4320 unsigned char buf[256]; 3966 char buf[256];
4321 3967
4322 va_start (arg_ptr, fmt); 3968 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3969 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 3970 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 3971 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
4331 */ 3977 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 3979
4334void 3980void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 3982{
3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3984 return;
3985
3986 if (pty->pty < 0)
3987 return;
3988
4337 if (v_buflen == 0) 3989 if (v_buflen == 0)
4338 { 3990 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 3992
4341 if ((unsigned int)written == len) 3993 if ((unsigned int)written == len)
4342 return; 3994 return;
4343 3995
4344 data += written; 3996 data += written;
4345 len -= written; 3997 len -= written;
4346 } 3998 }
4347 3999
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4001
4350 memcpy (v_buffer + v_buflen, data, len); 4002 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4003 v_buflen += len;
4352 4004
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4005 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 4006}
4355 4007
4356void rxvt_term::pty_write () 4008void rxvt_term::pty_write ()
4357{ 4009{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4011
4360 if (written > 0) 4012 if (written > 0)
4361 { 4013 {
4362 v_buflen -= written; 4014 v_buflen -= written;
4363 4015
… …
4372 } 4024 }
4373 4025
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4026 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4027 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4029 pty_ev.set (EVENT_READ);
4378 destroy ();
4379} 4030}
4380 4031
4381/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
4382 4033

Diff Legend

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