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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.308 by root, Mon Feb 20 19:42:55 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
147 151
148 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
149 { 153 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
153 break; 156 break;
154 } 157 }
155 158
156 x--; 159 x--;
157 } 160 }
158
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
172
171#if ENABLE_COMBINING 173# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 char attr[80]; // plenty
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
212 243
244 free (fname);
245
213#if ENABLE_COMBINING 246# if ENABLE_COMBINING
214 if (alloc) 247 if (alloc)
215 delete [] alloc; 248 delete [] alloc;
216#endif 249# endif
217} 250}
218#endif 251#endif
219 252
220void 253void
221rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 271 mb[0] = ch[0];
239 len = 1; 272 len = 1;
240 } 273 }
241 274
242 if (len > 0) 275 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
244 else 277 else
245 scr_bell (); 278 scr_bell ();
246 } 279 }
247 280
248 iso14755buf = 0; 281 iso14755buf = 0;
… …
265 298
266 return -1; 299 return -1;
267} 300}
268#endif 301#endif
269 302
270/*{{{ Convert the keypress event into a string */
271void 303void
272rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
273{ 305{
274 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
275 unsigned int newlen; 307 unsigned int newlen;
276 KeySym keysym; 308 KeySym keysym;
277#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */
279#endif
280 int valid_keysym; 309 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
282 316
283 /* 317 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
286 * 320 *
… …
304 Status status_return; 338 Status status_return;
305 339
306#if 0 340#if 0
307#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
311 else 345 else
312#endif 346#endif
313#endif 347#endif
314 { 348 {
… …
316 350
317 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
321 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
324 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 361 SET_LOCALE (locale);
326 362
327 if (status_return == XLookupChars 363 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
350 } 386 }
351 else 387 else
352#endif 388#endif
353 { 389 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
356 } 392 }
357 393
358 if (valid_keysym) 394 if (valid_keysym)
359 { 395 {
360#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 398 return;
363#endif 399#endif
364 400
365 if (TermWin.saveLines) 401 if (saveLines)
366 { 402 {
367#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 404 if (!ctrl && !meta)
369#else 405#else
370 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
371#endif 407#endif
372 { 408 {
373 int lnsppg; 409 int lnsppg;
374 410
375#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 413#else
378 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
379#endif 415#endif
380 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
381 { 417 {
382 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
383 return; 419 return;
… …
411 scr_move_to (0, 1); 447 scr_move_to (0, 1);
412 return; 448 return;
413 } 449 }
414 else if (keysym == XK_End) 450 else if (keysym == XK_End)
415 { 451 {
416 scr_move_to (1, 0); 452 scr_move_to (1, 1);
417 return; 453 return;
418 } 454 }
419 } 455 }
420#endif 456#endif
421 } 457 }
… …
432 { 468 {
433 switch (keysym) 469 switch (keysym)
434 { 470 {
435 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
436 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
437 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
438 return; 474 return;
439#if TODO 475#if TODO
440 /* rxvt extras */ 476 /* rxvt extras */
441 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
442 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
823 { 859 {
824#ifdef META8_OPTION 860#ifdef META8_OPTION
825 /* set 8-bit on */ 861 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
827 { 863 {
828 unsigned char *ch; 864 char *ch;
829 865
830 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 867 *ch |= 0x80;
832 868
833 meta = 0; 869 meta = 0;
… …
835#endif 871#endif
836 /* nil */ ; 872 /* nil */ ;
837 } 873 }
838 } 874 }
839 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
840 if (len <= 0) 879 if (len <= 0)
841 return; /* not mapped */ 880 return; /* not mapped */
842 881
843 if (options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 883 if (view_start)
845 { 884 {
846 TermWin.view_start = 0; 885 view_start = 0;
847 want_refresh = 1; 886 want_refresh = 1;
848 } 887 }
849 888
850 /* 889 /*
851 * these modifications only affect the static keybuffer 890 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 905#ifdef META8_OPTION
867 && meta_char == C0_ESC 906 && meta_char == C0_ESC
868#endif 907#endif
869 ) 908 )
870 { 909 {
871 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
872 tt_write (&ch, 1); 911 tt_write (&ch, 1);
873 } 912 }
874 913
875#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */
877 unsigned char *p;
878 int i;
879
880 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
881 for (i = 0, p = kbuf; i < len; i++, p++)
882 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
883 fprintf (stderr, "'\n");
884#endif /* DEBUG_CMD */
885 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
886} 915}
887/*}}} */
888 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
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */
892unsigned int 995unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 997{
895 unsigned int n, s; 998 unsigned int n, s;
896 999
897 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 1038 }
936#endif 1039#endif
937 1040
938 if (want_refresh) 1041 if (want_refresh)
939 { 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
940 scr_refresh (refresh_type); 1081 scr_refresh ();
941 scrollbar_show (1); 1082 scrollbar_show (1);
942#ifdef USE_XIM 1083#ifdef USE_XIM
943 IMSendSpot (); 1084 IMSendSpot ();
944#endif 1085#endif
945 } 1086 }
… …
948} 1089}
949 1090
950void 1091void
951rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
952{ 1093{
953 SET_R (this); 1094 make_current ();
954 SET_LOCALE (locale);
955 1095
956 display->flush (); 1096 display->flush ();
957 1097
958 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1100}
961 1101
962void 1102void
963rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
964{ 1104{
965 SET_R (this); 1105 make_current ();
966 SET_LOCALE (locale);
967 1106
968 refresh_limit = 1; 1107 refresh_limit = 1;
969 refresh_count = 0; 1108 refresh_count = 0;
970 flush (); 1109 flush ();
971} 1110}
… …
975rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
976{ 1115{
977 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1117 want_refresh = 1;
979 1118
980 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
981} 1120}
982#endif 1121#endif
983 1122
984#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
985void 1124void
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1139{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1142 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1143 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1145 }
1008} 1146}
1009#endif 1147#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1152{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1154 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1156 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1158 }
1022} 1159}
1023#endif 1160#endif
… …
1028{ 1165{
1029 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1030 || 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)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1169 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1170 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1036 1172
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1173 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1175 }
1041} 1176}
1042#endif 1177#endif
1043 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
1044bool 1204bool
1045rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1046{ 1206{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1208
1049 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1050 { 1210 {
1051 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");
1052 n = 0; 1212 n = 0;
1053 } 1213 }
1054 1214
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1058 1218
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1220
1061 if (n > 0) 1221 if (r > 0)
1062 { 1222 {
1063 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
1064 return true; 1224 return true;
1065 } 1225 }
1066 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))
1067 destroy (); 1238 destroy ();
1239 }
1068 1240
1069 return false; 1241 return false;
1070} 1242}
1071 1243
1072void 1244void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1246{
1075 SET_R (this); 1247 make_current ();
1076 SET_LOCALE (locale);
1077 1248
1078 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1251 while (pty_fill ())
1081 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1086} 1257}
1087 1258
1088void 1259void
1089rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1090{ 1261{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1263 recolour_cursor ();
1093 1264
1094#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1266 hidden_pointer = 0;
1096 1267
1097 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1270#endif
1100} 1271}
1101 1272
1102#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1103void 1274void
1104rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1105{ 1276{
1106 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1107 return; 1278 return;
1108 1279
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1281 XFlush (dpy);
1111 1282
1112 hidden_pointer = 1; 1283 hidden_pointer = 1;
1113} 1284}
1114 1285
1115void 1286void
1116rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1117{ 1288{
1118 SET_R (this); 1289 make_current ();
1119 SET_LOCALE (locale);
1120 1290
1121 pointer_blank (); 1291 pointer_blank ();
1122} 1292}
1123#endif 1293#endif
1124 1294
… …
1189 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1190 (32 + x + 1), 1360 (32 + x + 1),
1191 (32 + y + 1)); 1361 (32 + y + 1));
1192} 1362}
1193 1363
1194#ifdef USING_W11LIB
1195void
1196rxvt_W11_process_x_event (XEvent *ev)
1197{
1198 rxvt_t *r = rxvt_get_r ();
1199
1200 x_cb (*ev);
1201}
1202#endif
1203
1204/*{{{ process an X event */ 1364/*{{{ process an X event */
1205void 1365void
1206rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1207{ 1367{
1208 dDisp; 1368 make_current ();
1209 1369
1210 SET_R (this); 1370 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1371
1213#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1375 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1376
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1380 unsigned int unused_mask;
1243 1381
1244 switch (ev.type) 1382 switch (ev.type)
1245 { 1383 {
1246 case KeyPress: 1384 case KeyPress:
1247#if ISO_14755 1385 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1386 break;
1253 1387
1254 case KeyRelease: 1388 case KeyRelease:
1255 { 1389 key_release (ev.xkey);
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
1315
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1320 mouse_slip_wheel_speed = 0;
1321#endif
1322 break; 1390 break;
1323 }
1324 1391
1325 case ButtonPress: 1392 case ButtonPress:
1326 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1327 break; 1394 break;
1328 1395
… …
1330 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1331 break; 1398 break;
1332 1399
1333 case ClientMessage: 1400 case ClientMessage:
1334 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1336 destroy ();
1337#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink))
1343 { 1403 {
1344 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1345 Atom ActualType; 1405 {
1346 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1347 unsigned char *data; 1407 {
1348 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1349 1409 {
1350 XGetWindowProperty (disp, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1351 xa[XA_DNDSELECTION], 1411 destroy ();
1352 0L, 1000000L, 1412 }
1353 False, AnyPropertyType, 1413#if ENABLE_EWMH
1354 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1355 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1356 &data); 1417 &ev);
1357 set_string_property (XA_CUT_BUFFER0, data); 1418#endif
1358 XFree (data); 1419 }
1359 selection_paste (display->root, XA_CUT_BUFFER0, true); 1420 }
1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 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 }
1429#endif
1361 } 1430 }
1362#endif /* OFFIX_DND */
1363 break; 1431 break;
1364 1432
1365 case MappingNotify: 1433 case MappingNotify:
1366 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1367 break; 1435 break;
… …
1390 break; 1458 break;
1391 } 1459 }
1392 break; 1460 break;
1393 1461
1394 case FocusIn: 1462 case FocusIn:
1395 if (!TermWin.focus) 1463 focus_in ();
1464 break;
1465
1466 case FocusOut:
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0])
1396 { 1472 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ;
1464 1475
1465 if (szHint.width != width || szHint.height != height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1477 {
1467 seen_resize = 1; 1478 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1480 }
1470 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1486 check_our_parents ();
1474#endif 1487#endif
1475 } 1488 }
1476 break; 1489 break;
1477 1490
1478 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482 1496
1483 break; 1497 break;
1484 1498
1485 case SelectionClear: 1499 case SelectionClear:
1486 selection_clear (); 1500 selection_clear ();
… …
1493 1507
1494 case SelectionRequest: 1508 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1496 break; 1510 break;
1497 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
1498 case UnmapNotify: 1520 case UnmapNotify:
1499 TermWin.mapped = 0; 1521 mapped = 0;
1500#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1502#endif 1524#endif
1503 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break; 1526 break;
1511 1527
1512#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1513 case ReparentNotify: 1529 case ReparentNotify:
1514 rootwin_cb (ev); 1530 rootwin_cb (ev);
1515 break; 1531 break;
1516#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1517 1533
1518 case GraphicsExpose: 1534 case GraphicsExpose:
1519 case Expose: 1535 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1521 { 1537 {
1522 do 1538 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1542
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1544
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1532 1548
1533 scr_refresh (refresh_type); 1549 want_refresh = 1;
1534 } 1550 }
1535 else 1551 else
1536 { 1552 {
1537 XEvent unused_event; 1553 XEvent unused_event;
1538 1554
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1556 ;
1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1558 ;
1543 1559
1544 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1545 { 1561 {
1546 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1547 scrollbar_show (0); 1563 scrollbar_show (0);
1548 } 1564 }
1549#ifdef MENUBAR
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose ();
1552#endif
1553 1565
1554#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1557#endif 1569#endif
1558 } 1570 }
1559 break; 1571 break;
1560 1572
1561 case MotionNotify: 1573 case MotionNotify:
1562#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1575 if (hidden_pointer)
1564 pointer_unblank (); 1576 pointer_unblank ();
1565#endif 1577#endif
1566#if MENUBAR
1567 if (isMenuBarWindow (ev.xany.window))
1568 {
1569 menubar_control (ev.xbutton);
1570 break;
1571 }
1572#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1579 break;
1575 1580
1576 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1577 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1587 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1589 ;
1582 1590
1583 XQueryPointer (disp, TermWin.vt, 1591 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1595 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1600#endif 1608#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1611
1604#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1615 {
1608 int dist; 1616 int dist;
1609 1617
1610 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1630
1623 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1625 { 1633 {
1626 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1628 } 1636 }
1629 else 1637 else
1630 { 1638 {
1631 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1641 }
1634 1642
1635 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1645 + 1;
1638 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1640 } 1648 }
1641 else 1649 else
1642 { 1650 {
1643 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1652#endif 1660#endif
1653 } 1661 }
1654 } 1662 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1664 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1659 ; 1667 ;
1660 1668
1661 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1673 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1675 scrollbar_size ());
1668 scr_refresh (refresh_type); 1676 want_refresh = 1;
1669 refresh_limit = 0; 1677 refresh_limit = 0;
1670 scrollbar_show (1); 1678 scrollbar_show (1);
1671 } 1679 }
1672 break; 1680 break;
1673 } 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
1709}
1710
1711void
1712rxvt_term::focus_in ()
1713{
1714 if (!focus)
1715 {
1716 focus = 1;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 {
1724 IMSetPosition ();
1725 XSetICFocus (Input_Context);
1726 }
1727#endif
1728#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif
1732#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade])
1734 {
1735 pix_colors = pix_colors_focused;
1736 scr_recolour ();
1737 }
1738#endif
1739 }
1740}
1741
1742void
1743rxvt_term::focus_out ()
1744{
1745 if (focus)
1746 {
1747 focus = 0;
1748 want_refresh = 1;
1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1755 iso14755buf = 0;
1756# if ENABLE_OVERLAY
1757 scr_overlay_off ();
1758# endif
1759 }
1760#endif
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context);
1764#endif
1765#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink))
1767 cursor_blink_ev.stop ();
1768 hidden_cursor = 0;
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_unfocused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1674} 1778}
1675 1779
1676#if TRANSPARENT 1780#if TRANSPARENT
1677void 1781void
1678rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1783{
1680 SET_R (this); 1784 make_current ();
1681 SET_LOCALE (locale);
1682 1785
1683 switch (ev.type) 1786 switch (ev.type)
1684 { 1787 {
1685 case PropertyNotify: 1788 case PropertyNotify:
1686 /* 1789 /*
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1795 return;
1693 1796
1694 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1695 case ReparentNotify: 1798 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1698 break; 1801 break;
1699 } 1802 }
1700} 1803}
1701#endif 1804#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1705{ 1808{
1706 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1707 1810
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1709 if (!bypass_keystate) 1813 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1815
1712 /* 1816 /*
1713 * VT window processing of button press 1817 * VT window processing of button press
1714 */ 1818 */
1715 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1716 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1717#if ISO_14755 1824#if ISO_14755
1718 // 5.4 1825 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1827 {
1721 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1735 { 1842 {
1736 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1737 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1738 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1739 { 1847 {
1740 /* only report double clicks */ 1848 /* only report double clicks */
1741 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1742 mouse_report (ev); 1850 mouse_report (ev);
… …
1774#else 1882#else
1775 selection.rect = false; 1883 selection.rect = false;
1776#endif 1884#endif
1777 1885
1778 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1888 {
1781 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1783 else 1891 else
1784 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1925 case Button3: 2033 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1927 { 2035 {
1928 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1931# else 2039# else
1932 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1933# endif 2041# endif
1934 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1937# else 2045# else
1938 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1939# endif 2047# endif
1940 else 2048 else
1941 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1942 } 2050 }
1943 else 2051 else
1944 { 2052 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2054 (nrow
1947 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2056 / scrollbar_size ()));
1949 } 2057 }
1950 2058
1951 break; 2059 break;
1952 } 2060 }
1953 } 2061 }
2062
1954 return; 2063 return;
1955 } 2064 }
1956#if MENUBAR
1957 /*
1958 * Menubar window processing of button press
1959 */
1960 if (isMenuBarWindow (ev.window))
1961 menubar_control (ev);
1962#endif
1963} 2065}
1964 2066
1965void 2067void
1966rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1967{ 2069{
… …
1973 2075
1974 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1975 { 2077 {
1976 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1977 scrollbar_show (0); 2079 scrollbar_show (0);
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 refresh_type &= ~SMOOTH_REFRESH;
1980#endif
1981 } 2080 }
1982 2081
1983#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
1986#endif 2085#endif
1987 2086
1988 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1989 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
1990#if ISO_14755 2092#if ISO_14755
1991 // 5.4 2093 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2095 return;
1994#endif 2096#endif
2097
1995 if (reportmode) 2098 if (reportmode)
1996 { 2099 {
1997 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1998 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1999 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2029 { 2132 {
2030 case Button1: 2133 case Button1:
2031 case Button3: 2134 case Button3:
2032 selection_make (ev.time); 2135 selection_make (ev.time);
2033 break; 2136 break;
2137
2034 case Button2: 2138 case Button2:
2035 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);
2036 break; 2141 break;
2142
2037#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2038 case Button4: 2144 case Button4:
2039 case Button5: 2145 case Button5:
2040 { 2146 {
2041 int i; 2147 int i;
… …
2043 2149
2044 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2045 2151
2046 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2047 i = 1; 2153 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2155 i = nrow - 1;
2050 else 2156 else
2051 i = 5; 2157 i = 5;
2052 2158
2053# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
2055 { 2161 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2057 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;
2058 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;
2059 2165
2060 if (slip_wheel_ev.at < NOW) 2166 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2168
2063 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2064 } 2170 }
2065 else 2171 else
2066 { 2172 {
2067# endif 2173# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2174 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2175 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2176# ifdef MOUSE_SLIP_WHEELING
2081 } 2177 }
2082#endif 2178# endif
2083 } 2179 }
2084 break; 2180 break;
2085#endif 2181#endif
2086 } 2182 }
2087 } 2183 }
2088#ifdef MENUBAR
2089 else if (isMenuBarWindow (ev.window))
2090 menubar_control (ev);
2091#endif
2092} 2184}
2093 2185
2094#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2095#if TINTING 2187#if TINTING
2096/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2097 2189
2098typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2099 2191
2100void 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)
2101{ 2193{
2102 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2103 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i; 2199 int i;
2108 2200
2109 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2110 2202
2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2112 2204
2113 /* for convenience */ 2205 /* for convenience */
2114 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2335 Atom atype; 2427 Atom atype;
2336 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2337 Window root, oldp, *list; 2429 Window root, oldp, *list;
2338 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2339 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2341 2432
2342 pchanged = 0; 2433 pchanged = 0;
2343 2434
2344 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2346 2437
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2349 2440
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2351 2442
2352 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2353 { 2444 {
2354 if (am_transparent) 2445 if (am_transparent)
2355 { 2446 {
2356 pchanged = 1; 2447 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2359 } 2450 }
2360 2451
2361 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2362 } 2453 }
2363 2454
2364 /* 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. */
2365 XSync (disp, False); 2456 XSync (dpy, False);
2366 2457
2367 /* 2458 /*
2368 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2369 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2370 * 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.
2371 */ 2462 */
2372 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2375 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2376 2467
2377 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2378 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2381 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2382 2473
2383 if (!i || prop == NULL 2474 if (!i || prop == NULL
2384#if TINTING 2475#if TINTING
2385 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2386#endif 2477#endif
2387 ) 2478 )
2388 have_pixmap = 0; 2479 have_pixmap = 0;
2389 else 2480 else
2390 { 2481 {
… …
2403 Window cr; 2494 Window cr;
2404 XImage *image; 2495 XImage *image;
2405 GC gc; 2496 GC gc;
2406 XGCValues gcvalue; 2497 XGCValues gcvalue;
2407 2498
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2503 nx = ny = 0;
2413 2504
… …
2423 nh += sy; 2514 nh += sy;
2424 ny = -sy; 2515 ny = -sy;
2425 sy = 0; 2516 sy = 0;
2426 } 2517 }
2427 2518
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2521
2431 XSync (disp, False); 2522 XSync (dpy, False);
2432 allowedxerror = -1; 2523 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2525
2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2436 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2437 allowedxerror = 0; 2528 allowedxerror = 0;
2438 2529
2439 if (image == NULL) 2530 if (image == NULL)
2440 { 2531 {
2441 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2442 { 2533 {
2443 pchanged = 1; 2534 pchanged = 1;
2444 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2445 { 2536 {
2446 XFreePixmap (disp, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2447 TermWin.pixmap = None; 2538 pixmap = None;
2448 } 2539 }
2449 } 2540 }
2450 2541
2451 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2452 } 2543 }
2453 else 2544 else
2454 { 2545 {
2455 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2457 2548
2458#if TINTING 2549#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2551 {
2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2463 2553
2554 rgba c;
2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2465 2556
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2467 } 2558 }
2468#endif 2559#endif
2469 2560
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2471 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2476 XDestroyImage (image); 2566 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (dpy, parent[0]);
2479 2569
2480 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2571 pchanged = 1;
2482 2572
2483 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2484 } 2574 }
2485 } 2575 }
2486 2576
2487 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2489 else 2579 else
2490 { 2580 {
2491 unsigned int n; 2581 unsigned int n;
2492 /* 2582 /*
2493 * InheritPixmap transparency 2583 * InheritPixmap transparency
2494 */ 2584 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2586 {
2497 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2499 &TermWin.parent[i], &list, &n);
2500 XFree (list); 2589 XFree (list);
2501 2590
2502 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2503 { 2592 {
2504 if (oldp != None) 2593 if (oldp != None)
2505 pchanged = 1; 2594 pchanged = 1;
2506 2595
2507 break; 2596 break;
2508 } 2597 }
2509 2598
2510 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2511 pchanged = 1; 2600 pchanged = 1;
2512 } 2601 }
2513 2602
2514 n = 0; 2603 n = 0;
2515 2604
2516 if (pchanged) 2605 if (pchanged)
2517 {
2518 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2519 { 2607 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2611 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2613 break;
2525 } 2614 }
2526 } 2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2527 } 2618 {
2528
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2530 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2621 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2535 } 2623 }
2536 else 2624 else
2537 { 2625 {
2538#if WAIT_FOR_WM
2539 /* wait (an arbitrary period) for the WM to do its thing
2540 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1);
2542#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2544 { 2627 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2629 XClearWindow (dpy, parent[n]);
2547 } 2630 }
2548 2631
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2550 am_transparent = 1; 2633 am_transparent = 1;
2551 } 2634 }
2552 2635
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2637 parent[i] = None;
2555 } 2638 }
2556 2639
2557 if (scrollBar.win) 2640 if (scrollBar.win)
2558 { 2641 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2561 scrollbar_show (0); 2644 scrollbar_show (0);
2562 } 2645 }
2563 2646
2564 if (am_transparent) 2647 if (am_transparent)
… …
2576 2659
2577bool 2660bool
2578rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2579{ 2662{
2580 bool flag = false; 2663 bool flag = false;
2581 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2583 2666
2584 for (;;) 2667 for (;;)
2585 { 2668 {
2586 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2587 { 2670 {
2588 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2672 ch = next_char ();
2590 }
2591 2673
2592 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2593 break; 2675 break;
2676 }
2594 2677
2595 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)
2596 { 2679 {
2597 if (!seen_input) 2680 if (!seen_input)
2598 { 2681 {
… …
2602 // some window managers resize the window early, and these programs 2685 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2686 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2687 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2688 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2689 // resized.
2607 if (seen_resize) 2690 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2609 } 2692 }
2610 2693
2611 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2696 bool refreshnow = false;
2614 int nlines = 0; 2697 int nlines = 0;
2615 unicode_t *str = buf; 2698 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2700
2617 for (;;) 2701 for (;;)
2618 { 2702 {
2619 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))
2620 break; 2704 break;
2621 2705
2622 *str++ = ch; 2706 *str++ = ch;
2623 2707
2624 if (ch == C0_LF) 2708 if (ch == C0_LF || str >= eol)
2625 { 2709 {
2710 if (ch == C0_LF)
2626 nlines++; 2711 nlines++;
2712
2627 refresh_count++; 2713 refresh_count++;
2628 2714
2629 if (!(options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2717 {
2632 refreshnow = true; 2718 refreshnow = true;
2719 refresh_count = 0;
2633 ch = NOCHAR; 2720 ch = NOCHAR;
2634 break; 2721 break;
2635 } 2722 }
2636 2723
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2725 if (nlines >= nrow - 1)
2639 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2641 nlines = 0; 2731 nlines = 0;
2642 str = buf; 2732 str = buf;
2733 eol = str + min (ncol, UBUFSIZ);
2643 } 2734 }
2644 }
2645 2735
2646 if (str >= buf + UBUFSIZ) 2736 if (str >= eol)
2647 { 2737 {
2738 if (eol >= buf + UBUFSIZ)
2739 {
2648 ch = NOCHAR; 2740 ch = NOCHAR;
2649 break; 2741 break;
2742 }
2743 else
2744 eol = min (eol + ncol, buf + UBUFSIZ);
2745 }
2746
2650 } 2747 }
2651 2748
2652 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2750 ch = next_char ();
2654 } 2751 }
2655 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2656 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2657 2756
2658 /* 2757 /*
2659 * 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
2660 * 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.
2661 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2762 */
2664 if (refreshnow) 2763 if (refreshnow)
2665 { 2764 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2766 refresh_limit++;
2668 else 2767 else
2669 { 2768 {
2670 flag = true; 2769 flag = true;
2671 scr_refresh (refresh_type); 2770 scr_refresh ();
2771 want_refresh = 1;
2672 } 2772 }
2673 } 2773 }
2674 2774
2675 } 2775 }
2676 else 2776 else
… …
2691 } 2791 }
2692 2792
2693 return flag; 2793 return flag;
2694} 2794}
2695 2795
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2796// read the next character
2706unicode_t 2797wchar_t
2707rxvt_term::next_char () 2798rxvt_term::next_char () NOTHROW
2708{ 2799{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2800 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2801 {
2711 // assume 7-bit to be ascii ALWAYS 2802 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2803 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2804 return *cmdbuf_ptr++;
2714 2805
2715 wchar_t wc; 2806 wchar_t wc;
2716 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);
2717 2808
2718 if (len == (size_t)-2) 2809 if (len == (size_t)-2)
2719 { 2810 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2811 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2812 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2813 break;
2723 } 2814 }
2724 2815
2725 if (len == (size_t)-1) 2816 if (len == (size_t)-1)
2726 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
2727 2818
2728 // assume wchar == unicode 2819 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2820 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2821 return wc & UNICODE_MASK;
2731 } 2822 }
2732 2823
2733 return NOCHAR; 2824 return NOCHAR;
2734} 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;
2735 2837
2736/* rxvt_cmd_getc () - Return next input character */ 2838/* rxvt_cmd_getc () - Return next input character */
2737/* 2839/*
2738 * Return the next input character after first passing any keyboard input 2840 * Return the next input character after first passing any keyboard input
2739 * to the command. 2841 * to the command.
2740 */ 2842 */
2741unicode_t 2843wchar_t
2742rxvt_term::cmd_getc () 2844rxvt_term::cmd_getc () THROW ((class out_of_input))
2743{ 2845{
2744 unicode_t c = next_char (); 2846 wchar_t c = next_char ();
2745 2847
2746 if (c == NOCHAR) 2848 if (c == NOCHAR)
2747 throw out_of_input; 2849 throw out_of_input;
2748 2850
2749 return c; 2851 return c;
2750} 2852}
2751 2853
2752unicode_t 2854uint32_t
2753rxvt_term::cmd_get8 () 2855rxvt_term::cmd_get8 () THROW ((class out_of_input))
2754{ 2856{
2755 unicode_t c = next_octet (); 2857 uint32_t c = next_octet ();
2756 2858
2757 if (c == NOCHAR) 2859 if (c == NOCHAR)
2758 throw out_of_input; 2860 throw out_of_input;
2759 2861
2760 return c; 2862 return c;
… …
2860 case C0_ESC: 2962 case C0_ESC:
2861 process_escape_seq (); 2963 process_escape_seq ();
2862 break; 2964 break;
2863 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2967 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 2968 else
2868 tt_write ((unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 2970 break;
2871 case C0_BEL: /* bell */ 2971 case C0_BEL: /* bell */
2872 scr_bell (); 2972 scr_bell ();
2873 break; 2973 break;
2874 case C0_BS: /* backspace */ 2974 case C0_BS: /* backspace */
… …
2998 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
2999 break; 3099 break;
3000 case '+': 3100 case '+':
3001 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
3002 break; 3102 break;
3003#if ENABLE_FRILLS 3103#if !ENABLE_MINIMAL
3004 case '6': 3104 case '6':
3005 scr_backindex (); 3105 scr_backindex ();
3006 break; 3106 break;
3007#endif 3107#endif
3008 case '7': 3108 case '7':
3009 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
3010 break; 3110 break;
3011 case '8': 3111 case '8':
3012 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
3013 break; 3113 break;
3014#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3015 case '9': 3115 case '9':
3016 scr_forwardindex (); 3116 scr_forwardindex ();
3017 break; 3117 break;
3018#endif 3118#endif
3019 case '=': 3119 case '=':
… …
3029 break; 3129 break;
3030 3130
3031 /* 8.3.87: NEXT LINE */ 3131 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3132 case C1_NEL: /* ESC E */
3033 { 3133 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3134 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3135 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3136 }
3037 break; 3137 break;
3038 3138
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3139 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3140 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3162 process_dcs_seq ();
3063 break; 3163 break;
3064 3164
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3165 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3166 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3167 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3168 break; /* steal obsolete ESC [ c */
3070 3169
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3170 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3171 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3172 process_csi_seq ();
… …
3182 ndef = get_byte_array_bit (csi_defaults, i); 3281 ndef = get_byte_array_bit (csi_defaults, i);
3183 for (p = 0; p < nargs; p++) 3282 for (p = 0; p < nargs; p++)
3184 if (arg[p] == -1) 3283 if (arg[p] == -1)
3185 arg[p] = ndef; 3284 arg[p] = ndef;
3186 3285
3187#ifdef DEBUG_CMD
3188 fprintf (stderr, "CSI ");
3189 for (p = 0; p < nargs; p++)
3190 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3191 fprintf (stderr, "%c\n", ch);
3192#endif
3193
3194 /* 3286 /*
3195 * private mode handling 3287 * private mode handling
3196 */ 3288 */
3197 if (priv) 3289 if (priv)
3198 { 3290 {
3199 switch (priv) 3291 switch (priv)
3200 { 3292 {
3201 case '>': 3293 case '>':
3202 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3203 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 }
3204 break; 3305 break;
3205 case '?': 3306 case '?':
3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3207 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
3208 break; 3309 break;
… …
3313 3414
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3415 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3416 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3417 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3418 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3419 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3420 break;
3320 3421
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3422 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3423 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3424 break;
3325 3425
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3426 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3427 process_sgr_mode (nargs, arg);
3328 break; 3428 break;
… …
3335 break; 3435 break;
3336 case 6: /* CPR requested */ 3436 case 6: /* CPR requested */
3337 scr_report_position (); 3437 scr_report_position ();
3338 break; 3438 break;
3339 case 7: /* unofficial extension */ 3439 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3440 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3441 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3442 break;
3343 case 8: /* unofficial extension */ 3443 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3445 break;
… …
3412 break; 3512 break;
3413 case CSI_75: 3513 case CSI_75:
3414 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
3415 break; 3515 break;
3416 3516
3417#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3418 case CSI_74: 3518 case CSI_74:
3419 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
3420 break; 3520 break;
3421#endif 3521#endif
3422 3522
… …
3429 break; 3529 break;
3430 } 3530 }
3431} 3531}
3432/*}}} */ 3532/*}}} */
3433 3533
3434#if ENABLE_FRILLS 3534#if !ENABLE_MINIMAL
3435/* ARGSUSED */ 3535/* ARGSUSED */
3436void 3536void
3437rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3438{ 3538{
3439 int x, y; 3539 int x, y;
3440 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3441 Window wdummy; 3541 Window wdummy;
3442 dDisp; 3542
3543 dLocal (Display *, dpy);
3443 3544
3444 if (nargs == 0) 3545 if (nargs == 0)
3445 return; 3546 return;
3446 3547
3447 switch (args[0]) 3548 switch (args[0])
3448 { 3549 {
3449 /* 3550 /*
3450 * commands 3551 * commands
3451 */ 3552 */
3452 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3554 XMapWindow (dpy, parent[0]);
3454 break; 3555 break;
3455 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3457 break; 3558 break;
3458 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3460 break; 3561 break;
3461 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3564 break;
3464 case 5: /* raise window */ 3565 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3466 break; 3567 break;
3467 case 6: /* lower window */ 3568 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3469 break; 3570 break;
3470 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3471 scr_touch (true); 3572 scr_touch (true);
3472 break; 3573 break;
3473 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3575 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
3476 break; 3577 break;
3477 3578
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3579 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3580 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3582 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3583 (unsigned int) (args[1] * fheight));
3483 break; 3584 break;
3484
3485 3585
3486 /* 3586 /*
3487 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3488 */ 3588 */
3489 case 11: /* report window state */ 3589 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3592 break;
3493 case 13: /* report window position */ 3593 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3599 break;
3500 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3603 break;
3504 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3606 break;
3507 case 19: /* report window size (chars) */ 3607 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3609 break;
3510 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3511 { 3611 {
3512 char *s; 3612 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3514 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 */
3515 XFree (s); 3615 XFree (s);
3516 } 3616 }
3517 break; 3617 break;
3518 case 21: /* report window title */ 3618 case 21: /* report window title */
3519 { 3619 {
3520 char *s; 3620 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3522 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 */
3523 XFree (s); 3623 XFree (s);
3524 } 3624 }
3525 break; 3625 break;
3526 } 3626 }
3527} 3627}
… …
3530/*----------------------------------------------------------------------*/ 3630/*----------------------------------------------------------------------*/
3531/* 3631/*
3532 * get input up until STRING TERMINATOR (or BEL) 3632 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3633 * ends_how is terminator used. returned input must be free()'d
3534 */ 3634 */
3535unsigned char * 3635char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3636rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3637{
3538 unicode_t ch; 3638 unicode_t ch;
3539 bool seen_esc = false; 3639 bool seen_esc = false;
3540 unsigned int n = 0; 3640 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3659 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3660 return NULL; /* other control character - exit */
3561 3661
3562 seen_esc = false; 3662 seen_esc = false;
3563 3663
3564 if (n >= sizeof (string) - 1) 3664 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3665 // stop at some sane length
3566 return NULL; 3666 return NULL;
3567 3667
3568 if (ch == C0_SYN) 3668 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3669 string[n++] = cmd_get8 ();
… …
3573 3673
3574 string[n++] = '\0'; 3674 string[n++] = '\0';
3575 3675
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3676 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3677
3578 return (unsigned char *)rxvt_wcstombs (string); 3678 return rxvt_wcstombs (string);
3579} 3679}
3580 3680
3581/*----------------------------------------------------------------------*/ 3681/*----------------------------------------------------------------------*/
3582/* 3682/*
3583 * 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)'
3584 */ 3684 */
3585void 3685void
3586rxvt_term::process_dcs_seq () 3686rxvt_term::process_dcs_seq ()
3587{ 3687{
3588 unsigned char *s; 3688 char *s;
3589 unicode_t eh; 3689 unicode_t eh;
3590 3690
3591 /* 3691 /*
3592 * Not handled yet 3692 * Not handled yet
3593 */ 3693 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3712 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3713 arg = arg * 10 + (ch - '0');
3614 3714
3615 if (ch == ';') 3715 if (ch == ';')
3616 { 3716 {
3617 unsigned char *s = get_to_st (eh); 3717 char *s = get_to_st (eh);
3618 3718
3619 if (s) 3719 if (s)
3620 { 3720 {
3621 process_xterm_seq (arg, (char *)s, eh); 3721 process_xterm_seq (arg, s, eh);
3622 free (s); 3722 free (s);
3623 } 3723 }
3624 } 3724 }
3625} 3725}
3626 3726
3627void 3727void
3628rxvt_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)
3629{ 3729{
3630 if (str[0] == '?' && !str[1]) 3730 if (str[0] == '?' && !str[1])
3631 { 3731 {
3632 unsigned short r, g, b; 3732 rgba c;
3633 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
3634 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);
3635 } 3741 }
3636 else 3742 else
3637 set_window_color (color, str); 3743 set_window_color (color, str);
3638} 3744}
3639 3745
3640/* 3746/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3748 */
3665void 3749void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3751{
3668 int changed = 0;
3669 int color; 3752 int color;
3670 char *buf, *name; 3753 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3672 int saveop = op; 3755 int saveop = op;
3673 dDisp; 3756
3757 dLocal (Display *, dpy);
3674 3758
3675 assert (str != NULL); 3759 assert (str != NULL);
3676 switch (op) 3760 switch (op)
3677 { 3761 {
3678 case XTerm_name: 3762 case XTerm_name:
… …
3694 unsigned long bytes_after; 3778 unsigned long bytes_after;
3695 unsigned char *value = 0; 3779 unsigned char *value = 0;
3696 const char *str = ""; 3780 const char *str = "";
3697 3781
3698 if (prop 3782 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3787 && actual_type != None
3704 && actual_format == 8) 3788 && actual_format == 8)
3705 str = (const char *)(value); 3789 str = (const char *)(value);
3706 3790
3707 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3708 3792
3709 XFree (value); 3793 XFree (value);
3710 } 3794 }
3711 else 3795 else
3712 { 3796 {
… …
3716 { 3800 {
3717 *eq = 0; 3801 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3719 } 3803 }
3720 else 3804 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3805 XDeleteProperty (dpy, parent[0],
3722 display->atom (str)); 3806 display->atom (str));
3723 } 3807 }
3724 break; 3808 break;
3725 3809
3726 case XTerm_Color: 3810 case XTerm_Color:
… …
3728 { 3812 {
3729 if ((name = strchr (buf, ';')) == NULL) 3813 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3814 break;
3731 3815
3732 *name++ = '\0'; 3816 *name++ = '\0';
3733 color = atoi (buf); 3817 color = atoi (buf) + minCOLOR;
3734 3818
3735 if (color < 0 || color >= TOTAL_COLORS) 3819 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3820 break;
3737 3821
3738 if ((buf = strchr (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3823 *buf++ = '\0';
3740 3824
3741 if (name[0] == '?' && !name[1]) 3825 process_color_seq (op, color, name, resp);
3742 {
3743 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 }
3747 else
3748 set_window_color (color + minCOLOR, name);
3749 } 3826 }
3750 break; 3827 break;
3751 case XTerm_Color00: 3828 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3829 process_color_seq (op, Color_fg, str, resp);
3753 break; 3830 break;
3754 case XTerm_Color01: 3831 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3832 process_color_seq (op, Color_bg, str, resp);
3756 break; 3833 break;
3757#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3836 process_color_seq (op, Color_cursor, str, resp);
3760 break; 3837 break;
3761#endif 3838#endif
3762 case XTerm_Color_pointer_fg: 3839 case XTerm_Color_pointer_fg:
3763 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3764 break; 3841 break;
3765 case XTerm_Color_pointer_bg: 3842 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3843 process_color_seq (op, Color_pointer_bg, str, resp);
3767 break; 3844 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3846 case XTerm_Color_RV:
3779 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);
3856 break;
3857 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp);
3780 break; 3859 break;
3781#endif 3860#endif
3782#if TRANSPARENT && TINTING 3861#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3862 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3863 process_color_seq (op, Color_tint, str, resp);
3864
3785 check_our_parents (); 3865 check_our_parents ();
3866
3786 if (am_transparent) 3867 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3868 want_full_refresh = want_refresh = 1;
3788 break;
3789#endif
3790 3869
3870 break;
3871#endif
3872
3791 case XTerm_Pixmap: 3873 case Rxvt_Pixmap:
3874 {
3792 if (*str != ';') 3875 if (*str != ';')
3793 { 3876 {
3794#if XPM_BACKGROUND 3877#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3880 scr_touch (true);
3881#endif
3799 } 3882 }
3883
3884 int changed = 0;
3885
3800 while ((str = strchr (str, ';')) != NULL) 3886 while ((str = strchr (str, ';')) != NULL)
3801 { 3887 {
3802 str++; 3888 str++;
3803#if XPM_BACKGROUND 3889#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3890 changed += scale_pixmap (str);
3805#endif 3891#endif
3806 } 3892 }
3807 3893
3808 if (changed) 3894 if (changed)
3809 { 3895 {
3810#ifdef XPM_BACKGROUND 3896#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3897 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3898 scr_touch (true);
3899#endif
3814 } 3900 }
3901 }
3815 break; 3902 break;
3816 3903
3817 case XTerm_restoreFG: 3904 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3905 set_window_color (Color_fg, str);
3819 break; 3906 break;
3820 case XTerm_restoreBG: 3907 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3908 set_window_color (Color_bg, str);
3822 break; 3909 break;
3823 3910
3824 case XTerm_logfile: 3911 case XTerm_logfile:
3825 // TODO, when secure mode? 3912 // TODO, when secure mode?
3826 break; 3913 break;
3827 3914
3915#if 0
3916 case Rxvt_dumpscreen: /* no error notices */
3917 {
3918 int fd;
3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3920 {
3921 scr_dump (fd);
3922 close (fd);
3923 }
3924 }
3925 break;
3926#endif
3828 case XTerm_font: 3927 case XTerm_font:
3829 op = URxvt_font; 3928 op = URxvt_font;
3830 case URxvt_font: 3929 case URxvt_font:
3831#if ENABLE_STYLES 3930#if ENABLE_STYLES
3832 case URxvt_boldFont: 3931 case URxvt_boldFont:
3833 case URxvt_italicFont: 3932 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3933 case URxvt_boldItalicFont:
3835#endif 3934#endif
3836 if (query) 3935 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3938 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3939 resp);
3841 else 3940 else
3842 { 3941 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3943
… …
3846 allocated.push_back ((void *)res); 3945 allocated.push_back ((void *)res);
3847 set_fonts (); 3946 set_fonts ();
3848 } 3947 }
3849 break; 3948 break;
3850 3949
3851#if ENABLE_FRILLS 3950 case URxvt_version:
3852 case XTerm_locale:
3853 if (query) 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
3959 case URxvt_locale:
3960 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 3962 else
3856 { 3963 {
3857 set_locale (str); 3964 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3966 init_xlocale ();
3861# endif
3862 } 3967 }
3863 break; 3968 break;
3864#endif
3865 3969
3866#ifdef MENUBAR 3970 case URxvt_view_up:
3867 case XTerm_Menu: 3971 case URxvt_view_down:
3868 if (options & Opt_insecure) 3972 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3973 int lines = atoi (str);
3974
3975 if (lines)
3976 scr_page (op == URxvt_view_up ? UP : DN, lines);
3977 else
3978 scr_erase_savelines ();
3979 }
3980
3870 break; 3981 break;
3871#endif 3982#endif
3872#if 0 3983
3873 case XTerm_dumpscreen: /* no error notices */ 3984#if ENABLE_PERL
3874 { 3985 case URxvt_perl:
3875 int fd; 3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3987 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 3988 break;
3883#endif 3989#endif
3884 } 3990 }
3885} 3991}
3886/*----------------------------------------------------------------------*/ 3992/*----------------------------------------------------------------------*/
… …
3917 return state; 4023 return state;
3918} 4024}
3919 4025
3920/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
3921void 4027void
3922rxvt_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)
3923{ 4029{
3924 unsigned int i, j; 4030 unsigned int i, j;
3925 int state; 4031 int state;
3926 4032
3927 static const struct 4033 static const struct
… …
3938 { 5, PrivMode_rVideo }, 4044 { 5, PrivMode_rVideo },
3939 { 6, PrivMode_relOrigin }, 4045 { 6, PrivMode_relOrigin },
3940 { 7, PrivMode_Autowrap }, 4046 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode 4047 // 8, bi-directional support mode
3942 { 9, PrivMode_MouseX10 }, 4048 { 9, PrivMode_MouseX10 },
3943#ifdef menuBar_esc
3944 { menuBar_esc, PrivMode_menuBar },
3945#endif
3946 // 18, 19 printing-related 4049 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor }, 4050 { 25, PrivMode_VisibleCursor },
3948#ifdef scrollBar_esc 4051#ifdef scrollBar_esc
3949 { scrollBar_esc, PrivMode_scrollBar }, 4052 { scrollBar_esc, PrivMode_scrollBar },
3950#endif 4053#endif
… …
3995 } 4098 }
3996 4099
3997 /* extra handling for values with state unkept */ 4100 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4101 switch (arg[i])
3999 { 4102 {
4103#if ENABLE_STYLES
4104 case 1021:
4105 set_option (Opt_intensityStyles, mode);
4106
4107 scr_touch (true);
4108 break;
4109#endif
4000 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4001 case 1049: 4111 case 1049:
4002 if (options & Opt_secondaryScreen) 4112 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4113 if (mode == 0)
4004 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
4005 else if (mode == 1) 4115 else if (mode == 1)
4006 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
4007 break; 4117 break;
… …
4019 */ 4129 */
4020 PrivMode (1, PrivMode_vt52); 4130 PrivMode (1, PrivMode_vt52);
4021 break; 4131 break;
4022 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4135 break;
4026 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4137 set_option (Opt_jumpScroll, !state);
4031 break; 4138 break;
4032 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4034 break; 4141 break;
4035 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4041 /* 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 */
4042 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
4043 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
4044 priv_modes &= ~PrivMode_MouseX11; 4151 priv_modes &= ~PrivMode_MouseX11;
4045 break; 4152 break;
4046#ifdef menuBar_esc
4047 case menuBar_esc:
4048#ifdef MENUBAR
4049 map_menuBar (state);
4050#endif
4051 break;
4052#endif
4053#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
4054 case scrollBar_esc: 4154 case scrollBar_esc:
4055 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
4056 { 4156 {
4057 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
… …
4076#if 0 4176#if 0
4077 case 1001: 4177 case 1001:
4078 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4079#endif 4179#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4181 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4182 break;
4086 case 1011: /* scroll to bottom on key press */ 4183 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4184 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4185 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4186 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4187 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4188 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4189 scr_erase_screen (2);
4096 scr_change_screen (state); 4190 scr_change_screen (state);
4097 break; 4191 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4192 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4193 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4196 scr_erase_screen (2);
4103 break; 4197 break;
4104 default: 4198 default:
4105 break; 4199 break;
… …
4233 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
4234 break; 4328 break;
4235 4329
4236 //case 50: // not variable spacing 4330 //case 50: // not variable spacing
4237 4331
4238#ifndef NO_BRIGHTCOLOR 4332#if !ENABLE_MINIMAL
4239 case 90: 4333 case 90:
4240 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
4241 case 92: 4335 case 92:
4242 case 93: 4336 case 93:
4243 case 94: 4337 case 94:
… …
4255 case 106: 4349 case 106:
4256 case 107: 4350 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4351 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4352 break;
4259#endif 4353#endif
4260
4261 } 4354 }
4262 } 4355 }
4263} 4356}
4264/*}}} */ 4357/*}}} */
4265 4358
… …
4289 */ 4382 */
4290void 4383void
4291rxvt_term::tt_printf (const char *fmt,...) 4384rxvt_term::tt_printf (const char *fmt,...)
4292{ 4385{
4293 va_list arg_ptr; 4386 va_list arg_ptr;
4294 unsigned char buf[256]; 4387 char buf[256];
4295 4388
4296 va_start (arg_ptr, fmt); 4389 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4391 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4392 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4397 * or generated by us in response to a query ESC sequence.
4305 */ 4398 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4400
4308void 4401void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 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
4311 if (v_buflen == 0) 4410 if (v_buflen == 0)
4312 { 4411 {
4313 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));
4314 4413
4315 if ((unsigned int)written == len) 4414 if ((unsigned int)written == len)
4316 return; 4415 return;
4317 4416
4318 data += written; 4417 data += written;
4319 len -= written; 4418 len -= written;
4320 } 4419 }
4321 4420
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4422
4324 memcpy (v_buffer + v_buflen, data, len); 4423 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4424 v_buflen += len;
4326 4425
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328} 4427}
4329 4428
4330void rxvt_term::pty_write () 4429void rxvt_term::pty_write ()
4331{ 4430{
4332 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));
4333 4432
4334 if (written > 0) 4433 if (written > 0)
4335 { 4434 {
4336 v_buflen -= written; 4435 v_buflen -= written;
4337 4436
… …
4346 } 4445 }
4347 4446
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4448 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4451}
4354 4452
4355/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4356 4454

Diff Legend

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