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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.310 by root, Thu Feb 23 19:26:56 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
147 151
148 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
149 { 153 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
153 break; 156 break;
154 } 157 }
155 158
156 x--; 159 x--;
157 } 160 }
158
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 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
1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1403 {
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1411 destroy ();
1412 }
1413#if ENABLE_EWMH
1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1417 &ev);
1418#endif
1419 }
1420 }
1338#if ENABLE_XEMBED 1421#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED]) 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1423 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1425 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1427 focus_out ();
1428 }
1429#endif
1346 } 1430 }
1347#endif
1348#ifdef OFFIX_DND
1349 /* OffiX Dnd (drag 'n' drop) protocol */
1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1351 && (ev.xclient.data.l[0] == DndFile
1352 || ev.xclient.data.l[0] == DndDir
1353 || ev.xclient.data.l[0] == DndLink))
1354 {
1355 /* Get Dnd data */
1356 Atom ActualType;
1357 int ActualFormat;
1358 unsigned char *data;
1359 unsigned long Size, RemainingBytes;
1360
1361 XGetWindowProperty (disp, display->root,
1362 xa[XA_DNDSELECTION],
1363 0L, 1000000L,
1364 False, AnyPropertyType,
1365 &ActualType, &ActualFormat,
1366 &Size, &RemainingBytes,
1367 &data);
1368 set_string_property (XA_CUT_BUFFER0, data);
1369 XFree (data);
1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1372 }
1373#endif /* OFFIX_DND */
1374 break; 1431 break;
1375 1432
1376 case MappingNotify: 1433 case MappingNotify:
1377 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1378 break; 1435 break;
… …
1409 case FocusOut: 1466 case FocusOut:
1410 focus_out (); 1467 focus_out ();
1411 break; 1468 break;
1412 1469
1413 case ConfigureNotify: 1470 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1415 { 1472 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ;
1425 1475
1426 if (szHint.width != width || szHint.height != height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1477 {
1428 seen_resize = 1; 1478 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1480 }
1431 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1486 check_our_parents ();
1435#endif 1487#endif
1436 } 1488 }
1437 break; 1489 break;
1438 1490
1439 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443 1496
1444 break; 1497 break;
1445 1498
1446 case SelectionClear: 1499 case SelectionClear:
1447 selection_clear (); 1500 selection_clear ();
… …
1454 1507
1455 case SelectionRequest: 1508 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1457 break; 1510 break;
1458 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
1459 case UnmapNotify: 1520 case UnmapNotify:
1460 TermWin.mapped = 0; 1521 mapped = 0;
1461#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1463#endif 1524#endif
1464 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466 case MapNotify:
1467 TermWin.mapped = 1;
1468#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif
1471 break; 1526 break;
1472 1527
1473#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1474 case ReparentNotify: 1529 case ReparentNotify:
1475 rootwin_cb (ev); 1530 rootwin_cb (ev);
1476 break; 1531 break;
1477#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1478 1533
1479 case GraphicsExpose: 1534 case GraphicsExpose:
1480 case Expose: 1535 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1482 { 1537 {
1483 do 1538 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1487 1542
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1544
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1493 1548
1494 scr_refresh (refresh_type); 1549 want_refresh = 1;
1495 } 1550 }
1496 else 1551 else
1497 { 1552 {
1498 XEvent unused_event; 1553 XEvent unused_event;
1499 1554
1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1501 ; 1556 ;
1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1503 ; 1558 ;
1504 1559
1505 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1506 { 1561 {
1507 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1508 scrollbar_show (0); 1563 scrollbar_show (0);
1509 } 1564 }
1510#ifdef MENUBAR
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose ();
1513#endif
1514 1565
1515#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1518#endif 1569#endif
1519 } 1570 }
1520 break; 1571 break;
1521 1572
1522 case MotionNotify: 1573 case MotionNotify:
1523#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1524 if (hidden_pointer) 1575 if (hidden_pointer)
1525 pointer_unblank (); 1576 pointer_unblank ();
1526#endif 1577#endif
1527#if MENUBAR
1528 if (isMenuBarWindow (ev.xany.window))
1529 {
1530 menubar_control (ev.xbutton);
1531 break;
1532 }
1533#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1579 break;
1536 1580
1537 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1538 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1587 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1542 ; 1589 ;
1543 1590
1544 XQueryPointer (disp, TermWin.vt, 1591 XQueryPointer (dpy, vt,
1545 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1595 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1561#endif 1608#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1611
1565#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1615 {
1569 int dist; 1616 int dist;
1570 1617
1571 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1630
1584 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1586 { 1633 {
1587 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1589 } 1636 }
1590 else 1637 else
1591 { 1638 {
1592 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1641 }
1595 1642
1596 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1645 + 1;
1599 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1601 } 1648 }
1602 else 1649 else
1603 { 1650 {
1604 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1613#endif 1660#endif
1614 } 1661 }
1615 } 1662 }
1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1617 { 1664 {
1618 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1619 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1620 ; 1667 ;
1621 1668
1622 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1623 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1624 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1625 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1626 &unused_mask); 1673 &unused_mask);
1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1628 scrollbar_size ()); 1675 scrollbar_size ());
1629 scr_refresh (refresh_type); 1676 want_refresh = 1;
1630 refresh_limit = 0; 1677 refresh_limit = 0;
1631 scrollbar_show (1); 1678 scrollbar_show (1);
1632 } 1679 }
1633 break; 1680 break;
1634 } 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
1635} 1709}
1636 1710
1637void 1711void
1638rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1639{ 1713{
1640 if (!TermWin.focus) 1714 if (!focus)
1641 { 1715 {
1642 TermWin.focus = 1; 1716 focus = 1;
1643 want_refresh = 1; 1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1644#ifdef USE_XIM 1721#if USE_XIM
1645 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1646 { 1723 {
1647 IMSetStatusPosition (); 1724 IMSetPosition ();
1648 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1649 } 1726 }
1650#endif 1727#endif
1651#ifdef CURSOR_BLINK 1728#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1729 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1654#endif 1731#endif
1655#ifdef OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1657 { 1734 {
1658 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1736 scr_recolour ();
1660 } 1737 }
… …
1663} 1740}
1664 1741
1665void 1742void
1666rxvt_term::focus_out () 1743rxvt_term::focus_out ()
1667{ 1744{
1668 if (TermWin.focus) 1745 if (focus)
1669 { 1746 {
1670 TermWin.focus = 0; 1747 focus = 0;
1671 want_refresh = 1; 1748 want_refresh = 1;
1672 1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1673#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1674 iso14755buf = 0; 1755 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY 1756# if ENABLE_OVERLAY
1677 scr_overlay_off (); 1757 scr_overlay_off ();
1678#endif 1758# endif
1759 }
1760#endif
1679#ifdef USE_XIM 1761#if USE_XIM
1680 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1682#endif 1764#endif
1683#ifdef CURSOR_BLINK 1765#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1766 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1768 hidden_cursor = 0;
1687#endif 1769#endif
1688#ifdef OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
1690 { 1772 {
1691 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1774 scr_recolour ();
1693 } 1775 }
… …
1697 1779
1698#if TRANSPARENT 1780#if TRANSPARENT
1699void 1781void
1700rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1701{ 1783{
1702 SET_R (this); 1784 make_current ();
1703 SET_LOCALE (locale);
1704 1785
1705 switch (ev.type) 1786 switch (ev.type)
1706 { 1787 {
1707 case PropertyNotify: 1788 case PropertyNotify:
1708 /* 1789 /*
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1795 return;
1715 1796
1716 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1717 case ReparentNotify: 1798 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1720 break; 1801 break;
1721 } 1802 }
1722} 1803}
1723#endif 1804#endif
… …
1726rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1727{ 1808{
1728 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1729 1810
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1731 if (!bypass_keystate) 1813 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1815
1734 /* 1816 /*
1735 * VT window processing of button press 1817 * VT window processing of button press
1736 */ 1818 */
1737 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1738 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1739#if ISO_14755 1824#if ISO_14755
1740 // 5.4 1825 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1827 {
1743 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1757 { 1842 {
1758 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1759 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1760 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1761 { 1847 {
1762 /* only report double clicks */ 1848 /* only report double clicks */
1763 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1764 mouse_report (ev); 1850 mouse_report (ev);
… …
1796#else 1882#else
1797 selection.rect = false; 1883 selection.rect = false;
1798#endif 1884#endif
1799 1885
1800 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1802 { 1888 {
1803 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1805 else 1891 else
1806 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1947 case Button3: 2033 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1949 { 2035 {
1950 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1953# else 2039# else
1954 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1955# endif 2041# endif
1956 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1959# else 2045# else
1960 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1961# endif 2047# endif
1962 else 2048 else
1963 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1964 } 2050 }
1965 else 2051 else
1966 { 2052 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2054 (nrow
1969 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2056 / scrollbar_size ()));
1971 } 2057 }
1972 2058
1973 break; 2059 break;
1974 } 2060 }
1975 } 2061 }
2062
1976 return; 2063 return;
1977 } 2064 }
1978#if MENUBAR
1979 /*
1980 * Menubar window processing of button press
1981 */
1982 if (isMenuBarWindow (ev.window))
1983 menubar_control (ev);
1984#endif
1985} 2065}
1986 2066
1987void 2067void
1988rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1989{ 2069{
… …
1995 2075
1996 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1997 { 2077 {
1998 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1999 scrollbar_show (0); 2079 scrollbar_show (0);
2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 refresh_type &= ~SMOOTH_REFRESH;
2002#endif
2003 } 2080 }
2004 2081
2005#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2008#endif 2085#endif
2009 2086
2010 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
2011 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2012#if ISO_14755 2092#if ISO_14755
2013 // 5.4 2093 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2095 return;
2016#endif 2096#endif
2097
2017 if (reportmode) 2098 if (reportmode)
2018 { 2099 {
2019 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2020 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2021 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2051 { 2132 {
2052 case Button1: 2133 case Button1:
2053 case Button3: 2134 case Button3:
2054 selection_make (ev.time); 2135 selection_make (ev.time);
2055 break; 2136 break;
2137
2056 case Button2: 2138 case Button2:
2057 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);
2058 break; 2141 break;
2142
2059#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2060 case Button4: 2144 case Button4:
2061 case Button5: 2145 case Button5:
2062 { 2146 {
2063 int i; 2147 int i;
… …
2065 2149
2066 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2067 2151
2068 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2069 i = 1; 2153 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2155 i = nrow - 1;
2072 else 2156 else
2073 i = 5; 2157 i = 5;
2074 2158
2075# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
2077 { 2161 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2079 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;
2080 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;
2081 2165
2082 if (slip_wheel_ev.at < NOW) 2166 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2168
2085 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2086 } 2170 }
2087 else 2171 else
2088 { 2172 {
2089# endif 2173# endif
2090# ifdef JUMP_MOUSE_WHEEL
2091 scr_page (v, i); 2174 scr_page (v, i);
2092 scr_refresh (SMOOTH_REFRESH);
2093 scrollbar_show (1); 2175 scrollbar_show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING 2176# ifdef MOUSE_SLIP_WHEELING
2103 } 2177 }
2104#endif 2178# endif
2105 } 2179 }
2106 break; 2180 break;
2107#endif 2181#endif
2108 } 2182 }
2109 } 2183 }
2110#ifdef MENUBAR
2111 else if (isMenuBarWindow (ev.window))
2112 menubar_control (ev);
2113#endif
2114} 2184}
2115 2185
2116#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2117#if TINTING 2187#if TINTING
2118/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2119 2189
2120typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2121 2191
2122void 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)
2123{ 2193{
2124 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2125 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i; 2199 int i;
2130 2200
2131 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2132 2202
2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2134 2204
2135 /* for convenience */ 2205 /* for convenience */
2136 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2357 Atom atype; 2427 Atom atype;
2358 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2359 Window root, oldp, *list; 2429 Window root, oldp, *list;
2360 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2361 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2363 2432
2364 pchanged = 0; 2433 pchanged = 0;
2365 2434
2366 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2368 2437
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2371 2440
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2373 2442
2374 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2375 { 2444 {
2376 if (am_transparent) 2445 if (am_transparent)
2377 { 2446 {
2378 pchanged = 1; 2447 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2381 } 2450 }
2382 2451
2383 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2384 } 2453 }
2385 2454
2386 /* 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. */
2387 XSync (disp, False); 2456 XSync (dpy, False);
2388 2457
2389 /* 2458 /*
2390 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2391 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2392 * 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.
2393 */ 2462 */
2394 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2397 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2398 2467
2399 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2400 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2404 2473
2405 if (!i || prop == NULL 2474 if (!i || prop == NULL
2406#if TINTING 2475#if TINTING
2407 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2408#endif 2477#endif
2409 ) 2478 )
2410 have_pixmap = 0; 2479 have_pixmap = 0;
2411 else 2480 else
2412 { 2481 {
… …
2425 Window cr; 2494 Window cr;
2426 XImage *image; 2495 XImage *image;
2427 GC gc; 2496 GC gc;
2428 XGCValues gcvalue; 2497 XGCValues gcvalue;
2429 2498
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2503 nx = ny = 0;
2435 2504
… …
2445 nh += sy; 2514 nh += sy;
2446 ny = -sy; 2515 ny = -sy;
2447 sy = 0; 2516 sy = 0;
2448 } 2517 }
2449 2518
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2521
2453 XSync (disp, False); 2522 XSync (dpy, False);
2454 allowedxerror = -1; 2523 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2525
2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2458 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2459 allowedxerror = 0; 2528 allowedxerror = 0;
2460 2529
2461 if (image == NULL) 2530 if (image == NULL)
2462 { 2531 {
2463 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2464 { 2533 {
2465 pchanged = 1; 2534 pchanged = 1;
2466 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2467 { 2536 {
2468 XFreePixmap (disp, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2469 TermWin.pixmap = None; 2538 pixmap = None;
2470 } 2539 }
2471 } 2540 }
2472 2541
2473 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2474 } 2543 }
2475 else 2544 else
2476 { 2545 {
2477 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2479 2548
2480#if TINTING 2549#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2551 {
2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2485 2553
2554 rgba c;
2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2487 2556
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2489 } 2558 }
2490#endif 2559#endif
2491 2560
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2493 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2498 XDestroyImage (image); 2566 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (dpy, parent[0]);
2501 2569
2502 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2571 pchanged = 1;
2504 2572
2505 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2506 } 2574 }
2507 } 2575 }
2508 2576
2509 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 else 2579 else
2512 { 2580 {
2513 unsigned int n; 2581 unsigned int n;
2514 /* 2582 /*
2515 * InheritPixmap transparency 2583 * InheritPixmap transparency
2516 */ 2584 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2586 {
2519 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2521 &TermWin.parent[i], &list, &n);
2522 XFree (list); 2589 XFree (list);
2523 2590
2524 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2525 { 2592 {
2526 if (oldp != None) 2593 if (oldp != None)
2527 pchanged = 1; 2594 pchanged = 1;
2528 2595
2529 break; 2596 break;
2530 } 2597 }
2531 2598
2532 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2533 pchanged = 1; 2600 pchanged = 1;
2534 } 2601 }
2535 2602
2536 n = 0; 2603 n = 0;
2537 2604
2538 if (pchanged) 2605 if (pchanged)
2539 {
2540 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2541 { 2607 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2611 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2613 break;
2547 } 2614 }
2548 } 2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2549 } 2618 {
2550
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2552 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2621 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2557 } 2623 }
2558 else 2624 else
2559 { 2625 {
2560#if WAIT_FOR_WM
2561 /* wait (an arbitrary period) for the WM to do its thing
2562 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1);
2564#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2566 { 2627 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2629 XClearWindow (dpy, parent[n]);
2569 } 2630 }
2570 2631
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2572 am_transparent = 1; 2633 am_transparent = 1;
2573 } 2634 }
2574 2635
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2637 parent[i] = None;
2577 } 2638 }
2578 2639
2579 if (scrollBar.win) 2640 if (scrollBar.win)
2580 { 2641 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2583 scrollbar_show (0); 2644 scrollbar_show (0);
2584 } 2645 }
2585 2646
2586 if (am_transparent) 2647 if (am_transparent)
… …
2598 2659
2599bool 2660bool
2600rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2601{ 2662{
2602 bool flag = false; 2663 bool flag = false;
2603 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2605 2666
2606 for (;;) 2667 for (;;)
2607 { 2668 {
2608 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2609 { 2670 {
2610 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2672 ch = next_char ();
2612 }
2613 2673
2614 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2615 break; 2675 break;
2676 }
2616 2677
2617 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)
2618 { 2679 {
2619 if (!seen_input) 2680 if (!seen_input)
2620 { 2681 {
… …
2629 if (seen_resize && cmd_pid) 2690 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2631 } 2692 }
2632 2693
2633 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2696 bool refreshnow = false;
2636 int nlines = 0; 2697 int nlines = 0;
2637 unicode_t *str = buf; 2698 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2700
2639 for (;;) 2701 for (;;)
2640 { 2702 {
2641 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))
2642 break; 2704 break;
2643 2705
2644 *str++ = ch; 2706 *str++ = ch;
2645 2707
2646 if (ch == C0_LF) 2708 if (ch == C0_LF || str >= eol)
2647 { 2709 {
2710 if (ch == C0_LF)
2648 nlines++; 2711 nlines++;
2712
2649 refresh_count++; 2713 refresh_count++;
2650 2714
2651 if (!(options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2717 {
2654 refreshnow = true; 2718 refreshnow = true;
2719 refresh_count = 0;
2655 ch = NOCHAR; 2720 ch = NOCHAR;
2656 break; 2721 break;
2657 } 2722 }
2658 2723
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2725 if (nlines >= nrow - 1)
2661 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2662 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2663 nlines = 0; 2731 nlines = 0;
2664 str = buf; 2732 str = buf;
2733 eol = str + min (ncol, UBUFSIZ);
2665 } 2734 }
2666 }
2667 2735
2668 if (str >= buf + UBUFSIZ) 2736 if (str >= eol)
2669 { 2737 {
2738 if (eol >= buf + UBUFSIZ)
2739 {
2670 ch = NOCHAR; 2740 ch = NOCHAR;
2671 break; 2741 break;
2742 }
2743 else
2744 eol = min (eol + ncol, buf + UBUFSIZ);
2745 }
2746
2672 } 2747 }
2673 2748
2674 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2750 ch = next_char ();
2676 } 2751 }
2677 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2679 2756
2680 /* 2757 /*
2681 * 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
2682 * 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.
2683 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2762 */
2686 if (refreshnow) 2763 if (refreshnow)
2687 { 2764 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2766 refresh_limit++;
2690 else 2767 else
2691 { 2768 {
2692 flag = true; 2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2693 scr_refresh (refresh_type); 2771 scr_refresh ();
2772 want_refresh = 1;
2694 } 2773 }
2695 } 2774 }
2696 2775
2697 } 2776 }
2698 else 2777 else
… …
2713 } 2792 }
2714 2793
2715 return flag; 2794 return flag;
2716} 2795}
2717 2796
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725}
2726
2727// read the next character 2797// read the next character
2728unicode_t 2798wchar_t
2729rxvt_term::next_char () 2799rxvt_term::next_char () NOTHROW
2730{ 2800{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2801 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2802 {
2733 // assume 7-bit to be ascii ALWAYS 2803 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2735 return *cmdbuf_ptr++; 2805 return *cmdbuf_ptr++;
2736 2806
2737 wchar_t wc; 2807 wchar_t wc;
2738 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739 2809
2740 if (len == (size_t)-2) 2810 if (len == (size_t)-2)
2741 { 2811 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2812 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2813 cmdbuf_ptr = cmdbuf_endp;
2744 break; 2814 break;
2745 } 2815 }
2746 2816
2747 if (len == (size_t)-1) 2817 if (len == (size_t)-1)
2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2749 2819
2750 // assume wchar == unicode 2820 // assume wchar == unicode
2751 cmdbuf_ptr += len; 2821 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 2822 return wc & UNICODE_MASK;
2753 } 2823 }
2754 2824
2755 return NOCHAR; 2825 return NOCHAR;
2756} 2826}
2827
2828// read the next octet
2829uint32_t
2830rxvt_term::next_octet () NOTHROW
2831{
2832 return cmdbuf_ptr < cmdbuf_endp
2833 ? (unsigned char)*cmdbuf_ptr++
2834 : NOCHAR;
2835}
2836
2837static class out_of_input out_of_input;
2757 2838
2758/* rxvt_cmd_getc () - Return next input character */ 2839/* rxvt_cmd_getc () - Return next input character */
2759/* 2840/*
2760 * Return the next input character after first passing any keyboard input 2841 * Return the next input character after first passing any keyboard input
2761 * to the command. 2842 * to the command.
2762 */ 2843 */
2763unicode_t 2844wchar_t
2764rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc () THROW ((class out_of_input))
2765{ 2846{
2766 unicode_t c = next_char (); 2847 wchar_t c = next_char ();
2767 2848
2768 if (c == NOCHAR) 2849 if (c == NOCHAR)
2769 throw out_of_input; 2850 throw out_of_input;
2770 2851
2771 return c; 2852 return c;
2772} 2853}
2773 2854
2774unicode_t 2855uint32_t
2775rxvt_term::cmd_get8 () 2856rxvt_term::cmd_get8 () THROW ((class out_of_input))
2776{ 2857{
2777 unicode_t c = next_octet (); 2858 uint32_t c = next_octet ();
2778 2859
2779 if (c == NOCHAR) 2860 if (c == NOCHAR)
2780 throw out_of_input; 2861 throw out_of_input;
2781 2862
2782 return c; 2863 return c;
… …
2882 case C0_ESC: 2963 case C0_ESC:
2883 process_escape_seq (); 2964 process_escape_seq ();
2884 break; 2965 break;
2885 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 2969 else
2890 tt_write ((unsigned char *)VT100_ANS, 2970 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 2971 break;
2893 case C0_BEL: /* bell */ 2972 case C0_BEL: /* bell */
2894 scr_bell (); 2973 scr_bell ();
2895 break; 2974 break;
2896 case C0_BS: /* backspace */ 2975 case C0_BS: /* backspace */
… …
3020 scr_charset_set (2, (unsigned int)cmd_getc ()); 3099 scr_charset_set (2, (unsigned int)cmd_getc ());
3021 break; 3100 break;
3022 case '+': 3101 case '+':
3023 scr_charset_set (3, (unsigned int)cmd_getc ()); 3102 scr_charset_set (3, (unsigned int)cmd_getc ());
3024 break; 3103 break;
3025#if ENABLE_FRILLS 3104#if !ENABLE_MINIMAL
3026 case '6': 3105 case '6':
3027 scr_backindex (); 3106 scr_backindex ();
3028 break; 3107 break;
3029#endif 3108#endif
3030 case '7': 3109 case '7':
3031 scr_cursor (SAVE); 3110 scr_cursor (SAVE);
3032 break; 3111 break;
3033 case '8': 3112 case '8':
3034 scr_cursor (RESTORE); 3113 scr_cursor (RESTORE);
3035 break; 3114 break;
3036#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3037 case '9': 3116 case '9':
3038 scr_forwardindex (); 3117 scr_forwardindex ();
3039 break; 3118 break;
3040#endif 3119#endif
3041 case '=': 3120 case '=':
… …
3051 break; 3130 break;
3052 3131
3053 /* 8.3.87: NEXT LINE */ 3132 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 3133 case C1_NEL: /* ESC E */
3055 { 3134 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 3135 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3058 } 3137 }
3059 break; 3138 break;
3060 3139
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 3140 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 3141 case C1_ESA: /* ESC G */
… …
3084 process_dcs_seq (); 3163 process_dcs_seq ();
3085 break; 3164 break;
3086 3165
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 3167 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 3169 break; /* steal obsolete ESC [ c */
3092 3170
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3094 case C1_CSI: /* ESC [ */ 3172 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 3173 process_csi_seq ();
… …
3204 ndef = get_byte_array_bit (csi_defaults, i); 3282 ndef = get_byte_array_bit (csi_defaults, i);
3205 for (p = 0; p < nargs; p++) 3283 for (p = 0; p < nargs; p++)
3206 if (arg[p] == -1) 3284 if (arg[p] == -1)
3207 arg[p] = ndef; 3285 arg[p] = ndef;
3208 3286
3209#ifdef DEBUG_CMD
3210 fprintf (stderr, "CSI ");
3211 for (p = 0; p < nargs; p++)
3212 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3213 fprintf (stderr, "%c\n", ch);
3214#endif
3215
3216 /* 3287 /*
3217 * private mode handling 3288 * private mode handling
3218 */ 3289 */
3219 if (priv) 3290 if (priv)
3220 { 3291 {
3221 switch (priv) 3292 switch (priv)
3222 { 3293 {
3223 case '>': 3294 case '>':
3224 if (ch == CSI_DA) /* secondary device attributes */ 3295 if (ch == CSI_DA) /* secondary device attributes */
3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3296 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3302 // that we do not support xterm mouse reporting (should be 95 when we do).
3303 //
3304 tt_printf ("\033[>%d;94;0c", 'U');
3305 }
3226 break; 3306 break;
3227 case '?': 3307 case '?':
3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3229 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
3230 break; 3310 break;
… …
3335 3415
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3421 break;
3342 3422
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3425 break;
3347 3426
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3427 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3428 process_sgr_mode (nargs, arg);
3350 break; 3429 break;
… …
3357 break; 3436 break;
3358 case 6: /* CPR requested */ 3437 case 6: /* CPR requested */
3359 scr_report_position (); 3438 scr_report_position ();
3360 break; 3439 break;
3361 case 7: /* unofficial extension */ 3440 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3441 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3442 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3443 break;
3365 case 8: /* unofficial extension */ 3444 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3446 break;
… …
3434 break; 3513 break;
3435 case CSI_75: 3514 case CSI_75:
3436 scr_cursor (RESTORE); 3515 scr_cursor (RESTORE);
3437 break; 3516 break;
3438 3517
3439#if ENABLE_FRILLS 3518#if !ENABLE_MINIMAL
3440 case CSI_74: 3519 case CSI_74:
3441 process_window_ops (arg, nargs); 3520 process_window_ops (arg, nargs);
3442 break; 3521 break;
3443#endif 3522#endif
3444 3523
… …
3451 break; 3530 break;
3452 } 3531 }
3453} 3532}
3454/*}}} */ 3533/*}}} */
3455 3534
3456#if ENABLE_FRILLS 3535#if !ENABLE_MINIMAL
3457/* ARGSUSED */ 3536/* ARGSUSED */
3458void 3537void
3459rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3538rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3460{ 3539{
3461 int x, y; 3540 int x, y;
3462 XWindowAttributes wattr; 3541 XWindowAttributes wattr;
3463 Window wdummy; 3542 Window wdummy;
3464 dDisp; 3543
3544 dLocal (Display *, dpy);
3465 3545
3466 if (nargs == 0) 3546 if (nargs == 0)
3467 return; 3547 return;
3468 3548
3469 switch (args[0]) 3549 switch (args[0])
3470 { 3550 {
3471 /* 3551 /*
3472 * commands 3552 * commands
3473 */ 3553 */
3474 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (dpy, parent[0]);
3476 break; 3556 break;
3477 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (dpy, parent[0], display->screen);
3479 break; 3559 break;
3480 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (dpy, parent[0], args[1], args[2]);
3482 break; 3562 break;
3483 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3565 break;
3486 case 5: /* raise window */ 3566 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (dpy, parent[0]);
3488 break; 3568 break;
3489 case 6: /* lower window */ 3569 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (dpy, parent[0]);
3491 break; 3571 break;
3492 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3493 scr_touch (true); 3573 scr_touch (true);
3494 break; 3574 break;
3495 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3498 break; 3578 break;
3499 3579
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3581 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3505 break; 3585 break;
3506
3507 3586
3508 /* 3587 /*
3509 * reports - some output format copied from XTerm 3588 * reports - some output format copied from XTerm
3510 */ 3589 */
3511 case 11: /* report window state */ 3590 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3593 break;
3515 case 13: /* report window position */ 3594 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (dpy, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3596 XTranslateCoordinates (dpy, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3597 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3598 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3599 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3600 break;
3522 case 14: /* report window size (pixels) */ 3601 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3602 XGetWindowAttributes (dpy, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3604 break;
3526 case 18: /* report text area size (chars) */ 3605 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3606 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3607 break;
3529 case 19: /* report window size (chars) */ 3608 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3609 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3610 break;
3532 case 20: /* report icon label */ 3611 case 20: /* report icon label */
3533 { 3612 {
3534 char *s; 3613 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3614 XGetIconName (dpy, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3616 XFree (s);
3538 } 3617 }
3539 break; 3618 break;
3540 case 21: /* report window title */ 3619 case 21: /* report window title */
3541 { 3620 {
3542 char *s; 3621 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3622 XFetchName (dpy, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3624 XFree (s);
3546 } 3625 }
3547 break; 3626 break;
3548 } 3627 }
3549} 3628}
… …
3552/*----------------------------------------------------------------------*/ 3631/*----------------------------------------------------------------------*/
3553/* 3632/*
3554 * get input up until STRING TERMINATOR (or BEL) 3633 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3634 * ends_how is terminator used. returned input must be free()'d
3556 */ 3635 */
3557unsigned char * 3636char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3637rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3638{
3560 unicode_t ch; 3639 unicode_t ch;
3561 bool seen_esc = false; 3640 bool seen_esc = false;
3562 unsigned int n = 0; 3641 unsigned int n = 0;
… …
3581 else if (ch < 0x20) 3660 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3661 return NULL; /* other control character - exit */
3583 3662
3584 seen_esc = false; 3663 seen_esc = false;
3585 3664
3586 if (n >= sizeof (string) - 1) 3665 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3666 // stop at some sane length
3588 return NULL; 3667 return NULL;
3589 3668
3590 if (ch == C0_SYN) 3669 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3670 string[n++] = cmd_get8 ();
… …
3595 3674
3596 string[n++] = '\0'; 3675 string[n++] = '\0';
3597 3676
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3677 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3678
3600 return (unsigned char *)rxvt_wcstombs (string); 3679 return rxvt_wcstombs (string);
3601} 3680}
3602 3681
3603/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3604/* 3683/*
3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606 */ 3685 */
3607void 3686void
3608rxvt_term::process_dcs_seq () 3687rxvt_term::process_dcs_seq ()
3609{ 3688{
3610 unsigned char *s; 3689 char *s;
3611 unicode_t eh; 3690 unicode_t eh;
3612 3691
3613 /* 3692 /*
3614 * Not handled yet 3693 * Not handled yet
3615 */ 3694 */
… …
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3713 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3714 arg = arg * 10 + (ch - '0');
3636 3715
3637 if (ch == ';') 3716 if (ch == ';')
3638 { 3717 {
3639 unsigned char *s = get_to_st (eh); 3718 char *s = get_to_st (eh);
3640 3719
3641 if (s) 3720 if (s)
3642 { 3721 {
3643 process_xterm_seq (arg, (char *)s, eh); 3722 process_xterm_seq (arg, s, eh);
3644 free (s); 3723 free (s);
3645 } 3724 }
3646 } 3725 }
3647} 3726}
3648 3727
3649void 3728void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3729rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651{ 3730{
3652 if (str[0] == '?' && !str[1]) 3731 if (str[0] == '?' && !str[1])
3653 { 3732 {
3654 unsigned short r, g, b; 3733 rgba c;
3655 pix_colors_focused[color].get (display, r, g, b); 3734 pix_colors_focused[color].get (c);
3735
3736#if XFT
3737 if (c.a != rgba::MAX_CC)
3738 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3739 else
3740#endif
3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3741 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3657 } 3742 }
3658 else 3743 else
3659 set_window_color (color, str); 3744 set_window_color (color, str);
3660} 3745}
3661 3746
3662/* 3747/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3749 */
3687void 3750void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3751rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3689{ 3752{
3690 int changed = 0;
3691 int color; 3753 int color;
3692 char *buf, *name; 3754 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3694 int saveop = op; 3756 int saveop = op;
3695 dDisp; 3757
3758 dLocal (Display *, dpy);
3696 3759
3697 assert (str != NULL); 3760 assert (str != NULL);
3698 switch (op) 3761 switch (op)
3699 { 3762 {
3700 case XTerm_name: 3763 case XTerm_name:
… …
3716 unsigned long bytes_after; 3779 unsigned long bytes_after;
3717 unsigned char *value = 0; 3780 unsigned char *value = 0;
3718 const char *str = ""; 3781 const char *str = "";
3719 3782
3720 if (prop 3783 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3784 && XGetWindowProperty (dpy, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3785 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3786 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3787 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3788 && actual_type != None
3726 && actual_format == 8) 3789 && actual_format == 8)
3727 str = (const char *)(value); 3790 str = (const char *)(value);
3728 3791
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3792 tt_printf ("\033]%d;%s%c", op, str, resp);
3730 3793
3731 XFree (value); 3794 XFree (value);
3732 } 3795 }
3733 else 3796 else
3734 { 3797 {
… …
3738 { 3801 {
3739 *eq = 0; 3802 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3803 set_utf8_property (display->atom (str), eq + 1);
3741 } 3804 }
3742 else 3805 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3806 XDeleteProperty (dpy, parent[0],
3744 display->atom (str)); 3807 display->atom (str));
3745 } 3808 }
3746 break; 3809 break;
3747 3810
3748 case XTerm_Color: 3811 case XTerm_Color:
… …
3750 { 3813 {
3751 if ((name = strchr (buf, ';')) == NULL) 3814 if ((name = strchr (buf, ';')) == NULL)
3752 break; 3815 break;
3753 3816
3754 *name++ = '\0'; 3817 *name++ = '\0';
3755 color = atoi (buf); 3818 color = atoi (buf) + minCOLOR;
3756 3819
3757 if (color < 0 || color >= TOTAL_COLORS) 3820 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3758 break; 3821 break;
3759 3822
3760 if ((buf = strchr (name, ';')) != NULL) 3823 if ((buf = strchr (name, ';')) != NULL)
3761 *buf++ = '\0'; 3824 *buf++ = '\0';
3762 3825
3763 if (name[0] == '?' && !name[1]) 3826 process_color_seq (op, color, name, resp);
3764 {
3765 unsigned short r, g, b;
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3768 }
3769 else
3770 set_window_color (color + minCOLOR, name);
3771 } 3827 }
3772 break; 3828 break;
3773 case XTerm_Color00: 3829 case XTerm_Color00:
3774 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3830 process_color_seq (op, Color_fg, str, resp);
3775 break; 3831 break;
3776 case XTerm_Color01: 3832 case XTerm_Color01:
3777 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3833 process_color_seq (op, Color_bg, str, resp);
3778 break; 3834 break;
3779#ifndef NO_CURSORCOLOR 3835#ifndef NO_CURSORCOLOR
3780 case XTerm_Color_cursor: 3836 case XTerm_Color_cursor:
3781 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3837 process_color_seq (op, Color_cursor, str, resp);
3782 break; 3838 break;
3783#endif 3839#endif
3784 case XTerm_Color_pointer_fg: 3840 case XTerm_Color_pointer_fg:
3785 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3841 process_color_seq (op, Color_pointer_fg, str, resp);
3786 break; 3842 break;
3787 case XTerm_Color_pointer_bg: 3843 case XTerm_Color_pointer_bg:
3788 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3844 process_color_seq (op, Color_pointer_bg, str, resp);
3789 break; 3845 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3846#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break;
3800 case XTerm_Color_RV: 3847 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3848 process_color_seq (op, Color_RV, str, resp);
3849 break;
3850 case Rxvt_Color_BD:
3851 case URxvt_Color_BD:
3852 process_color_seq (op, Color_BD, str, resp);
3853 break;
3854 case Rxvt_Color_UL:
3855 case URxvt_Color_UL:
3856 process_color_seq (op, Color_UL, str, resp);
3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (op, Color_IT, str, resp);
3802 break; 3860 break;
3803#endif 3861#endif
3804#if TRANSPARENT && TINTING 3862#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3863 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3864 process_color_seq (op, Color_tint, str, resp);
3865
3807 check_our_parents (); 3866 check_our_parents ();
3867
3808 if (am_transparent) 3868 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3869 want_full_refresh = want_refresh = 1;
3810 break;
3811#endif
3812 3870
3871 break;
3872#endif
3873
3813 case XTerm_Pixmap: 3874 case Rxvt_Pixmap:
3875 {
3814 if (*str != ';') 3876 if (*str != ';')
3815 { 3877 {
3816#if XPM_BACKGROUND 3878#if XPM_BACKGROUND
3817 scale_pixmap (""); /* reset to default scaling */ 3879 scale_pixmap (""); /* reset to default scaling */
3818 set_bgPixmap (str); /* change pixmap */ 3880 set_bgPixmap (str); /* change pixmap */
3819#endif
3820 scr_touch (true); 3881 scr_touch (true);
3882#endif
3821 } 3883 }
3884
3885 int changed = 0;
3886
3822 while ((str = strchr (str, ';')) != NULL) 3887 while ((str = strchr (str, ';')) != NULL)
3823 { 3888 {
3824 str++; 3889 str++;
3825#if XPM_BACKGROUND 3890#if XPM_BACKGROUND
3826 changed += scale_pixmap (str); 3891 changed += scale_pixmap (str);
3827#endif 3892#endif
3828 } 3893 }
3829 3894
3830 if (changed) 3895 if (changed)
3831 { 3896 {
3832#ifdef XPM_BACKGROUND 3897#ifdef XPM_BACKGROUND
3833 resize_pixmap (); 3898 resize_pixmap ();
3834#endif
3835 scr_touch (true); 3899 scr_touch (true);
3900#endif
3836 } 3901 }
3902 }
3837 break; 3903 break;
3838 3904
3839 case XTerm_restoreFG: 3905 case Rxvt_restoreFG:
3840 set_window_color (Color_fg, str); 3906 set_window_color (Color_fg, str);
3841 break; 3907 break;
3842 case XTerm_restoreBG: 3908 case Rxvt_restoreBG:
3843 set_window_color (Color_bg, str); 3909 set_window_color (Color_bg, str);
3844 break; 3910 break;
3845 3911
3846 case XTerm_logfile: 3912 case XTerm_logfile:
3847 // TODO, when secure mode? 3913 // TODO, when secure mode?
3848 break; 3914 break;
3849 3915
3916#if 0
3917 case Rxvt_dumpscreen: /* no error notices */
3918 {
3919 int fd;
3920 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3921 {
3922 scr_dump (fd);
3923 close (fd);
3924 }
3925 }
3926 break;
3927#endif
3850 case XTerm_font: 3928 case XTerm_font:
3851 op = URxvt_font; 3929 op = URxvt_font;
3852 case URxvt_font: 3930 case URxvt_font:
3853#if ENABLE_STYLES 3931#if ENABLE_STYLES
3854 case URxvt_boldFont: 3932 case URxvt_boldFont:
3855 case URxvt_italicFont: 3933 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3934 case URxvt_boldItalicFont:
3857#endif 3935#endif
3858 if (query) 3936 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3937 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3938 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3939 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3940 resp);
3863 else 3941 else
3864 { 3942 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3943 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3944
… …
3868 allocated.push_back ((void *)res); 3946 allocated.push_back ((void *)res);
3869 set_fonts (); 3947 set_fonts ();
3870 } 3948 }
3871 break; 3949 break;
3872 3950
3873#if ENABLE_FRILLS 3951 case URxvt_version:
3874 case XTerm_locale:
3875 if (query) 3952 if (query)
3953 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3954 op,
3955 rs[Rs_name], VERSION[0], VERSION[2],
3956 resp);
3957 break;
3958
3959#if !ENABLE_MINIMAL
3960 case URxvt_locale:
3961 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3962 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3963 else
3878 { 3964 {
3879 set_locale (str); 3965 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3966 pty->set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3967 init_xlocale ();
3883# endif
3884 } 3968 }
3885 break; 3969 break;
3886#endif
3887 3970
3888#ifdef MENUBAR 3971 case URxvt_view_up:
3889 case XTerm_Menu: 3972 case URxvt_view_down:
3890 if (options & Opt_insecure) 3973 {
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3974 int lines = atoi (str);
3975
3976 if (lines)
3977 scr_page (op == URxvt_view_up ? UP : DN, lines);
3978 else
3979 scr_erase_savelines ();
3980 }
3981
3892 break; 3982 break;
3893#endif 3983#endif
3894#if 0 3984
3895 case XTerm_dumpscreen: /* no error notices */ 3985#if ENABLE_PERL
3896 { 3986 case URxvt_perl:
3897 int fd; 3987 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3988 ; // no responses yet
3899 {
3900 scr_dump (fd);
3901 close (fd);
3902 }
3903 }
3904 break; 3989 break;
3905#endif 3990#endif
3906 } 3991 }
3907} 3992}
3908/*----------------------------------------------------------------------*/ 3993/*----------------------------------------------------------------------*/
… …
3939 return state; 4024 return state;
3940} 4025}
3941 4026
3942/* we're not using priv _yet_ */ 4027/* we're not using priv _yet_ */
3943void 4028void
3944rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4029rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3945{ 4030{
3946 unsigned int i, j; 4031 unsigned int i, j;
3947 int state; 4032 int state;
3948 4033
3949 static const struct 4034 static const struct
… …
3960 { 5, PrivMode_rVideo }, 4045 { 5, PrivMode_rVideo },
3961 { 6, PrivMode_relOrigin }, 4046 { 6, PrivMode_relOrigin },
3962 { 7, PrivMode_Autowrap }, 4047 { 7, PrivMode_Autowrap },
3963 // 8, bi-directional support mode 4048 // 8, bi-directional support mode
3964 { 9, PrivMode_MouseX10 }, 4049 { 9, PrivMode_MouseX10 },
3965#ifdef menuBar_esc
3966 { menuBar_esc, PrivMode_menuBar },
3967#endif
3968 // 18, 19 printing-related 4050 // 18, 19 printing-related
3969 { 25, PrivMode_VisibleCursor }, 4051 { 25, PrivMode_VisibleCursor },
3970#ifdef scrollBar_esc 4052#ifdef scrollBar_esc
3971 { scrollBar_esc, PrivMode_scrollBar }, 4053 { scrollBar_esc, PrivMode_scrollBar },
3972#endif 4054#endif
… …
4017 } 4099 }
4018 4100
4019 /* extra handling for values with state unkept */ 4101 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4102 switch (arg[i])
4021 { 4103 {
4104#if ENABLE_STYLES
4105 case 1021:
4106 set_option (Opt_intensityStyles, mode);
4107
4108 scr_touch (true);
4109 break;
4110#endif
4022 case 1048: /* alternative cursor save */ 4111 case 1048: /* alternative cursor save */
4023 case 1049: 4112 case 1049:
4024 if (options & Opt_secondaryScreen) 4113 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4114 if (mode == 0)
4026 scr_cursor (RESTORE); 4115 scr_cursor (RESTORE);
4027 else if (mode == 1) 4116 else if (mode == 1)
4028 scr_cursor (SAVE); 4117 scr_cursor (SAVE);
4029 break; 4118 break;
… …
4041 */ 4130 */
4042 PrivMode (1, PrivMode_vt52); 4131 PrivMode (1, PrivMode_vt52);
4043 break; 4132 break;
4044 case 3: /* 80/132 */ 4133 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4134 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4135 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4136 break;
4048 case 4: /* smooth scrolling */ 4137 case 4: /* smooth scrolling */
4049 if (state)
4050 options &= ~Opt_jumpScroll;
4051 else
4052 options |= Opt_jumpScroll; 4138 set_option (Opt_jumpScroll, !state);
4053 break; 4139 break;
4054 case 5: /* reverse video */ 4140 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4141 scr_rvideo_mode (state);
4056 break; 4142 break;
4057 case 6: /* relative/absolute origins */ 4143 case 6: /* relative/absolute origins */
… …
4063 /* case 8: - auto repeat, can't do on a per window basis */ 4149 /* case 8: - auto repeat, can't do on a per window basis */
4064 case 9: /* X10 mouse reporting */ 4150 case 9: /* X10 mouse reporting */
4065 if (state) /* orthogonal */ 4151 if (state) /* orthogonal */
4066 priv_modes &= ~PrivMode_MouseX11; 4152 priv_modes &= ~PrivMode_MouseX11;
4067 break; 4153 break;
4068#ifdef menuBar_esc
4069 case menuBar_esc:
4070#ifdef MENUBAR
4071 map_menuBar (state);
4072#endif
4073 break;
4074#endif
4075#ifdef scrollBar_esc 4154#ifdef scrollBar_esc
4076 case scrollBar_esc: 4155 case scrollBar_esc:
4077 if (scrollbar_mapping (state)) 4156 if (scrollbar_mapping (state))
4078 { 4157 {
4079 resize_all_windows (0, 0, 0); 4158 resize_all_windows (0, 0, 0);
… …
4098#if 0 4177#if 0
4099 case 1001: 4178 case 1001:
4100 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
4101#endif 4180#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state)
4104 options &= ~Opt_scrollTtyOutput;
4105 else
4106 options |= Opt_scrollTtyOutput; 4182 set_option (Opt_scrollTtyOutput, !state);
4107 break; 4183 break;
4108 case 1011: /* scroll to bottom on key press */ 4184 case 1011: /* scroll to bottom on key press */
4109 if (state)
4110 options |= Opt_scrollTtyKeypress; 4185 set_option (Opt_scrollTtyKeypress, state);
4111 else
4112 options &= ~Opt_scrollTtyKeypress;
4113 break; 4186 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4187 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4188 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4189 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4190 scr_erase_screen (2);
4118 scr_change_screen (state); 4191 scr_change_screen (state);
4119 break; 4192 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4193 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4194 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4195 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4196 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4197 scr_erase_screen (2);
4125 break; 4198 break;
4126 default: 4199 default:
4127 break; 4200 break;
… …
4255 scr_color (Color_bg, Color_bg); 4328 scr_color (Color_bg, Color_bg);
4256 break; 4329 break;
4257 4330
4258 //case 50: // not variable spacing 4331 //case 50: // not variable spacing
4259 4332
4260#ifndef NO_BRIGHTCOLOR 4333#if !ENABLE_MINIMAL
4261 case 90: 4334 case 90:
4262 case 91: /* set bright fg color */ 4335 case 91: /* set bright fg color */
4263 case 92: 4336 case 92:
4264 case 93: 4337 case 93:
4265 case 94: 4338 case 94:
… …
4277 case 106: 4350 case 106:
4278 case 107: 4351 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4352 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4353 break;
4281#endif 4354#endif
4282
4283 } 4355 }
4284 } 4356 }
4285} 4357}
4286/*}}} */ 4358/*}}} */
4287 4359
… …
4311 */ 4383 */
4312void 4384void
4313rxvt_term::tt_printf (const char *fmt,...) 4385rxvt_term::tt_printf (const char *fmt,...)
4314{ 4386{
4315 va_list arg_ptr; 4387 va_list arg_ptr;
4316 unsigned char buf[256]; 4388 char buf[256];
4317 4389
4318 va_start (arg_ptr, fmt); 4390 va_start (arg_ptr, fmt);
4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4391 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4320 va_end (arg_ptr); 4392 va_end (arg_ptr);
4321 tt_write (buf, strlen (buf)); 4393 tt_write (buf, strlen (buf));
… …
4326 * or generated by us in response to a query ESC sequence. 4398 * or generated by us in response to a query ESC sequence.
4327 */ 4399 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4400const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329 4401
4330void 4402void
4331rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4403rxvt_term::tt_write (const char *data, unsigned int len)
4332{ 4404{
4405 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4406 return;
4407
4408 if (pty->pty < 0)
4409 return;
4410
4333 if (v_buflen == 0) 4411 if (v_buflen == 0)
4334 { 4412 {
4335 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4413 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4336 4414
4337 if ((unsigned int)written == len) 4415 if ((unsigned int)written == len)
4338 return; 4416 return;
4339 4417
4340 data += written; 4418 data += written;
4341 len -= written; 4419 len -= written;
4342 } 4420 }
4343 4421
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4422 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4345 4423
4346 memcpy (v_buffer + v_buflen, data, len); 4424 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len; 4425 v_buflen += len;
4348 4426
4349 pty_ev.set (EVENT_READ | EVENT_WRITE); 4427 pty_ev.set (EVENT_READ | EVENT_WRITE);
4350} 4428}
4351 4429
4352void rxvt_term::pty_write () 4430void rxvt_term::pty_write ()
4353{ 4431{
4354 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4432 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4355 4433
4356 if (written > 0) 4434 if (written > 0)
4357 { 4435 {
4358 v_buflen -= written; 4436 v_buflen -= written;
4359 4437
… …
4368 } 4446 }
4369 4447
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4448 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4449 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4451 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4452}
4376 4453
4377/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
4378 4455

Diff Legend

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