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.214 by root, Thu Dec 22 21:56:19 2005 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
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(y - 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 {
… …
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 ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
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;
… …
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; 1115 refresh_limit = 1;
975 refresh_count = 0; 1116 refresh_count = 0;
976 flush (); 1117 flush ();
977} 1118}
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1123{
983 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1125 want_refresh = 1;
985 1126
986 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1128}
988#endif 1129#endif
989 1130
990#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
991void 1132void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1147{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1150 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1151 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1153 }
1014} 1154}
1015#endif 1155#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1160{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1162 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1164 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1166 }
1028} 1167}
1029#endif 1168#endif
… …
1034{ 1173{
1035 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1177 {
1039 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1042 1180
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1181 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1183 }
1047} 1184}
1048#endif 1185#endif
1049 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1050bool 1212bool
1051rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1052{ 1214{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1216
1055 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1056 { 1218 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1220 n = 0;
1059 } 1221 }
1060 1222
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1064 1226
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1228
1067 if (n > 0) 1229 if (r > 0)
1068 { 1230 {
1069 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1070 return true; 1232 return true;
1071 } 1233 }
1072 else if (n < 0 && errno != EAGAIN && errno != EINTR) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1073 pty_ev.stop (); 1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1246 destroy ();
1247 }
1074 1248
1075 return false; 1249 return false;
1076} 1250}
1077 1251
1078void 1252void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1254{
1081 SET_R (this); 1255 make_current ();
1082 SET_LOCALE (locale);
1083 1256
1084 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1259 while (pty_fill ())
1087 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1092} 1265}
1093 1266
1094void 1267void
1095rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1096{ 1269{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1271 recolour_cursor ();
1099 1272
1100#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1274 hidden_pointer = 0;
1102 1275
1103 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1278#endif
1106} 1279}
1107 1280
1108#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1109void 1282void
1110rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1111{ 1284{
1112 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1113 return; 1286 return;
1114 1287
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1289 XFlush (dpy);
1117 1290
1118 hidden_pointer = 1; 1291 hidden_pointer = 1;
1119} 1292}
1120 1293
1121void 1294void
1122rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1123{ 1296{
1124 SET_R (this); 1297 make_current ();
1125 SET_LOCALE (locale);
1126 1298
1127 pointer_blank (); 1299 pointer_blank ();
1128} 1300}
1129#endif 1301#endif
1130 1302
… …
1195 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1196 (32 + x + 1), 1368 (32 + x + 1),
1197 (32 + y + 1)); 1369 (32 + y + 1));
1198} 1370}
1199 1371
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 */ 1372/*{{{ process an X event */
1211void 1373void
1212rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1213{ 1375{
1214 dDisp; 1376 make_current ();
1215 1377
1216 SET_R (this); 1378 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1379
1219#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1383 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1384
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // 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; 1386 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1388 unsigned int unused_mask;
1249 1389
1250 switch (ev.type) 1390 switch (ev.type)
1251 { 1391 {
1252 case KeyPress: 1392 case KeyPress:
1253#if ISO_14755 1393 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1394 break;
1259 1395
1260 case KeyRelease: 1396 case KeyRelease:
1261 { 1397 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; 1398 break;
1329 }
1330 1399
1331 case ButtonPress: 1400 case ButtonPress:
1332 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1333 break; 1402 break;
1334 1403
… …
1336 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1337 break; 1406 break;
1338 1407
1339 case ClientMessage: 1408 case ClientMessage:
1340 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1419 destroy ();
1420 }
1345#if ENABLE_EWMH 1421#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1350#endif 1437#endif
1351 } 1438 }
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; 1439 break;
1388 1440
1389 case MappingNotify: 1441 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1443 break;
… …
1414 break; 1466 break;
1415 } 1467 }
1416 break; 1468 break;
1417 1469
1418 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1474 focus_in ();
1420 break; 1475 break;
1421 1476
1422 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1481 focus_out ();
1424 break; 1482 break;
1425 1483
1426 case ConfigureNotify: 1484 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1428 { 1486 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1488 ;
1431 1489
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1491 {
1434 seen_resize = 1; 1492 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1494 }
1437 1495
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1439 if (options & Opt_transparent) 1499 if (option (Opt_transparent))
1440 check_our_parents (); 1500 check_our_parents ();
1441#endif 1501#endif
1442 } 1502 }
1443 break; 1503 break;
1444 1504
1445 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1510
1450 break; 1511 break;
1451 1512
1452 case SelectionClear: 1513 case SelectionClear:
1453 selection_clear (); 1514 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1520 break;
1460 1521
1461 case SelectionRequest: 1522 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1524 break;
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1532 break;
1464 1533
1465 case UnmapNotify: 1534 case UnmapNotify:
1466 mapped = 0; 1535 mapped = 0;
1467#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1469#endif 1538#endif
1470 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break; 1540 break;
1478 1541
1479#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1480 case ReparentNotify: 1543 case ReparentNotify:
1481 rootwin_cb (ev); 1544 rootwin_cb (ev);
… …
1487 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1488 { 1551 {
1489 do 1552 do
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1556
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1558
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1499 1562
1500 scr_refresh (refresh_type); 1563 want_refresh = 1;
1501 } 1564 }
1502 else 1565 else
1503 { 1566 {
1504 XEvent unused_event; 1567 XEvent unused_event;
1505 1568
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1570 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1572 ;
1510 1573
1511 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1512 { 1575 {
1513 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1514 scrollbar_show (0); 1577 scrollbar_show (0);
1515 } 1578 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520 1579
1521#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1524#endif 1583#endif
1525 } 1584 }
1526 break; 1585 break;
1527 1586
1528 case MotionNotify: 1587 case MotionNotify:
1529#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1589 if (hidden_pointer)
1531 pointer_unblank (); 1590 pointer_unblank ();
1532#endif 1591#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) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1593 break;
1542 1594
1543 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1544 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1601 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1603 ;
1549 1604
1550 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1609 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1619#endif 1674#endif
1620 } 1675 }
1621 } 1676 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1678 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1626 ; 1681 ;
1627 1682
1628 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1687 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1689 scrollbar_size ());
1635 scr_refresh (refresh_type); 1690 want_refresh = 1;
1636 refresh_limit = 0; 1691 refresh_limit = 0;
1637 scrollbar_show (1); 1692 scrollbar_show (1);
1638 } 1693 }
1639 break; 1694 break;
1640 } 1695 }
1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1641} 1723}
1642 1724
1643void 1725void
1644rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1645{ 1727{
1646 if (!focus) 1728 if (!focus)
1647 { 1729 {
1648 focus = 1; 1730 focus = 1;
1649 want_refresh = 1; 1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1650#if USE_XIM 1735#if USE_XIM
1651 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1652 { 1737 {
1653 IMSetStatusPosition (); 1738 IMSetPosition ();
1654 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1655 } 1740 }
1656#endif 1741#endif
1657#if CURSOR_BLINK 1742#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1743 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1745#endif
1661#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1663 { 1748 {
1664 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1750 scr_recolour ();
1666 } 1751 }
1667#endif 1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif
1668 } 1766 }
1669} 1767}
1670 1768
1671void 1769void
1672rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1674 if (focus) 1772 if (focus)
1675 { 1773 {
1676 focus = 0; 1774 focus = 0;
1677 want_refresh = 1; 1775 want_refresh = 1;
1678 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1679#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1680 iso14755buf = 0; 1782 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1684#endif 1787#endif
1685#if USE_XIM 1788#if USE_XIM
1686 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1688#endif 1791#endif
1689#if CURSOR_BLINK 1792#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1793 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1795 hidden_cursor = 0;
1693#endif 1796#endif
1694#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1699 } 1802 }
1700#endif 1803#endif
1701 } 1804 }
1702} 1805}
1703 1806
1704#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1705void 1821void
1706rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1823{
1708 SET_R (this); 1824 make_current ();
1709 SET_LOCALE (locale);
1710 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1711 switch (ev.type) 1831 switch (ev.type)
1712 { 1832 {
1713 case PropertyNotify: 1833 case PropertyNotify:
1714 /* 1834 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1840 return;
1721 1841
1722 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1723 case ReparentNotify: 1843 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1726 break; 1846 break;
1727 } 1847 }
1848# endif
1728} 1849}
1729#endif 1850#endif
1730 1851
1731void 1852void
1732rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1733{ 1854{
1734 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1735 1856
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1737 if (!bypass_keystate) 1859 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1861
1740 /* 1862 /*
1741 * VT window processing of button press 1863 * VT window processing of button press
1742 */ 1864 */
1743 if (ev.window == vt) 1865 if (ev.window == vt)
1744 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1745#if ISO_14755 1870#if ISO_14755
1746 // 5.4 1871 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1873 {
1749 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1763 { 1888 {
1764 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1765 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1766 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1767 { 1893 {
1768 /* only report double clicks */ 1894 /* only report double clicks */
1769 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1770 mouse_report (ev); 1896 mouse_report (ev);
… …
1802#else 1928#else
1803 selection.rect = false; 1929 selection.rect = false;
1804#endif 1930#endif
1805 1931
1806 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1934 {
1809 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1811 else 1937 else
1812 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2103 }
1978 2104
1979 break; 2105 break;
1980 } 2106 }
1981 } 2107 }
2108
1982 return; 2109 return;
1983 } 2110 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2111}
1992 2112
1993void 2113void
1994rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1995{ 2115{
… …
2001 2121
2002 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2003 { 2123 {
2004 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2005 scrollbar_show (0); 2125 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2126 }
2010 2127
2011#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2014#endif 2131#endif
2015 2132
2016 if (ev.window == vt) 2133 if (ev.window == vt)
2017 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2018#if ISO_14755 2138#if ISO_14755
2019 // 5.4 2139 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2141 return;
2022#endif 2142#endif
2143
2023 if (reportmode) 2144 if (reportmode)
2024 { 2145 {
2025 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2057 { 2178 {
2058 case Button1: 2179 case Button1:
2059 case Button3: 2180 case Button3:
2060 selection_make (ev.time); 2181 selection_make (ev.time);
2061 break; 2182 break;
2183
2062 case Button2: 2184 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2187 break;
2188
2065#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2066 case Button4: 2190 case Button4:
2067 case Button5: 2191 case Button5:
2068 { 2192 {
2069 int i; 2193 int i;
… …
2071 2195
2072 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2073 2197
2074 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2075 i = 1; 2199 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2201 i = nrow - 1;
2078 else 2202 else
2079 i = 5; 2203 i = 5;
2080 2204
2081# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2092 } 2216 }
2093 else 2217 else
2094 { 2218 {
2095# endif 2219# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2220 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2221 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 2222# ifdef MOUSE_SLIP_WHEELING
2109 } 2223 }
2110#endif 2224# endif
2111 } 2225 }
2112 break; 2226 break;
2113#endif 2227#endif
2114 } 2228 }
2115 } 2229 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2230}
2121 2231
2122#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2123#if TINTING 2233#if TINTING
2124/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2125 2235
2126typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2127 2237
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{ 2239{
2130 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i; 2245 int i;
2136 2246
2137 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2138 2248
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140 2250
2141 /* for convenience */ 2251 /* for convenience */
2142 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2363 Atom atype; 2473 Atom atype;
2364 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2365 Window root, oldp, *list; 2475 Window root, oldp, *list;
2366 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369 2478
2370 pchanged = 0; 2479 pchanged = 0;
2371 2480
2372 if (!(options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2374 2483
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2377 2486
2378 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2379 2488
2380 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2381 { 2490 {
2382 if (am_transparent) 2491 if (am_transparent)
2383 { 2492 {
2384 pchanged = 1; 2493 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2387 } 2496 }
2388 2497
2389 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2390 } 2499 }
2391 2500
2392 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False); 2502 XSync (dpy, False);
2394 2503
2395 /* 2504 /*
2396 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2399 */ 2508 */
2400 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2404 2513
2405 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2410 2519
2411 if (!i || prop == NULL 2520 if (!i || prop == NULL
2412#if TINTING 2521#if TINTING
2413 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2414#endif 2523#endif
2415 ) 2524 )
2416 have_pixmap = 0; 2525 have_pixmap = 0;
2417 else 2526 else
2418 { 2527 {
… …
2431 Window cr; 2540 Window cr;
2432 XImage *image; 2541 XImage *image;
2433 GC gc; 2542 GC gc;
2434 XGCValues gcvalue; 2543 XGCValues gcvalue;
2435 2544
2436 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2440 nx = ny = 0; 2549 nx = ny = 0;
2441 2550
… …
2454 } 2563 }
2455 2564
2456 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458 2567
2459 XSync (disp, False); 2568 XSync (dpy, False);
2460 allowedxerror = -1; 2569 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462 2571
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2465 allowedxerror = 0; 2574 allowedxerror = 0;
2466 2575
… …
2469 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2470 { 2579 {
2471 pchanged = 1; 2580 pchanged = 1;
2472 if (pixmap != None) 2581 if (pixmap != None)
2473 { 2582 {
2474 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2475 pixmap = None; 2584 pixmap = None;
2476 } 2585 }
2477 } 2586 }
2478 2587
2479 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2480 } 2589 }
2481 else 2590 else
2482 { 2591 {
2483 if (pixmap != None) 2592 if (pixmap != None)
2484 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2485 2594
2486#if TINTING 2595#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2488 { 2597 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491 2599
2600 rgba c;
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2493 2602
2494 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2495 } 2604 }
2496#endif 2605#endif
2497 2606
2498 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2504 XDestroyImage (image); 2612 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2507 2615
2508 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1; 2617 pchanged = 1;
2510 2618
2511 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2512 } 2620 }
2513 } 2621 }
2514 2622
2515 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2517 else 2625 else
2518 { 2626 {
2519 unsigned int n; 2627 unsigned int n;
2520 /* 2628 /*
2521 * InheritPixmap transparency 2629 * InheritPixmap transparency
2522 */ 2630 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 { 2632 {
2525 oldp = parent[i]; 2633 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2527 &parent[i], &list, &n);
2528 XFree (list); 2635 XFree (list);
2529 2636
2530 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2531 { 2638 {
2532 if (oldp != None) 2639 if (oldp != None)
… …
2540 } 2647 }
2541 2648
2542 n = 0; 2649 n = 0;
2543 2650
2544 if (pchanged) 2651 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2547 { 2653 {
2548 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 { 2657 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break; 2659 break;
2553 } 2660 }
2554 } 2661 }
2555 }
2556 2662
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2558 { 2664 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0; 2667 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2563 } 2669 }
2564 else 2670 else
2565 { 2671 {
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++) 2672 for (n = 0; n < (unsigned int)i; n++)
2572 { 2673 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2575 } 2676 }
2576 2677
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2578 am_transparent = 1; 2679 am_transparent = 1;
2579 } 2680 }
2580 2681
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None; 2683 parent[i] = None;
2583 } 2684 }
2584 2685
2585 if (scrollBar.win) 2686 if (scrollBar.win)
2586 { 2687 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2589 scrollbar_show (0); 2690 scrollbar_show (0);
2590 } 2691 }
2591 2692
2592 if (am_transparent) 2693 if (am_transparent)
… …
2604 2705
2605bool 2706bool
2606rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2607{ 2708{
2608 bool flag = false; 2709 bool flag = false;
2609 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2611 2712
2612 for (;;) 2713 for (;;)
2613 { 2714 {
2614 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2615 { 2716 {
2616 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2718 ch = next_char ();
2618 }
2619 2719
2620 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2621 break; 2721 break;
2722 }
2622 2723
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2725 {
2625 if (!seen_input) 2726 if (!seen_input)
2626 { 2727 {
… …
2635 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2637 } 2738 }
2638 2739
2639 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2742 bool refreshnow = false;
2642 int nlines = 0; 2743 int nlines = 0;
2643 unicode_t *str = buf; 2744 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2746
2646 for (;;) 2747 for (;;)
2647 { 2748 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2750 break;
… …
2655 if (ch == C0_LF) 2756 if (ch == C0_LF)
2656 nlines++; 2757 nlines++;
2657 2758
2658 refresh_count++; 2759 refresh_count++;
2659 2760
2660 if (!(options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2763 {
2663 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2664 ch = NOCHAR; 2766 ch = NOCHAR;
2665 break; 2767 break;
2666 } 2768 }
2667 2769
2668 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2670 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2672 nlines = 0; 2777 nlines = 0;
2673 str = buf; 2778 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
2675 } 2780 }
2676 2781
… …
2689 2794
2690 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2796 ch = next_char ();
2692 } 2797 }
2693 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2695 2802
2696 /* 2803 /*
2697 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2808 */
2702 if (refreshnow) 2809 if (refreshnow)
2703 { 2810 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2812 refresh_limit++;
2706 else 2813 else
2707 { 2814 {
2708 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2709 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2710 } 2819 }
2711 } 2820 }
2712 2821
2713 } 2822 }
2714 else 2823 else
… …
2729 } 2838 }
2730 2839
2731 return flag; 2840 return flag;
2732} 2841}
2733 2842
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 2843// read the next character
2744unicode_t 2844wchar_t
2745rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2746{ 2846{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2848 {
2749 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2752 2852
2753 wchar_t wc; 2853 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2854 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2855
2756 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2757 { 2857 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2860 break;
2761 } 2861 }
2762 2862
2763 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2865
2766 // assume wchar == unicode 2866 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2769 } 2869 }
2770 2870
2771 return NOCHAR; 2871 return NOCHAR;
2772} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2773 2884
2774/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2775/* 2886/*
2776 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2777 * to the command. 2888 * to the command.
2778 */ 2889 */
2779unicode_t 2890wchar_t
2780rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2892{
2782 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2783 2894
2784 if (c == NOCHAR) 2895 if (c == NOCHAR)
2785 throw out_of_input; 2896 throw out_of_input;
2786 2897
2787 return c; 2898 return c;
2788} 2899}
2789 2900
2790unicode_t 2901uint32_t
2791rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2903{
2793 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2794 2905
2795 if (c == NOCHAR) 2906 if (c == NOCHAR)
2796 throw out_of_input; 2907 throw out_of_input;
2797 2908
2798 return c; 2909 return c;
… …
2898 case C0_ESC: 3009 case C0_ESC:
2899 process_escape_seq (); 3010 process_escape_seq ();
2900 break; 3011 break;
2901 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 3015 else
2906 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 3017 break;
2909 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2910 scr_bell (); 3019 scr_bell ();
2911 break; 3020 break;
2912 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 3146 break;
3038 case '+': 3147 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 3149 break;
3041#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3042 case '6': 3151 case '6':
3043 scr_backindex (); 3152 scr_backindex ();
3044 break; 3153 break;
3045#endif 3154#endif
3046 case '7': 3155 case '7':
3047 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3048 break; 3157 break;
3049 case '8': 3158 case '8':
3050 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3051 break; 3160 break;
3052#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3053 case '9': 3162 case '9':
3054 scr_forwardindex (); 3163 scr_forwardindex ();
3055 break; 3164 break;
3056#endif 3165#endif
3057 case '=': 3166 case '=':
… …
3067 break; 3176 break;
3068 3177
3069 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3071 { 3180 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 3183 }
3075 break; 3184 break;
3076 3185
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 3209 process_dcs_seq ();
3101 break; 3210 break;
3102 3211
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
3108 3216
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 3219 process_csi_seq ();
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 3330 if (arg[p] == -1)
3223 arg[p] = ndef; 3331 arg[p] = ndef;
3224 3332
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 /* 3333 /*
3233 * private mode handling 3334 * private mode handling
3234 */ 3335 */
3235 if (priv) 3336 if (priv)
3236 { 3337 {
3237 switch (priv) 3338 switch (priv)
3238 { 3339 {
3239 case '>': 3340 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3242 break; 3352 break;
3243 case '?': 3353 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 3356 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 3467 break;
3358 3468
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 3471 break;
3363 3472
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3366 break; 3475 break;
… …
3373 break; 3482 break;
3374 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3375 scr_report_position (); 3484 scr_report_position ();
3376 break; 3485 break;
3377 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3487 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3489 break;
3381 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3492 break;
… …
3450 break; 3559 break;
3451 case CSI_75: 3560 case CSI_75:
3452 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3453 break; 3562 break;
3454 3563
3455#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3456 case CSI_74: 3565 case CSI_74:
3457 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3458 break; 3567 break;
3459#endif 3568#endif
3460 3569
… …
3467 break; 3576 break;
3468 } 3577 }
3469} 3578}
3470/*}}} */ 3579/*}}} */
3471 3580
3472#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3582/* ARGSUSED */
3474void 3583void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3585{
3477 int x, y; 3586 int x, y;
3478 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3479 Window wdummy; 3588 Window wdummy;
3480 dDisp; 3589
3590 dLocal (Display *, dpy);
3481 3591
3482 if (nargs == 0) 3592 if (nargs == 0)
3483 return; 3593 return;
3484 3594
3485 switch (args[0]) 3595 switch (args[0])
3486 { 3596 {
3487 /* 3597 /*
3488 * commands 3598 * commands
3489 */ 3599 */
3490 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3492 break; 3602 break;
3493 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3605 break;
3496 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3608 break;
3499 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3611 break;
3502 case 5: /* raise window */ 3612 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3504 break; 3614 break;
3505 case 6: /* lower window */ 3615 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3507 break; 3617 break;
3508 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3509 scr_touch (true); 3619 scr_touch (true);
3510 break; 3620 break;
3511 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3521 break; 3631 break;
3522 3632
3523
3524 /* 3633 /*
3525 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3526 */ 3635 */
3527 case 11: /* report window state */ 3636 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3639 break;
3531 case 13: /* report window position */ 3640 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3646 break;
3538 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3650 break;
3542 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3653 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3656 break;
3548 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3549 { 3658 {
3550 char *s; 3659 char *s;
3551 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3662 XFree (s);
3554 } 3663 }
3555 break; 3664 break;
3556 case 21: /* report window title */ 3665 case 21: /* report window title */
3557 { 3666 {
3558 char *s; 3667 char *s;
3559 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3670 XFree (s);
3562 } 3671 }
3563 break; 3672 break;
3564 } 3673 }
3565} 3674}
… …
3568/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3569/* 3678/*
3570 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3572 */ 3681 */
3573unsigned char * 3682char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3684{
3576 unicode_t ch; 3685 unicode_t ch;
3577 bool seen_esc = false; 3686 bool seen_esc = false;
3578 unsigned int n = 0; 3687 unsigned int n = 0;
… …
3592 seen_esc = true; 3701 seen_esc = true;
3593 continue; 3702 continue;
3594 } 3703 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3708 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3599 3710
3600 seen_esc = false; 3711 seen_esc = false;
3601 3712
3602 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3603 // stop at some sane length 3714 // stop at some sane length
3604 return NULL; 3715 return NULL;
3605 3716
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3717 string[n++] = ch;
3610 } 3718 }
3611 3719
3612 string[n++] = '\0'; 3720 string[n++] = '\0';
3613 3721
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3723
3616 return (unsigned char *)rxvt_wcstombs (string); 3724 return rxvt_wcstombs (string);
3617} 3725}
3618 3726
3619/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3620/* 3728/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3729 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3730 */
3623void 3731void
3624rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3625{ 3733{
3626 unsigned char *s; 3734 char *s;
3627 unicode_t eh; 3735 unicode_t eh;
3628 3736
3629 /* 3737 /*
3630 * Not handled yet 3738 * Not handled yet
3631 */ 3739 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3652 3760
3653 if (ch == ';') 3761 if (ch == ';')
3654 { 3762 {
3655 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3656 3764
3657 if (s) 3765 if (s)
3658 { 3766 {
3659 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3660 free (s); 3768 free (s);
3661 } 3769 }
3662 } 3770 }
3663} 3771}
3664 3772
3665void 3773void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3775{
3668 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3669 { 3777 {
3670 unsigned short r, g, b; 3778 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3787 }
3674 else 3788 else
3675 set_window_color (color, str); 3789 set_window_color (color, str);
3676} 3790}
3677 3791
3678/* 3792/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3794 */
3681void 3795void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3797{
3684 int changed = 0;
3685 int color; 3798 int color;
3686 char *buf, *name; 3799 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3801 int saveop = op;
3689 dDisp; 3802
3803 dLocal (Display *, dpy);
3690 3804
3691 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3692 switch (op) 3810 switch (op)
3693 { 3811 {
3694 case XTerm_name: 3812 case XTerm_name:
3695 set_title (str); 3813 set_title (str);
3696 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3828 unsigned long bytes_after;
3711 unsigned char *value = 0; 3829 unsigned char *value = 0;
3712 const char *str = ""; 3830 const char *str = "";
3713 3831
3714 if (prop 3832 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3837 && actual_type != None
3720 && actual_format == 8) 3838 && actual_format == 8)
3721 str = (const char *)(value); 3839 str = (const char *)(value);
3722 3840
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3842
3725 XFree (value); 3843 XFree (value);
3726 } 3844 }
3727 else 3845 else
3728 { 3846 {
… …
3732 { 3850 {
3733 *eq = 0; 3851 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3735 } 3853 }
3736 else 3854 else
3737 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3856 display->atom (str));
3739 } 3857 }
3740 break; 3858 break;
3741 3859
3742 case XTerm_Color: 3860 case XTerm_Color:
… …
3744 { 3862 {
3745 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3864 break;
3747 3865
3748 *name++ = '\0'; 3866 *name++ = '\0';
3749 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3750 3868
3751 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3870 break;
3753 3871
3754 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3873 *buf++ = '\0';
3756 3874
3757 if (name[0] == '?' && !name[1]) 3875 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 } 3876 }
3766 break; 3877 break;
3767 case XTerm_Color00: 3878 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3769 break; 3880 break;
3770 case XTerm_Color01: 3881 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3772 break; 3883 break;
3773#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3887 break;
3777#endif 3888#endif
3778 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3891 break;
3781 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3894 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#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: 3896 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3793 break; 3906 break;
3794 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3796 break; 3909 break;
3797#endif 3910#endif
3798#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3801 check_our_parents (); 3915 check_our_parents ();
3916
3802 if (am_transparent) 3917 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3919
3920 break;
3921#endif
3922
3807 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3808 if (*str != ';') 3925 if (*str != ';')
3809 { 3926 {
3810#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3930 scr_touch (true);
3931#endif
3815 } 3932 }
3933
3934 int changed = 0;
3935
3816 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3817 { 3937 {
3818 str++; 3938 str++;
3819#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3821#endif 3941#endif
3822 } 3942 }
3823 3943
3824 if (changed) 3944 if (changed)
3825 { 3945 {
3826#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3947 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3948 scr_touch (true);
3949#endif
3830 } 3950 }
3951 }
3831 break; 3952 break;
3832 3953
3833 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3835 break; 3956 break;
3836 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3838 break; 3959 break;
3839 3960
3840 case XTerm_logfile: 3961 case XTerm_logfile:
3841 // TODO, when secure mode? 3962 // TODO, when secure mode?
3842 break; 3963 break;
3843 3964
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 3965#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3852 { 3967 {
3853 int fd; 3968 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3970 {
3856 scr_dump (fd); 3971 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3982 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3869#endif 3984#endif
3870 if (query) 3985 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3989 resp);
3875 else 3990 else
3876 { 3991 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3881 set_fonts (); 3996 set_fonts ();
3882 } 3997 }
3883 break; 3998 break;
3884 3999
3885#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
3886 case URxvt_locale: 4009 case URxvt_locale:
3887 if (query) 4010 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 4012 else
3890 { 4013 {
3891 set_locale (str); 4014 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 4016 init_xlocale ();
3894 } 4017 }
3895 break; 4018 break;
3896 4019
3897 case URxvt_view_up: 4020 case URxvt_view_up:
3898 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3899 int lines = atoi (str); 4023 int lines = atoi (str);
3900 4024
3901 if (lines) 4025 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 4027 else
3904 {
3905 scr_erase_savelines (); 4028 scr_erase_savelines ();
3906 } 4029 }
3907 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet
3908 break; 4038 break;
3909#endif 4039#endif
3910 } 4040 }
3911} 4041}
3912/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3943 return state; 4073 return state;
3944} 4074}
3945 4075
3946/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3947void 4077void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 4079{
3950 unsigned int i, j; 4080 unsigned int i, j;
3951 int state; 4081 int state;
3952 4082
3953 static const struct 4083 static const struct
… …
3964 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 4099 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 4103#endif
… …
4021 } 4148 }
4022 4149
4023 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4151 switch (arg[i])
4025 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
4026 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4027 case 1049: 4161 case 1049:
4028 if (options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 4163 if (mode == 0)
4030 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4031 else if (mode == 1) 4165 else if (mode == 1)
4032 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4033 break; 4167 break;
… …
4048 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4185 break;
4052 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 4187 set_option (Opt_jumpScroll, !state);
4057 break; 4188 break;
4058 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4060 break; 4191 break;
4061 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4071 break; 4202 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 4203#ifdef scrollBar_esc
4080 case scrollBar_esc: 4204 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4082 { 4206 {
4083 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4102#if 0 4226#if 0
4103 case 1001: 4227 case 1001:
4104 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4105#endif 4229#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
4111 break; 4232 break;
4112 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 4235 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4239 scr_erase_screen (2);
4122 scr_change_screen (state); 4240 scr_change_screen (state);
4123 break; 4241 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4243 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4246 scr_erase_screen (2);
4129 break; 4247 break;
4130 default: 4248 default:
4131 break; 4249 break;
… …
4259 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4260 break; 4378 break;
4261 4379
4262 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4263 4381
4264#ifndef NO_BRIGHTCOLOR 4382#if !ENABLE_MINIMAL
4265 case 90: 4383 case 90:
4266 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4267 case 92: 4385 case 92:
4268 case 93: 4386 case 93:
4269 case 94: 4387 case 94:
… …
4281 case 106: 4399 case 106:
4282 case 107: 4400 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4402 break;
4285#endif 4403#endif
4286
4287 } 4404 }
4288 } 4405 }
4289} 4406}
4290/*}}} */ 4407/*}}} */
4291 4408
… …
4315 */ 4432 */
4316void 4433void
4317rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
4318{ 4435{
4319 va_list arg_ptr; 4436 va_list arg_ptr;
4320 unsigned char buf[256]; 4437 char buf[256];
4321 4438
4322 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4441 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4442 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
4331 */ 4448 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4450
4334void 4451void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4453{
4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
4456
4457 if (pty->pty < 0)
4458 return;
4459
4337 if (v_buflen == 0) 4460 if (v_buflen == 0)
4338 { 4461 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 4463
4341 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4342 return; 4465 return;
4343 4466
4344 data += written; 4467 data += written;
4345 len -= written; 4468 len -= written;
4346 } 4469 }
4347 4470
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4472
4350 memcpy (v_buffer + v_buflen, data, len); 4473 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4474 v_buflen += len;
4352 4475
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 4477}
4355 4478
4356void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4357{ 4480{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4482
4360 if (written > 0) 4483 if (written > 0)
4361 { 4484 {
4362 v_buflen -= written; 4485 v_buflen -= written;
4363 4486

Diff Legend

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