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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.309 by root, Mon Feb 20 22:42:00 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
147 151
148 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
149 { 153 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
153 break; 156 break;
154 } 157 }
155 158
156 x--; 159 x--;
157 } 160 }
158
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *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 {
366#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 398 return;
369#endif 399#endif
370 400
371 if (TermWin.saveLines) 401 if (saveLines)
372 { 402 {
373#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 404 if (!ctrl && !meta)
375#else 405#else
376 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
377#endif 407#endif
378 { 408 {
379 int lnsppg; 409 int lnsppg;
380 410
381#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 413#else
384 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
385#endif 415#endif
386 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
387 { 417 {
388 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
389 return; 419 return;
… …
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);
… …
829 { 859 {
830#ifdef META8_OPTION 860#ifdef META8_OPTION
831 /* set 8-bit on */ 861 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
833 { 863 {
834 unsigned char *ch; 864 char *ch;
835 865
836 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 867 *ch |= 0x80;
838 868
839 meta = 0; 869 meta = 0;
… …
841#endif 871#endif
842 /* nil */ ; 872 /* nil */ ;
843 } 873 }
844 } 874 }
845 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
846 if (len <= 0) 879 if (len <= 0)
847 return; /* not mapped */ 880 return; /* not mapped */
848 881
849 if (options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 883 if (view_start)
851 { 884 {
852 TermWin.view_start = 0; 885 view_start = 0;
853 want_refresh = 1; 886 want_refresh = 1;
854 } 887 }
855 888
856 /* 889 /*
857 * these modifications only affect the static keybuffer 890 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 905#ifdef META8_OPTION
873 && meta_char == C0_ESC 906 && meta_char == C0_ESC
874#endif 907#endif
875 ) 908 )
876 { 909 {
877 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
878 tt_write (&ch, 1); 911 tt_write (&ch, 1);
879 } 912 }
880 913
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); 914 tt_write (kbuf, (unsigned int)len);
892} 915}
893/*}}} */
894 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 995unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 997{
901 unsigned int n, s; 998 unsigned int n, s;
902 999
903 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 1038 }
942#endif 1039#endif
943 1040
944 if (want_refresh) 1041 if (want_refresh)
945 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
946 scr_refresh (refresh_type); 1081 scr_refresh ();
947 scrollbar_show (1); 1082 scrollbar_show (1);
948#ifdef USE_XIM 1083#ifdef USE_XIM
949 IMSendSpot (); 1084 IMSendSpot ();
950#endif 1085#endif
951 } 1086 }
… …
954} 1089}
955 1090
956void 1091void
957rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
958{ 1093{
959 SET_R (this); 1094 make_current ();
960 SET_LOCALE (locale);
961 1095
962 display->flush (); 1096 display->flush ();
963 1097
964 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1100}
967 1101
968void 1102void
969rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
970{ 1104{
971 SET_R (this); 1105 make_current ();
972 SET_LOCALE (locale);
973 1106
974 refresh_limit = 1; 1107 refresh_limit = 1;
975 refresh_count = 0; 1108 refresh_count = 0;
976 flush (); 1109 flush ();
977} 1110}
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1115{
983 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1117 want_refresh = 1;
985 1118
986 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1120}
988#endif 1121#endif
989 1122
990#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
991void 1124void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1139{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1142 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1143 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1145 }
1014} 1146}
1015#endif 1147#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1152{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1154 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1156 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1158 }
1028} 1159}
1029#endif 1160#endif
… …
1034{ 1165{
1035 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1169 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1170 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1042 1172
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1173 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1175 }
1047} 1176}
1048#endif 1177#endif
1049 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1050bool 1204bool
1051rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1052{ 1206{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1208
1055 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1056 { 1210 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1212 n = 0;
1059 } 1213 }
1060 1214
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1064 1218
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1220
1067 if (n > 0) 1221 if (r > 0)
1068 { 1222 {
1069 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
1070 return true; 1224 return true;
1071 } 1225 }
1072 else if (n < 0 && errno != EAGAIN) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1227 {
1228#if LINUX_YIELD_HACK
1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1231#endif
1232 }
1233 else
1234 {
1235 pty_ev.stop ();
1236
1237 if (!OPTION (Opt_hold))
1073 destroy (); 1238 destroy ();
1239 }
1074 1240
1075 return false; 1241 return false;
1076} 1242}
1077 1243
1078void 1244void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1246{
1081 SET_R (this); 1247 make_current ();
1082 SET_LOCALE (locale);
1083 1248
1084 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1251 while (pty_fill ())
1087 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1092} 1257}
1093 1258
1094void 1259void
1095rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1096{ 1261{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1263 recolour_cursor ();
1099 1264
1100#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1266 hidden_pointer = 0;
1102 1267
1103 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1270#endif
1106} 1271}
1107 1272
1108#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1109void 1274void
1110rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1111{ 1276{
1112 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1113 return; 1278 return;
1114 1279
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1281 XFlush (dpy);
1117 1282
1118 hidden_pointer = 1; 1283 hidden_pointer = 1;
1119} 1284}
1120 1285
1121void 1286void
1122rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1123{ 1288{
1124 SET_R (this); 1289 make_current ();
1125 SET_LOCALE (locale);
1126 1290
1127 pointer_blank (); 1291 pointer_blank ();
1128} 1292}
1129#endif 1293#endif
1130 1294
… …
1195 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1196 (32 + x + 1), 1360 (32 + x + 1),
1197 (32 + y + 1)); 1361 (32 + y + 1));
1198} 1362}
1199 1363
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 */ 1364/*{{{ process an X event */
1211void 1365void
1212rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1213{ 1367{
1214 dDisp; 1368 make_current ();
1215 1369
1216 SET_R (this); 1370 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1371
1219#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1375 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1376
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // 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; 1378 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1380 unsigned int unused_mask;
1249 1381
1250 switch (ev.type) 1382 switch (ev.type)
1251 { 1383 {
1252 case KeyPress: 1384 case KeyPress:
1253#if ISO_14755 1385 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1386 break;
1259 1387
1260 case KeyRelease: 1388 case KeyRelease:
1261 { 1389 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; 1390 break;
1329 }
1330 1391
1331 case ButtonPress: 1392 case ButtonPress:
1332 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1333 break; 1394 break;
1334 1395
… …
1336 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1337 break; 1398 break;
1338 1399
1339 case ClientMessage: 1400 case ClientMessage:
1340 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1411 destroy ();
1412 }
1345#if ENABLE_EWMH 1413#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1350#endif 1429#endif
1351 } 1430 }
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; 1431 break;
1388 1432
1389 case MappingNotify: 1433 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1435 break;
… …
1422 case FocusOut: 1466 case FocusOut:
1423 focus_out (); 1467 focus_out ();
1424 break; 1468 break;
1425 1469
1426 case ConfigureNotify: 1470 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1428 { 1472 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ;
1438 1475
1439 if (szHint.width != width || szHint.height != height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1477 {
1441 seen_resize = 1; 1478 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1480 }
1444 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1486 check_our_parents ();
1448#endif 1487#endif
1449 } 1488 }
1450 break; 1489 break;
1451 1490
1452 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1496
1457 break; 1497 break;
1458 1498
1459 case SelectionClear: 1499 case SelectionClear:
1460 selection_clear (); 1500 selection_clear ();
… …
1467 1507
1468 case SelectionRequest: 1508 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1470 break; 1510 break;
1471 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1472 case UnmapNotify: 1520 case UnmapNotify:
1473 TermWin.mapped = 0; 1521 mapped = 0;
1474#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1476#endif 1524#endif
1477 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break; 1526 break;
1485 1527
1486#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1487 case ReparentNotify: 1529 case ReparentNotify:
1488 rootwin_cb (ev); 1530 rootwin_cb (ev);
1489 break; 1531 break;
1490#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1491 1533
1492 case GraphicsExpose: 1534 case GraphicsExpose:
1493 case Expose: 1535 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1495 { 1537 {
1496 do 1538 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1500 1542
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1544
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1506 1548
1507 scr_refresh (refresh_type); 1549 want_refresh = 1;
1508 } 1550 }
1509 else 1551 else
1510 { 1552 {
1511 XEvent unused_event; 1553 XEvent unused_event;
1512 1554
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1514 ; 1556 ;
1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1516 ; 1558 ;
1517 1559
1518 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1519 { 1561 {
1520 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1521 scrollbar_show (0); 1563 scrollbar_show (0);
1522 } 1564 }
1523#ifdef MENUBAR
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose ();
1526#endif
1527 1565
1528#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1531#endif 1569#endif
1532 } 1570 }
1533 break; 1571 break;
1534 1572
1535 case MotionNotify: 1573 case MotionNotify:
1536#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1575 if (hidden_pointer)
1538 pointer_unblank (); 1576 pointer_unblank ();
1539#endif 1577#endif
1540#if MENUBAR
1541 if (isMenuBarWindow (ev.xany.window))
1542 {
1543 menubar_control (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1579 break;
1549 1580
1550 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1551 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1587 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1589 ;
1556 1590
1557 XQueryPointer (disp, TermWin.vt, 1591 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1595 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1574#endif 1608#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1611
1578#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1615 {
1582 int dist; 1616 int dist;
1583 1617
1584 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1630
1597 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1599 { 1633 {
1600 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1602 } 1636 }
1603 else 1637 else
1604 { 1638 {
1605 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1641 }
1608 1642
1609 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1645 + 1;
1612 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1614 } 1648 }
1615 else 1649 else
1616 { 1650 {
1617 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1626#endif 1660#endif
1627 } 1661 }
1628 } 1662 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1664 {
1631 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1633 ; 1667 ;
1634 1668
1635 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1673 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1675 scrollbar_size ());
1642 scr_refresh (refresh_type); 1676 want_refresh = 1;
1643 refresh_limit = 0; 1677 refresh_limit = 0;
1644 scrollbar_show (1); 1678 scrollbar_show (1);
1645 } 1679 }
1646 break; 1680 break;
1647 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1648} 1709}
1649 1710
1650void 1711void
1651rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1652{ 1713{
1653 if (!TermWin.focus) 1714 if (!focus)
1654 { 1715 {
1655 TermWin.focus = 1; 1716 focus = 1;
1656 want_refresh = 1; 1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1657#if USE_XIM 1721#if USE_XIM
1658 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1659 { 1723 {
1660 IMSetStatusPosition (); 1724 IMSetPosition ();
1661 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1662 } 1726 }
1663#endif 1727#endif
1664#if CURSOR_BLINK 1728#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1729 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1667#endif 1731#endif
1668#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1670 { 1734 {
1671 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1676} 1740}
1677 1741
1678void 1742void
1679rxvt_term::focus_out () 1743rxvt_term::focus_out ()
1680{ 1744{
1681 if (TermWin.focus) 1745 if (focus)
1682 { 1746 {
1683 TermWin.focus = 0; 1747 focus = 0;
1684 want_refresh = 1; 1748 want_refresh = 1;
1685 1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1686#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1687 iso14755buf = 0; 1755 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1756# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1757 scr_overlay_off ();
1758# endif
1759 }
1691#endif 1760#endif
1692#if USE_XIM 1761#if USE_XIM
1693 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1695#endif 1764#endif
1696#if CURSOR_BLINK 1765#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1766 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1768 hidden_cursor = 0;
1700#endif 1769#endif
1701#if OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
… …
1710 1779
1711#if TRANSPARENT 1780#if TRANSPARENT
1712void 1781void
1713rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1783{
1715 SET_R (this); 1784 make_current ();
1716 SET_LOCALE (locale);
1717 1785
1718 switch (ev.type) 1786 switch (ev.type)
1719 { 1787 {
1720 case PropertyNotify: 1788 case PropertyNotify:
1721 /* 1789 /*
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1795 return;
1728 1796
1729 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1730 case ReparentNotify: 1798 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1733 break; 1801 break;
1734 } 1802 }
1735} 1803}
1736#endif 1804#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1740{ 1808{
1741 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1742 1810
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1744 if (!bypass_keystate) 1813 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1815
1747 /* 1816 /*
1748 * VT window processing of button press 1817 * VT window processing of button press
1749 */ 1818 */
1750 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1751 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1752#if ISO_14755 1824#if ISO_14755
1753 // 5.4 1825 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1827 {
1756 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1770 { 1842 {
1771 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1772 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1773 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1774 { 1847 {
1775 /* only report double clicks */ 1848 /* only report double clicks */
1776 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1777 mouse_report (ev); 1850 mouse_report (ev);
… …
1809#else 1882#else
1810 selection.rect = false; 1883 selection.rect = false;
1811#endif 1884#endif
1812 1885
1813 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1888 {
1816 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1818 else 1891 else
1819 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1960 case Button3: 2033 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1962 { 2035 {
1963 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1966# else 2039# else
1967 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1968# endif 2041# endif
1969 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1972# else 2045# else
1973 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1974# endif 2047# endif
1975 else 2048 else
1976 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1977 } 2050 }
1978 else 2051 else
1979 { 2052 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2054 (nrow
1982 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2056 / scrollbar_size ()));
1984 } 2057 }
1985 2058
1986 break; 2059 break;
1987 } 2060 }
1988 } 2061 }
2062
1989 return; 2063 return;
1990 } 2064 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2065}
1999 2066
2000void 2067void
2001rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2002{ 2069{
… …
2008 2075
2009 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2010 { 2077 {
2011 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2012 scrollbar_show (0); 2079 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2080 }
2017 2081
2018#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2021#endif 2085#endif
2022 2086
2023 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
2024 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2025#if ISO_14755 2092#if ISO_14755
2026 // 5.4 2093 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2095 return;
2029#endif 2096#endif
2097
2030 if (reportmode) 2098 if (reportmode)
2031 { 2099 {
2032 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2064 { 2132 {
2065 case Button1: 2133 case Button1:
2066 case Button3: 2134 case Button3:
2067 selection_make (ev.time); 2135 selection_make (ev.time);
2068 break; 2136 break;
2137
2069 case Button2: 2138 case Button2:
2070 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2071 break; 2141 break;
2142
2072#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2073 case Button4: 2144 case Button4:
2074 case Button5: 2145 case Button5:
2075 { 2146 {
2076 int i; 2147 int i;
… …
2078 2149
2079 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2080 2151
2081 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2082 i = 1; 2153 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2155 i = nrow - 1;
2085 else 2156 else
2086 i = 5; 2157 i = 5;
2087 2158
2088# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
2090 { 2161 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2165
2095 if (slip_wheel_ev.at < NOW) 2166 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2168
2098 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2099 } 2170 }
2100 else 2171 else
2101 { 2172 {
2102# endif 2173# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2174 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2175 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2176# ifdef MOUSE_SLIP_WHEELING
2116 } 2177 }
2117#endif 2178# endif
2118 } 2179 }
2119 break; 2180 break;
2120#endif 2181#endif
2121 } 2182 }
2122 } 2183 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2184}
2128 2185
2129#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2130#if TINTING 2187#if TINTING
2131/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2132 2189
2133typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2134 2191
2135void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2136{ 2193{
2137 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2138 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2142 int i; 2199 int i;
2143 2200
2144 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2145 2202
2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2147 2204
2148 /* for convenience */ 2205 /* for convenience */
2149 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2370 Atom atype; 2427 Atom atype;
2371 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2372 Window root, oldp, *list; 2429 Window root, oldp, *list;
2373 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2374 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2376 2432
2377 pchanged = 0; 2433 pchanged = 0;
2378 2434
2379 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2381 2437
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2384 2440
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2386 2442
2387 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2388 { 2444 {
2389 if (am_transparent) 2445 if (am_transparent)
2390 { 2446 {
2391 pchanged = 1; 2447 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2394 } 2450 }
2395 2451
2396 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2397 } 2453 }
2398 2454
2399 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2400 XSync (disp, False); 2456 XSync (dpy, False);
2401 2457
2402 /* 2458 /*
2403 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2404 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2405 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2406 */ 2462 */
2407 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2411 2467
2412 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2413 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2416 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2417 2473
2418 if (!i || prop == NULL 2474 if (!i || prop == NULL
2419#if TINTING 2475#if TINTING
2420 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2421#endif 2477#endif
2422 ) 2478 )
2423 have_pixmap = 0; 2479 have_pixmap = 0;
2424 else 2480 else
2425 { 2481 {
… …
2438 Window cr; 2494 Window cr;
2439 XImage *image; 2495 XImage *image;
2440 GC gc; 2496 GC gc;
2441 XGCValues gcvalue; 2497 XGCValues gcvalue;
2442 2498
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2503 nx = ny = 0;
2448 2504
… …
2458 nh += sy; 2514 nh += sy;
2459 ny = -sy; 2515 ny = -sy;
2460 sy = 0; 2516 sy = 0;
2461 } 2517 }
2462 2518
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2521
2466 XSync (disp, False); 2522 XSync (dpy, False);
2467 allowedxerror = -1; 2523 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2525
2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2471 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2472 allowedxerror = 0; 2528 allowedxerror = 0;
2473 2529
2474 if (image == NULL) 2530 if (image == NULL)
2475 { 2531 {
2476 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2477 { 2533 {
2478 pchanged = 1; 2534 pchanged = 1;
2479 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2480 { 2536 {
2481 XFreePixmap (disp, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2482 TermWin.pixmap = None; 2538 pixmap = None;
2483 } 2539 }
2484 } 2540 }
2485 2541
2486 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2487 } 2543 }
2488 else 2544 else
2489 { 2545 {
2490 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2492 2548
2493#if TINTING 2549#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2551 {
2496 unsigned short rm, gm, bm;
2497 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2498 2553
2554 rgba c;
2499 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2500 2556
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2502 } 2558 }
2503#endif 2559#endif
2504 2560
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2506 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2511 XDestroyImage (image); 2566 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (dpy, parent[0]);
2514 2569
2515 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2571 pchanged = 1;
2517 2572
2518 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2519 } 2574 }
2520 } 2575 }
2521 2576
2522 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2524 else 2579 else
2525 { 2580 {
2526 unsigned int n; 2581 unsigned int n;
2527 /* 2582 /*
2528 * InheritPixmap transparency 2583 * InheritPixmap transparency
2529 */ 2584 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2586 {
2532 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2534 &TermWin.parent[i], &list, &n);
2535 XFree (list); 2589 XFree (list);
2536 2590
2537 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2538 { 2592 {
2539 if (oldp != None) 2593 if (oldp != None)
2540 pchanged = 1; 2594 pchanged = 1;
2541 2595
2542 break; 2596 break;
2543 } 2597 }
2544 2598
2545 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2546 pchanged = 1; 2600 pchanged = 1;
2547 } 2601 }
2548 2602
2549 n = 0; 2603 n = 0;
2550 2604
2551 if (pchanged) 2605 if (pchanged)
2552 {
2553 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2554 { 2607 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2611 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2613 break;
2560 } 2614 }
2561 } 2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2562 } 2618 {
2563
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2565 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2621 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2570 } 2623 }
2571 else 2624 else
2572 { 2625 {
2573#if WAIT_FOR_WM
2574 /* wait (an arbitrary period) for the WM to do its thing
2575 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1);
2577#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2579 { 2627 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2629 XClearWindow (dpy, parent[n]);
2582 } 2630 }
2583 2631
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2585 am_transparent = 1; 2633 am_transparent = 1;
2586 } 2634 }
2587 2635
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2637 parent[i] = None;
2590 } 2638 }
2591 2639
2592 if (scrollBar.win) 2640 if (scrollBar.win)
2593 { 2641 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2595 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2596 scrollbar_show (0); 2644 scrollbar_show (0);
2597 } 2645 }
2598 2646
2599 if (am_transparent) 2647 if (am_transparent)
… …
2611 2659
2612bool 2660bool
2613rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2614{ 2662{
2615 bool flag = false; 2663 bool flag = false;
2616 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2618 2666
2619 for (;;) 2667 for (;;)
2620 { 2668 {
2621 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2622 { 2670 {
2623 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2672 ch = next_char ();
2625 }
2626 2673
2627 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2628 break; 2675 break;
2676 }
2629 2677
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2679 {
2632 if (!seen_input) 2680 if (!seen_input)
2633 { 2681 {
… …
2642 if (seen_resize && cmd_pid) 2690 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2644 } 2692 }
2645 2693
2646 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2696 bool refreshnow = false;
2649 int nlines = 0; 2697 int nlines = 0;
2650 unicode_t *str = buf; 2698 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2700
2653 for (;;) 2701 for (;;)
2654 { 2702 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2704 break;
… …
2662 if (ch == C0_LF) 2710 if (ch == C0_LF)
2663 nlines++; 2711 nlines++;
2664 2712
2665 refresh_count++; 2713 refresh_count++;
2666 2714
2667 if (!(options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2717 {
2670 refreshnow = true; 2718 refreshnow = true;
2719 refresh_count = 0;
2671 ch = NOCHAR; 2720 ch = NOCHAR;
2672 break; 2721 break;
2673 } 2722 }
2674 2723
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2725 if (nlines >= nrow - 1)
2677 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2679 nlines = 0; 2731 nlines = 0;
2680 str = buf; 2732 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2733 eol = str + min (ncol, UBUFSIZ);
2682 } 2734 }
2683 2735
2684 if (str >= eol) 2736 if (str >= eol)
2685 { 2737 {
2686 if (eol >= buf + UBUFSIZ) 2738 if (eol >= buf + UBUFSIZ)
2687 { 2739 {
2688 ch = NOCHAR; 2740 ch = NOCHAR;
2689 break; 2741 break;
2690 } 2742 }
2691 else 2743 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2744 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2745 }
2694 2746
2695 } 2747 }
2696 2748
2697 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2750 ch = next_char ();
2699 } 2751 }
2700 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2701 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2702 2756
2703 /* 2757 /*
2704 * If there have been a lot of new lines, then update the screen 2758 * If there have been a lot of new lines, then update the screen
2705 * What the heck I'll cheat and only refresh less than every page-full. 2759 * What the heck I'll cheat and only refresh less than every page-full.
2706 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
2707 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2762 */
2709 if (refreshnow) 2763 if (refreshnow)
2710 { 2764 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++; 2766 refresh_limit++;
2713 else 2767 else
2714 { 2768 {
2715 flag = true; 2769 flag = true;
2716 scr_refresh (refresh_type); 2770 scr_refresh ();
2771 want_refresh = 1;
2717 } 2772 }
2718 } 2773 }
2719 2774
2720 } 2775 }
2721 else 2776 else
… …
2736 } 2791 }
2737 2792
2738 return flag; 2793 return flag;
2739} 2794}
2740 2795
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2796// read the next character
2751unicode_t 2797wchar_t
2752rxvt_term::next_char () 2798rxvt_term::next_char () NOTHROW
2753{ 2799{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2800 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2801 {
2756 // assume 7-bit to be ascii ALWAYS 2802 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2803 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2804 return *cmdbuf_ptr++;
2759 2805
2760 wchar_t wc; 2806 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2807 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2808
2763 if (len == (size_t)-2) 2809 if (len == (size_t)-2)
2764 { 2810 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2811 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2812 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2813 break;
2768 } 2814 }
2769 2815
2770 if (len == (size_t)-1) 2816 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2817 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2818
2773 // assume wchar == unicode 2819 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2820 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2821 return wc & UNICODE_MASK;
2776 } 2822 }
2777 2823
2778 return NOCHAR; 2824 return NOCHAR;
2779} 2825}
2826
2827// read the next octet
2828uint32_t
2829rxvt_term::next_octet () NOTHROW
2830{
2831 return cmdbuf_ptr < cmdbuf_endp
2832 ? (unsigned char)*cmdbuf_ptr++
2833 : NOCHAR;
2834}
2835
2836static class out_of_input out_of_input;
2780 2837
2781/* rxvt_cmd_getc () - Return next input character */ 2838/* rxvt_cmd_getc () - Return next input character */
2782/* 2839/*
2783 * Return the next input character after first passing any keyboard input 2840 * Return the next input character after first passing any keyboard input
2784 * to the command. 2841 * to the command.
2785 */ 2842 */
2786unicode_t 2843wchar_t
2787rxvt_term::cmd_getc () 2844rxvt_term::cmd_getc () THROW ((class out_of_input))
2788{ 2845{
2789 unicode_t c = next_char (); 2846 wchar_t c = next_char ();
2790 2847
2791 if (c == NOCHAR) 2848 if (c == NOCHAR)
2792 throw out_of_input; 2849 throw out_of_input;
2793 2850
2794 return c; 2851 return c;
2795} 2852}
2796 2853
2797unicode_t 2854uint32_t
2798rxvt_term::cmd_get8 () 2855rxvt_term::cmd_get8 () THROW ((class out_of_input))
2799{ 2856{
2800 unicode_t c = next_octet (); 2857 uint32_t c = next_octet ();
2801 2858
2802 if (c == NOCHAR) 2859 if (c == NOCHAR)
2803 throw out_of_input; 2860 throw out_of_input;
2804 2861
2805 return c; 2862 return c;
… …
2905 case C0_ESC: 2962 case C0_ESC:
2906 process_escape_seq (); 2963 process_escape_seq ();
2907 break; 2964 break;
2908 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2967 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 2968 else
2913 tt_write ((unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 2970 break;
2916 case C0_BEL: /* bell */ 2971 case C0_BEL: /* bell */
2917 scr_bell (); 2972 scr_bell ();
2918 break; 2973 break;
2919 case C0_BS: /* backspace */ 2974 case C0_BS: /* backspace */
… …
3043 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
3044 break; 3099 break;
3045 case '+': 3100 case '+':
3046 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
3047 break; 3102 break;
3048#if ENABLE_FRILLS 3103#if !ENABLE_MINIMAL
3049 case '6': 3104 case '6':
3050 scr_backindex (); 3105 scr_backindex ();
3051 break; 3106 break;
3052#endif 3107#endif
3053 case '7': 3108 case '7':
3054 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
3055 break; 3110 break;
3056 case '8': 3111 case '8':
3057 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
3058 break; 3113 break;
3059#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3060 case '9': 3115 case '9':
3061 scr_forwardindex (); 3116 scr_forwardindex ();
3062 break; 3117 break;
3063#endif 3118#endif
3064 case '=': 3119 case '=':
… …
3074 break; 3129 break;
3075 3130
3076 /* 8.3.87: NEXT LINE */ 3131 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 3132 case C1_NEL: /* ESC E */
3078 { 3133 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 3134 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 3135 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 3136 }
3082 break; 3137 break;
3083 3138
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 3139 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 3140 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 3162 process_dcs_seq ();
3108 break; 3163 break;
3109 3164
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3165 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 3166 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 3167 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 3168 break; /* steal obsolete ESC [ c */
3115 3169
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3170 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 3171 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 3172 process_csi_seq ();
… …
3227 ndef = get_byte_array_bit (csi_defaults, i); 3281 ndef = get_byte_array_bit (csi_defaults, i);
3228 for (p = 0; p < nargs; p++) 3282 for (p = 0; p < nargs; p++)
3229 if (arg[p] == -1) 3283 if (arg[p] == -1)
3230 arg[p] = ndef; 3284 arg[p] = ndef;
3231 3285
3232#ifdef DEBUG_CMD
3233 fprintf (stderr, "CSI ");
3234 for (p = 0; p < nargs; p++)
3235 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3236 fprintf (stderr, "%c\n", ch);
3237#endif
3238
3239 /* 3286 /*
3240 * private mode handling 3287 * private mode handling
3241 */ 3288 */
3242 if (priv) 3289 if (priv)
3243 { 3290 {
3244 switch (priv) 3291 switch (priv)
3245 { 3292 {
3246 case '>': 3293 case '>':
3247 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3248 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3295 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3301 // that we do not support xterm mouse reporting (should be 95 when we do).
3302 //
3303 tt_printf ("\033[>%d;94;0c", 'U');
3304 }
3249 break; 3305 break;
3250 case '?': 3306 case '?':
3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3252 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
3253 break; 3309 break;
… …
3358 3414
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3415 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3416 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3417 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3418 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3419 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3420 break;
3365 3421
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3422 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3423 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 3424 break;
3370 3425
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3426 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 3427 process_sgr_mode (nargs, arg);
3373 break; 3428 break;
… …
3380 break; 3435 break;
3381 case 6: /* CPR requested */ 3436 case 6: /* CPR requested */
3382 scr_report_position (); 3437 scr_report_position ();
3383 break; 3438 break;
3384 case 7: /* unofficial extension */ 3439 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 3440 if (OPTION (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3441 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 3442 break;
3388 case 8: /* unofficial extension */ 3443 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 3445 break;
… …
3457 break; 3512 break;
3458 case CSI_75: 3513 case CSI_75:
3459 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
3460 break; 3515 break;
3461 3516
3462#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3463 case CSI_74: 3518 case CSI_74:
3464 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
3465 break; 3520 break;
3466#endif 3521#endif
3467 3522
… …
3474 break; 3529 break;
3475 } 3530 }
3476} 3531}
3477/*}}} */ 3532/*}}} */
3478 3533
3479#if ENABLE_FRILLS 3534#if !ENABLE_MINIMAL
3480/* ARGSUSED */ 3535/* ARGSUSED */
3481void 3536void
3482rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3483{ 3538{
3484 int x, y; 3539 int x, y;
3485 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3486 Window wdummy; 3541 Window wdummy;
3487 dDisp; 3542
3543 dLocal (Display *, dpy);
3488 3544
3489 if (nargs == 0) 3545 if (nargs == 0)
3490 return; 3546 return;
3491 3547
3492 switch (args[0]) 3548 switch (args[0])
3493 { 3549 {
3494 /* 3550 /*
3495 * commands 3551 * commands
3496 */ 3552 */
3497 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3554 XMapWindow (dpy, parent[0]);
3499 break; 3555 break;
3500 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3502 break; 3558 break;
3503 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3505 break; 3561 break;
3506 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3564 break;
3509 case 5: /* raise window */ 3565 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3511 break; 3567 break;
3512 case 6: /* lower window */ 3568 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3514 break; 3570 break;
3515 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3516 scr_touch (true); 3572 scr_touch (true);
3517 break; 3573 break;
3518 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3575 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
3521 break; 3577 break;
3522 3578
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3579 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3580 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3582 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3583 (unsigned int) (args[1] * fheight));
3528 break; 3584 break;
3529
3530 3585
3531 /* 3586 /*
3532 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3533 */ 3588 */
3534 case 11: /* report window state */ 3589 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3592 break;
3538 case 13: /* report window position */ 3593 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3599 break;
3545 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3603 break;
3549 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3606 break;
3552 case 19: /* report window size (chars) */ 3607 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3609 break;
3555 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3556 { 3611 {
3557 char *s; 3612 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3615 XFree (s);
3561 } 3616 }
3562 break; 3617 break;
3563 case 21: /* report window title */ 3618 case 21: /* report window title */
3564 { 3619 {
3565 char *s; 3620 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3623 XFree (s);
3569 } 3624 }
3570 break; 3625 break;
3571 } 3626 }
3572} 3627}
… …
3575/*----------------------------------------------------------------------*/ 3630/*----------------------------------------------------------------------*/
3576/* 3631/*
3577 * get input up until STRING TERMINATOR (or BEL) 3632 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3633 * ends_how is terminator used. returned input must be free()'d
3579 */ 3634 */
3580unsigned char * 3635char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3636rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3637{
3583 unicode_t ch; 3638 unicode_t ch;
3584 bool seen_esc = false; 3639 bool seen_esc = false;
3585 unsigned int n = 0; 3640 unsigned int n = 0;
… …
3618 3673
3619 string[n++] = '\0'; 3674 string[n++] = '\0';
3620 3675
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3676 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3677
3623 return (unsigned char *)rxvt_wcstombs (string); 3678 return rxvt_wcstombs (string);
3624} 3679}
3625 3680
3626/*----------------------------------------------------------------------*/ 3681/*----------------------------------------------------------------------*/
3627/* 3682/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3683 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3684 */
3630void 3685void
3631rxvt_term::process_dcs_seq () 3686rxvt_term::process_dcs_seq ()
3632{ 3687{
3633 unsigned char *s; 3688 char *s;
3634 unicode_t eh; 3689 unicode_t eh;
3635 3690
3636 /* 3691 /*
3637 * Not handled yet 3692 * Not handled yet
3638 */ 3693 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3712 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3713 arg = arg * 10 + (ch - '0');
3659 3714
3660 if (ch == ';') 3715 if (ch == ';')
3661 { 3716 {
3662 unsigned char *s = get_to_st (eh); 3717 char *s = get_to_st (eh);
3663 3718
3664 if (s) 3719 if (s)
3665 { 3720 {
3666 process_xterm_seq (arg, (char *)s, eh); 3721 process_xterm_seq (arg, s, eh);
3667 free (s); 3722 free (s);
3668 } 3723 }
3669 } 3724 }
3670} 3725}
3671 3726
3672void 3727void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3728rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3729{
3675 if (str[0] == '?' && !str[1]) 3730 if (str[0] == '?' && !str[1])
3676 { 3731 {
3677 unsigned short r, g, b; 3732 rgba c;
3678 pix_colors_focused[color].get (display, r, g, b); 3733 pix_colors_focused[color].get (c);
3734
3735#if XFT
3736 if (c.a != rgba::MAX_CC)
3737 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3738 else
3739#endif
3679 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3680 } 3741 }
3681 else 3742 else
3682 set_window_color (color, str); 3743 set_window_color (color, str);
3683} 3744}
3684 3745
3685/* 3746/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3748 */
3688void 3749void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3751{
3691 int changed = 0;
3692 int color; 3752 int color;
3693 char *buf, *name; 3753 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3695 int saveop = op; 3755 int saveop = op;
3696 dDisp; 3756
3757 dLocal (Display *, dpy);
3697 3758
3698 assert (str != NULL); 3759 assert (str != NULL);
3699 switch (op) 3760 switch (op)
3700 { 3761 {
3701 case XTerm_name: 3762 case XTerm_name:
… …
3717 unsigned long bytes_after; 3778 unsigned long bytes_after;
3718 unsigned char *value = 0; 3779 unsigned char *value = 0;
3719 const char *str = ""; 3780 const char *str = "";
3720 3781
3721 if (prop 3782 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3787 && actual_type != None
3727 && actual_format == 8) 3788 && actual_format == 8)
3728 str = (const char *)(value); 3789 str = (const char *)(value);
3729 3790
3730 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3731 3792
3732 XFree (value); 3793 XFree (value);
3733 } 3794 }
3734 else 3795 else
3735 { 3796 {
… …
3739 { 3800 {
3740 *eq = 0; 3801 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3742 } 3803 }
3743 else 3804 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3805 XDeleteProperty (dpy, parent[0],
3745 display->atom (str)); 3806 display->atom (str));
3746 } 3807 }
3747 break; 3808 break;
3748 3809
3749 case XTerm_Color: 3810 case XTerm_Color:
… …
3751 { 3812 {
3752 if ((name = strchr (buf, ';')) == NULL) 3813 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3814 break;
3754 3815
3755 *name++ = '\0'; 3816 *name++ = '\0';
3756 color = atoi (buf); 3817 color = atoi (buf) + minCOLOR;
3757 3818
3758 if (color < 0 || color >= TOTAL_COLORS) 3819 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3820 break;
3760 3821
3761 if ((buf = strchr (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3823 *buf++ = '\0';
3763 3824
3764 if (name[0] == '?' && !name[1]) 3825 process_color_seq (op, color, name, resp);
3765 {
3766 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 }
3770 else
3771 set_window_color (color + minCOLOR, name);
3772 } 3826 }
3773 break; 3827 break;
3774 case XTerm_Color00: 3828 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3829 process_color_seq (op, Color_fg, str, resp);
3776 break; 3830 break;
3777 case XTerm_Color01: 3831 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3832 process_color_seq (op, Color_bg, str, resp);
3779 break; 3833 break;
3780#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3836 process_color_seq (op, Color_cursor, str, resp);
3783 break; 3837 break;
3784#endif 3838#endif
3785 case XTerm_Color_pointer_fg: 3839 case XTerm_Color_pointer_fg:
3786 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3787 break; 3841 break;
3788 case XTerm_Color_pointer_bg: 3842 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3843 process_color_seq (op, Color_pointer_bg, str, resp);
3790 break; 3844 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3846 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3847 process_color_seq (op, Color_RV, str, resp);
3848 break;
3849 case Rxvt_Color_BD:
3850 case URxvt_Color_BD:
3851 process_color_seq (op, Color_BD, str, resp);
3852 break;
3853 case Rxvt_Color_UL:
3854 case URxvt_Color_UL:
3855 process_color_seq (op, Color_UL, str, resp);
3800 break; 3856 break;
3801 case URxvt_Color_IT: 3857 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3858 process_color_seq (op, Color_IT, str, resp);
3803 break; 3859 break;
3804#endif 3860#endif
3805#if TRANSPARENT && TINTING 3861#if TRANSPARENT && TINTING
3806 case URxvt_Color_tint: 3862 case URxvt_Color_tint:
3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3863 process_color_seq (op, Color_tint, str, resp);
3864
3808 check_our_parents (); 3865 check_our_parents ();
3866
3809 if (am_transparent) 3867 if (am_transparent)
3810 want_full_refresh = want_refresh = 1; 3868 want_full_refresh = want_refresh = 1;
3811 break;
3812#endif
3813 3869
3870 break;
3871#endif
3872
3814 case XTerm_Pixmap: 3873 case Rxvt_Pixmap:
3874 {
3815 if (*str != ';') 3875 if (*str != ';')
3816 { 3876 {
3817#if XPM_BACKGROUND 3877#if XPM_BACKGROUND
3818 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3819 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3820#endif
3821 scr_touch (true); 3880 scr_touch (true);
3881#endif
3822 } 3882 }
3883
3884 int changed = 0;
3885
3823 while ((str = strchr (str, ';')) != NULL) 3886 while ((str = strchr (str, ';')) != NULL)
3824 { 3887 {
3825 str++; 3888 str++;
3826#if XPM_BACKGROUND 3889#if XPM_BACKGROUND
3827 changed += scale_pixmap (str); 3890 changed += scale_pixmap (str);
3828#endif 3891#endif
3829 } 3892 }
3830 3893
3831 if (changed) 3894 if (changed)
3832 { 3895 {
3833#ifdef XPM_BACKGROUND 3896#ifdef XPM_BACKGROUND
3834 resize_pixmap (); 3897 resize_pixmap ();
3835#endif
3836 scr_touch (true); 3898 scr_touch (true);
3899#endif
3837 } 3900 }
3901 }
3838 break; 3902 break;
3839 3903
3840 case XTerm_restoreFG: 3904 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3905 set_window_color (Color_fg, str);
3842 break; 3906 break;
3843 case XTerm_restoreBG: 3907 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3908 set_window_color (Color_bg, str);
3845 break; 3909 break;
3846 3910
3847 case XTerm_logfile: 3911 case XTerm_logfile:
3848 // TODO, when secure mode? 3912 // TODO, when secure mode?
3849 break; 3913 break;
3850 3914
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0 3915#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3916 case Rxvt_dumpscreen: /* no error notices */
3859 { 3917 {
3860 int fd; 3918 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3920 {
3863 scr_dump (fd); 3921 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3932 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3933 case URxvt_boldItalicFont:
3876#endif 3934#endif
3877 if (query) 3935 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3938 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3939 resp);
3882 else 3940 else
3883 { 3941 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3943
… …
3887 allocated.push_back ((void *)res); 3945 allocated.push_back ((void *)res);
3888 set_fonts (); 3946 set_fonts ();
3889 } 3947 }
3890 break; 3948 break;
3891 3949
3892#if ENABLE_FRILLS 3950 case URxvt_version:
3951 if (query)
3952 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3953 op,
3954 rs[Rs_name], VERSION[0], VERSION[2],
3955 resp);
3956 break;
3957
3958#if !ENABLE_MINIMAL
3893 case URxvt_locale: 3959 case URxvt_locale:
3894 if (query) 3960 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3896 else 3962 else
3897 { 3963 {
3898 set_locale (str); 3964 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3900 init_xlocale (); 3966 init_xlocale ();
3901 } 3967 }
3902 break; 3968 break;
3903 3969
3904 case URxvt_view_up: 3970 case URxvt_view_up:
3905 case URxvt_view_down: 3971 case URxvt_view_down:
3972 {
3906 int lines = atoi (str); 3973 int lines = atoi (str);
3907 3974
3908 if (lines) 3975 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 3976 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 3977 else
3911 {
3912 scr_erase_savelines (); 3978 scr_erase_savelines ();
3913 } 3979 }
3914 3980
3981 break;
3982#endif
3983
3984#if ENABLE_PERL
3985 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3987 ; // no responses yet
3915 break; 3988 break;
3916#endif 3989#endif
3917 } 3990 }
3918} 3991}
3919/*----------------------------------------------------------------------*/ 3992/*----------------------------------------------------------------------*/
… …
3950 return state; 4023 return state;
3951} 4024}
3952 4025
3953/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
3954void 4027void
3955rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3956{ 4029{
3957 unsigned int i, j; 4030 unsigned int i, j;
3958 int state; 4031 int state;
3959 4032
3960 static const struct 4033 static const struct
… …
3971 { 5, PrivMode_rVideo }, 4044 { 5, PrivMode_rVideo },
3972 { 6, PrivMode_relOrigin }, 4045 { 6, PrivMode_relOrigin },
3973 { 7, PrivMode_Autowrap }, 4046 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode 4047 // 8, bi-directional support mode
3975 { 9, PrivMode_MouseX10 }, 4048 { 9, PrivMode_MouseX10 },
3976#ifdef menuBar_esc
3977 { menuBar_esc, PrivMode_menuBar },
3978#endif
3979 // 18, 19 printing-related 4049 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor }, 4050 { 25, PrivMode_VisibleCursor },
3981#ifdef scrollBar_esc 4051#ifdef scrollBar_esc
3982 { scrollBar_esc, PrivMode_scrollBar }, 4052 { scrollBar_esc, PrivMode_scrollBar },
3983#endif 4053#endif
… …
4028 } 4098 }
4029 4099
4030 /* extra handling for values with state unkept */ 4100 /* extra handling for values with state unkept */
4031 switch (arg[i]) 4101 switch (arg[i])
4032 { 4102 {
4103#if ENABLE_STYLES
4104 case 1021:
4105 set_option (Opt_intensityStyles, mode);
4106
4107 scr_touch (true);
4108 break;
4109#endif
4033 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4034 case 1049: 4111 case 1049:
4035 if (options & Opt_secondaryScreen) 4112 if (OPTION (Opt_secondaryScreen))
4036 if (mode == 0) 4113 if (mode == 0)
4037 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
4038 else if (mode == 1) 4115 else if (mode == 1)
4039 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
4040 break; 4117 break;
… …
4052 */ 4129 */
4053 PrivMode (1, PrivMode_vt52); 4130 PrivMode (1, PrivMode_vt52);
4054 break; 4131 break;
4055 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4135 break;
4059 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 4137 set_option (Opt_jumpScroll, !state);
4064 break; 4138 break;
4065 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4067 break; 4141 break;
4068 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4074 /* case 8: - auto repeat, can't do on a per window basis */ 4148 /* case 8: - auto repeat, can't do on a per window basis */
4075 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
4076 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
4077 priv_modes &= ~PrivMode_MouseX11; 4151 priv_modes &= ~PrivMode_MouseX11;
4078 break; 4152 break;
4079#ifdef menuBar_esc
4080 case menuBar_esc:
4081#ifdef MENUBAR
4082 map_menuBar (state);
4083#endif
4084 break;
4085#endif
4086#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
4087 case scrollBar_esc: 4154 case scrollBar_esc:
4088 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
4089 { 4156 {
4090 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
… …
4109#if 0 4176#if 0
4110 case 1001: 4177 case 1001:
4111 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4112#endif 4179#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 4181 set_option (Opt_scrollTtyOutput, !state);
4118 break; 4182 break;
4119 case 1011: /* scroll to bottom on key press */ 4183 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 4184 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 4185 break;
4125 case 1047: /* secondary screen w/ clearing last */ 4186 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 4187 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4188 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4189 scr_erase_screen (2);
4129 scr_change_screen (state); 4190 scr_change_screen (state);
4130 break; 4191 break;
4131 case 1049: /* secondary screen w/ clearing first */ 4192 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 4193 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 4196 scr_erase_screen (2);
4136 break; 4197 break;
4137 default: 4198 default:
4138 break; 4199 break;
… …
4266 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
4267 break; 4328 break;
4268 4329
4269 //case 50: // not variable spacing 4330 //case 50: // not variable spacing
4270 4331
4271#ifndef NO_BRIGHTCOLOR 4332#if !ENABLE_MINIMAL
4272 case 90: 4333 case 90:
4273 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
4274 case 92: 4335 case 92:
4275 case 93: 4336 case 93:
4276 case 94: 4337 case 94:
… …
4288 case 106: 4349 case 106:
4289 case 107: 4350 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4351 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 4352 break;
4292#endif 4353#endif
4293
4294 } 4354 }
4295 } 4355 }
4296} 4356}
4297/*}}} */ 4357/*}}} */
4298 4358
… …
4322 */ 4382 */
4323void 4383void
4324rxvt_term::tt_printf (const char *fmt,...) 4384rxvt_term::tt_printf (const char *fmt,...)
4325{ 4385{
4326 va_list arg_ptr; 4386 va_list arg_ptr;
4327 unsigned char buf[256]; 4387 char buf[256];
4328 4388
4329 va_start (arg_ptr, fmt); 4389 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 4391 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 4392 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 4397 * or generated by us in response to a query ESC sequence.
4338 */ 4398 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 4400
4341void 4401void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 4403{
4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4405 return;
4406
4407 if (pty->pty < 0)
4408 return;
4409
4344 if (v_buflen == 0) 4410 if (v_buflen == 0)
4345 { 4411 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4347 4413
4348 if ((unsigned int)written == len) 4414 if ((unsigned int)written == len)
4349 return; 4415 return;
4350 4416
4351 data += written; 4417 data += written;
4352 len -= written; 4418 len -= written;
4353 } 4419 }
4354 4420
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 4422
4357 memcpy (v_buffer + v_buflen, data, len); 4423 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 4424 v_buflen += len;
4359 4425
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4361} 4427}
4362 4428
4363void rxvt_term::pty_write () 4429void rxvt_term::pty_write ()
4364{ 4430{
4365 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4366 4432
4367 if (written > 0) 4433 if (written > 0)
4368 { 4434 {
4369 v_buflen -= written; 4435 v_buflen -= written;
4370 4436
… …
4379 } 4445 }
4380 4446
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4448 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4451}
4387 4452
4388/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4389 4454

Diff Legend

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