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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.346 by root, Wed Aug 15 06:48:16 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2004 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#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57/*{{{ Convert the keypress event into a string */ 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68#if ENABLE_FRILLS || ISO_14755
69
70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
58void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
59rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
60{ 304{
61 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
62 unsigned int newlen; 306 unsigned int newlen;
63 KeySym keysym; 307 KeySym keysym;
64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */
66#endif
67 int valid_keysym; 308 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
69 315
70 /* 316 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
73 * 319 *
74 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
75 */ 321 */
76 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
79 325
80 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
81 { 327 {
82 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 334#ifdef USE_XIM
89 if (Input_Context) 335 if (Input_Context)
90 { 336 {
91 Status status_return; 337 Status status_return;
92 338
339#if 0
93#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
97 else 344 else
345#endif
98#endif 346#endif
99 { 347 {
100 wchar_t wkbuf[KBUFSZ + 1]; 348 wchar_t wkbuf[KBUFSZ + 1];
101 349
102 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
106 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
109 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 360 SET_LOCALE (locale);
111 361
112 if (status_return == XLookupChars 362 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
114 { 364 {
365 /* make sure the user can type ctrl-@, i.e. NUL */
366 if (len == 1 && *wkbuf == 0)
367 {
368 kbuf[0] = 0;
369 len = 1;
370 }
371 else
372 {
115 wkbuf[len] = 0; 373 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 374 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 375 if (len < 0)
118 len = 0; 376 len = 0;
377 }
119 } 378 }
120 else 379 else
121 len = 0; 380 len = 0;
122 } 381 }
123 382
… …
125 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
126 } 385 }
127 else 386 else
128#endif 387#endif
129 { 388 {
130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
132 } 391 }
133 392
134 if (valid_keysym) 393 if (valid_keysym)
135 { 394 {
136 /* for some backwards compatibility */ 395#ifdef KEYSYM_RESOURCE
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 396 if (keyboard->dispatch (this, keysym, ev.state))
138# ifdef HOTKEY_CTRL 397 return;
139 if (ctrl)
140# else
141 if (meta)
142# endif 398#endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156 399
157 if (TermWin.saveLines) 400 if (saveLines)
158 { 401 {
159#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 403 if (!ctrl && !meta)
161 {
162#else 404#else
163 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
164 { 407 {
165#endif
166 int lnsppg; 408 int lnsppg;
167 409
168#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
170#else 412#else
171 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
172#endif 414#endif
173 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
174 { 416 {
175 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
176 return; 418 return;
… …
204 scr_move_to (0, 1); 446 scr_move_to (0, 1);
205 return; 447 return;
206 } 448 }
207 else if (keysym == XK_End) 449 else if (keysym == XK_End)
208 { 450 {
209 scr_move_to (1, 0); 451 scr_move_to (1, 1);
210 return; 452 return;
211 } 453 }
212 } 454 }
213#endif 455#endif
214 } 456 }
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 462 {
221 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
223 } 465 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 467 {
226 switch (keysym) 468 switch (keysym)
227 { 469 {
228 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
231 return; 473 return;
474#if TODO
232 /* rxvt extras */ 475 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 477 change_font (FONT_UP);
235 return; 478 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 480 change_font (FONT_DN);
238 return; 481 return;
482#endif
239 } 483 }
240 } 484 }
241 } 485 }
242#ifdef PRINTPIPE 486
243 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
244 { 488 // ISO 14755 support
245 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
246 return;
247 } 490 {
248#endif 491 int hv;
249#ifdef GREEK_SUPPORT 492
250 if (keysym == ks_greekmodeswith) 493 if (iso14755buf & ISO_14755_51
251 { 494 && (keysym == XK_space || keysym == XK_KP_Space
252 greek_mode = !greek_mode; 495 || keysym == XK_Return || keysym == XK_KP_Enter))
253 if (greek_mode)
254 { 496 {
255 xterm_seq (XTerm_title, 497 commit_iso14755 ();
256 (greek_getmode () == GREEK_ELOT928 498 iso14755buf = ISO_14755_51;
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 499# if ISO_14755
258 greek_reset (); 500 iso14755_51 (0);
501# endif
502 return;
259 } 503 }
260 else 504 else if (keysym == XK_BackSpace)
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return;
263 }
264#endif
265
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
267 {
268#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 505 {
271 unsigned int l; 506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
272 const unsigned char *kbuf0; 507# if ISO_14755
273 const unsigned char ch = C0_ESC; 508 iso14755_51 (iso14755buf & ISO_14755_MASK);
274
275 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++;
277
278 /* escape prefix */
279 if (meta)
280# ifdef META8_OPTION
281 if (meta_char == C0_ESC)
282# endif 509# endif
283 tt_write (&ch, 1); 510 return;
284 tt_write (kbuf0, l); 511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
285 return; 519 return;
286 } 520 }
287 else 521 else
522 {
523# if ISO_14755
524 scr_overlay_off ();
288#endif 525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
289 { 551 {
290 newlen = 1; 552 newlen = 1;
291 switch (keysym) 553 switch (keysym)
292 { 554 {
293#ifndef NO_BACKSPACE_KEY 555#ifndef NO_BACKSPACE_KEY
294 case XK_BackSpace: 556 case XK_BackSpace:
295 if (PrivateModes & PrivMode_HaveBackSpace) 557 if (priv_modes & PrivMode_HaveBackSpace)
296 { 558 {
297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
298 ^ !!ctrl) ? '\b' : '\177'; 560 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 561 kbuf[1] = '\0';
300 } 562 }
301 else 563 else
302 STRCPY (kbuf, key_backspace); 564 strcpy (kbuf, key_backspace);
303# ifdef MULTICHAR_SET 565 break;
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
305 { 572 {
306 int col, row; 573 strcpy (kbuf, "\033On");
307 574 break;
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 } 575 }
576 /* FALLTHROUGH */
314# endif 577# endif
315 break;
316#endif
317#ifndef NO_DELETE_KEY
318 case XK_Delete: 578 case XK_Delete:
319 STRCPY (kbuf, key_delete); 579 strcpy (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 580 break;
333#endif 581#endif
334 case XK_Tab: 582 case XK_Tab:
335 if (shft) 583 if (shft)
336 STRCPY (kbuf, "\033[Z"); 584 strcpy (kbuf, "\033[Z");
337 else 585 else
338 { 586 {
339#ifdef CTRL_TAB_MAKES_META 587#ifdef CTRL_TAB_MAKES_META
340 if (ctrl) 588 if (ctrl)
341 meta = 1; 589 meta = 1;
… …
347 newlen = 0; 595 newlen = 0;
348 } 596 }
349 break; 597 break;
350 598
351#ifdef XK_KP_Left 599#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 600 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 601 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 602 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 603 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
357 { 605 {
358 STRCPY (kbuf, "\033OZ"); 606 strcpy (kbuf, "\033OZ");
359 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
360 break; 608 break;
361 } 609 }
362 else 610 else
363 /* translate to std. cursor key */ 611 /* translate to std. cursor key */
… …
366#endif 614#endif
367 case XK_Up: /* "\033[A" */ 615 case XK_Up: /* "\033[A" */
368 case XK_Down: /* "\033[B" */ 616 case XK_Down: /* "\033[B" */
369 case XK_Right: /* "\033[C" */ 617 case XK_Right: /* "\033[C" */
370 case XK_Left: /* "\033[D" */ 618 case XK_Left: /* "\033[D" */
371 STRCPY (kbuf, "\033[Z"); 619 strcpy (kbuf, "\033[Z");
372 kbuf[2] = "DACB"[keysym - XK_Left]; 620 kbuf[2] = "DACB"[keysym - XK_Left];
373 /* do Shift first */ 621 /* do Shift first */
374 if (shft) 622 if (shft)
375 kbuf[2] = "dacb"[keysym - XK_Left]; 623 kbuf[2] = "dacb"[keysym - XK_Left];
376 else if (ctrl) 624 else if (ctrl)
377 { 625 {
378 kbuf[1] = 'O'; 626 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 627 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 628 }
381 else if (PrivateModes & PrivMode_aplCUR) 629 else if (priv_modes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 630 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 631 break;
419 632
420#ifndef UNSHIFTED_SCROLLKEYS 633#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 634# ifdef XK_KP_Prior
422 case XK_KP_Prior: 635 case XK_KP_Prior:
423 /* allow shift to override */ 636 /* allow shift to override */
424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
425 { 638 {
426 STRCPY (kbuf, "\033Oy"); 639 strcpy (kbuf, "\033Oy");
427 break; 640 break;
428 } 641 }
429 /* FALLTHROUGH */ 642 /* FALLTHROUGH */
430# endif 643# endif
431 case XK_Prior: 644 case XK_Prior:
432 STRCPY (kbuf, "\033[5~"); 645 strcpy (kbuf, "\033[5~");
433 break; 646 break;
434# ifdef XK_KP_Next 647# ifdef XK_KP_Next
435 case XK_KP_Next: 648 case XK_KP_Next:
436 /* allow shift to override */ 649 /* allow shift to override */
437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
438 { 651 {
439 STRCPY (kbuf, "\033Os"); 652 strcpy (kbuf, "\033Os");
440 break; 653 break;
441 } 654 }
442 /* FALLTHROUGH */ 655 /* FALLTHROUGH */
443# endif 656# endif
444 case XK_Next: 657 case XK_Next:
445 STRCPY (kbuf, "\033[6~"); 658 strcpy (kbuf, "\033[6~");
446 break; 659 break;
447#endif 660#endif
448 case XK_KP_Enter: 661 case XK_KP_Enter:
449 /* allow shift to override */ 662 /* allow shift to override */
450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
451 { 664 {
452 STRCPY (kbuf, "\033OM"); 665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
453 } 677 }
454 else 678 else
455 { 679 {
456 kbuf[0] = '\r'; 680 kbuf[0] = '\015';
457 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
458 } 682 }
459 break; 683 break;
460 684
461#ifdef XK_KP_Begin 685#ifdef XK_KP_Begin
462 case XK_KP_Begin: 686 case XK_KP_Begin:
463 STRCPY (kbuf, "\033Ou"); 687 strcpy (kbuf, "\033Ou");
464 break; 688 break;
465 689
466 case XK_KP_Insert:
467 STRCPY (kbuf, "\033Op");
468 break;
469
470 case XK_KP_Delete:
471 STRCPY (kbuf, "\033On");
472 break;
473#endif 690#endif
474 case XK_KP_F1: /* "\033OP" */ 691 case XK_KP_F1: /* "\033OP" */
475 case XK_KP_F2: /* "\033OQ" */ 692 case XK_KP_F2: /* "\033OQ" */
476 case XK_KP_F3: /* "\033OR" */ 693 case XK_KP_F3: /* "\033OR" */
477 case XK_KP_F4: /* "\033OS" */ 694 case XK_KP_F4: /* "\033OS" */
478 STRCPY (kbuf, "\033OP"); 695 strcpy (kbuf, "\033OP");
479 kbuf[2] += (keysym - XK_KP_F1); 696 kbuf[2] += (keysym - XK_KP_F1);
480 break; 697 break;
481 698
482 case XK_KP_Multiply: /* "\033Oj" : "*" */ 699 case XK_KP_Multiply: /* "\033Oj" : "*" */
483 case XK_KP_Add: /* "\033Ok" : "+" */ 700 case XK_KP_Add: /* "\033Ok" : "+" */
… …
494 case XK_KP_6: /* "\033Ov" : "6" */ 711 case XK_KP_6: /* "\033Ov" : "6" */
495 case XK_KP_7: /* "\033Ow" : "7" */ 712 case XK_KP_7: /* "\033Ow" : "7" */
496 case XK_KP_8: /* "\033Ox" : "8" */ 713 case XK_KP_8: /* "\033Ox" : "8" */
497 case XK_KP_9: /* "\033Oy" : "9" */ 714 case XK_KP_9: /* "\033Oy" : "9" */
498 /* allow shift to override */ 715 /* allow shift to override */
499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
500 { 717 {
501 STRCPY (kbuf, "\033Oj"); 718 strcpy (kbuf, "\033Oj");
502 kbuf[2] += (keysym - XK_KP_Multiply); 719 kbuf[2] += (keysym - XK_KP_Multiply);
503 } 720 }
504 else 721 else
505 { 722 {
506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
507 kbuf[1] = '\0'; 724 kbuf[1] = '\0';
508 } 725 }
509 break; 726 break;
510 727
511 case XK_Find: 728 case XK_Find:
512 STRCPY (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
513 break; 730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
514 case XK_Insert: 742 case XK_Insert:
515 STRCPY (kbuf, "\033[2~"); 743 strcpy (kbuf, "\033[2~");
516 break; 744 break;
517#ifdef DXK_Remove /* support for DEC remove like key */ 745#ifdef DXK_Remove /* support for DEC remove like key */
518 case DXK_Remove: 746 case DXK_Remove:
519 /* FALLTHROUGH */ 747 /* FALLTHROUGH */
520#endif 748#endif
521 case XK_Execute: 749 case XK_Execute:
522 STRCPY (kbuf, "\033[3~"); 750 strcpy (kbuf, "\033[3~");
523 break; 751 break;
524 case XK_Select: 752 case XK_Select:
525 STRCPY (kbuf, "\033[4~"); 753 strcpy (kbuf, "\033[4~");
526 break; 754 break;
527#ifdef XK_KP_End 755#ifdef XK_KP_End
528 case XK_KP_End: 756 case XK_KP_End:
529 /* allow shift to override */ 757 /* allow shift to override */
530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 { 759 {
532 STRCPY (kbuf, "\033Oq"); 760 strcpy (kbuf, "\033Oq");
533 break; 761 break;
534 } 762 }
535 /* FALLTHROUGH */ 763 /* FALLTHROUGH */
536#endif 764#endif
537 case XK_End: 765 case XK_End:
538 STRCPY (kbuf, KS_END); 766 strcpy (kbuf, KS_END);
539 break; 767 break;
540#ifdef XK_KP_Home 768#ifdef XK_KP_Home
541 case XK_KP_Home: 769 case XK_KP_Home:
542 /* allow shift to override */ 770 /* allow shift to override */
543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 { 772 {
545 STRCPY (kbuf, "\033Ow"); 773 strcpy (kbuf, "\033Ow");
546 break; 774 break;
547 } 775 }
548 /* FALLTHROUGH */ 776 /* FALLTHROUGH */
549#endif 777#endif
550 case XK_Home: 778 case XK_Home:
551 STRCPY (kbuf, KS_HOME); 779 strcpy (kbuf, KS_HOME);
552 break; 780 break;
553 781
554#define FKEY(n, fkey) \ 782#define FKEY(n, fkey) \
555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
556 784
… …
608#undef FKEY 836#undef FKEY
609 default: 837 default:
610 newlen = 0; 838 newlen = 0;
611 break; 839 break;
612 } 840 }
841
613 if (newlen) 842 if (newlen)
614 len = STRLEN (kbuf); 843 len = strlen (kbuf);
615 } 844 }
845
616 /* 846 /*
617 * Pass meta for all function keys, if 'meta' option set 847 * Pass meta for all function keys, if 'meta' option set
618 */ 848 */
619#ifdef META8_OPTION 849#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 850 if (meta && (meta_char == 0x80) && len > 0)
… …
625 else if (ctrl && keysym == XK_minus) 855 else if (ctrl && keysym == XK_minus)
626 { 856 {
627 len = 1; 857 len = 1;
628 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 858 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
629 } 859 }
860 else if (keysym == XK_ISO_Left_Tab)
861 {
862 strcpy (kbuf, "\033[Z");
863 len = 3;
864 }
630 else 865 else
631 { 866 {
632#ifdef META8_OPTION 867#ifdef META8_OPTION
633 /* set 8-bit on */ 868 /* set 8-bit on */
634 if (meta && (meta_char == 0x80)) 869 if (meta && (meta_char == 0x80))
635 { 870 {
636 unsigned char *ch; 871 char *ch;
637 872
638 for (ch = kbuf; ch < kbuf + len; ch++) 873 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 874 *ch |= 0x80;
875
640 meta = 0; 876 meta = 0;
641 } 877 }
642#endif 878#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif
647 /* nil */ ; 879 /* nil */ ;
648 } 880 }
649 } 881 }
882
883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
884 return;
650 885
651 if (len <= 0) 886 if (len <= 0)
652 return; /* not mapped */ 887 return; /* not mapped */
653 888
654 if (Options & Opt_scrollTtyKeypress) 889 if (option (Opt_scrollTtyKeypress))
655 if (TermWin.view_start) 890 if (view_start)
656 { 891 {
657 TermWin.view_start = 0; 892 view_start = 0;
658 want_refresh = 1; 893 want_refresh = 1;
659 } 894 }
660 895
661 /* 896 /*
662 * these modifications only affect the static keybuffer 897 * these modifications only affect the static keybuffer
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 908 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 909
675 /* escape prefix */ 910 /* escape prefix */
676 if (meta 911 if (meta
677#ifdef META8_OPTION 912#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 913 && meta_char == C0_ESC
679#endif 914#endif
680 ) 915 )
681 { 916 {
682 const unsigned char ch = C0_ESC; 917 const char ch = C0_ESC;
683
684 tt_write (&ch, 1); 918 tt_write (&ch, 1);
685 } 919 }
686#ifdef DEBUG_CMD
687 if (debug_key)
688 { /* Display keyboard buffer contents */
689 char *p;
690 int i;
691 920
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 921 tt_write (kbuf, (unsigned int)len);
699} 922}
700/*}}} */
701 923
702#if (MENUBAR_MAX) 924void
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925rxvt_term::key_release (XKeyEvent &ev)
704/* attempt to `write' count to the input buffer */ 926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
1000
1001#if defined (KEYSYM_RESOURCE)
705unsigned int 1002unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
707{ 1004{
708 unsigned int n, s; 1005 unsigned int n, s;
709 1006
710 n = cmdbuf_ptr - cmdbuf_base; 1007 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 1008 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1009
712 if (n > 0 && s < count) 1010 if (n > 0 && s < count)
713 { 1011 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1012 memmove (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1013 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 1014 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 1015 cmdbuf_endp -= n;
718 s += n; 1016 s += n;
719 } 1017 }
1018
720 if (count > s) 1019 if (count > s)
721 { 1020 {
722 rxvt_print_error ("data loss: cmd_write too large"); 1021 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 1022 count = s;
724 } 1023 }
1024
725 for (; count--;) 1025 for (; count--;)
726 *cmdbuf_endp++ = *str++; 1026 *cmdbuf_endp++ = *str++;
1027
1028 cmd_parse ();
1029
727 return 0; 1030 return 0;
728} 1031}
729#endif /* MENUBAR_MAX */ 1032#endif
730 1033
731void 1034void
732rxvt_term::flush () 1035rxvt_term::flush ()
733{ 1036{
1037 flush_ev.stop ();
1038
734#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
735 if (want_full_refresh) 1040 if (want_full_refresh)
736 { 1041 {
737 want_full_refresh = 0; 1042 want_full_refresh = 0;
738 scr_clear (); 1043 scr_clear ();
739 scr_touch (false); 1044 scr_touch (false);
740 want_refresh = 1;
741 } 1045 }
742#endif 1046#endif
743 1047
744 if (want_refresh) 1048 if (want_refresh)
745 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
746 scr_refresh (refresh_type); 1088 scr_refresh ();
747 scrollbar_show (1); 1089 scrollbar_show (1);
748#ifdef USE_XIM 1090#ifdef USE_XIM
749 IMSendSpot (); 1091 IMSendSpot ();
750#endif 1092#endif
751
752 } 1093 }
753 1094
754 display->flush (); 1095 display->flush ();
755} 1096}
756 1097
757void 1098void
758rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
759{ 1100{
760 SET_R (this); 1101 make_current ();
761 SET_LOCALE (locale);
762 1102
1103 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107}
1108
1109void
1110rxvt_term::flush_cb (time_watcher &w)
1111{
1112 make_current ();
1113
1114 refresh_count = 0;
763 flush (); 1115 flush ();
764} 1116}
765 1117
766#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
767void 1119void
768rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
769{ 1121{
770 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
771 want_refresh = 1; 1123 want_refresh = 1;
772 1124
773 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
774} 1126}
775#endif 1127#endif
776 1128
777#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
778void 1130void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 1137 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 1138 }
787} 1139}
788#endif 1140#endif
789 1141
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void
1144rxvt_term::cont_scroll_cb (time_watcher &w)
1145{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1151 }
1152}
1153#endif
1154
1155#ifdef SELECTION_SCROLLING
1156void
1157rxvt_term::sel_scroll_cb (time_watcher &w)
1158{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 }
1165}
1166#endif
1167
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void
1170rxvt_term::slip_wheel_cb (time_watcher &w)
1171{
1172 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 }
1182}
1183#endif
1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
790bool 1210bool
791rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
792{ 1212{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1214
1215 if (CBUFSIZ == n)
1216 {
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1218 n = 0;
1219 }
794 1220
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
798 1224
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
800 1226
801 if (n > 0) 1227 if (r > 0)
802 { 1228 {
803 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
804 return true; 1230 return true;
805 } 1231 }
806 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
807 destroy (); 1244 destroy ();
1245 }
808 1246
809 return false; 1247 return false;
810} 1248}
811 1249
812void 1250void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1252{
815 SET_R (this); 1253 make_current ();
816 SET_LOCALE (locale); 1254
1255 if (revents & EVENT_READ)
1256 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ())
1258 if (cmd_parse ())
1259 break;
817 1260
818 if (revents & EVENT_WRITE) 1261 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1262 pty_write ();
820 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ())
827 {
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 1263}
936 1264
937// read the next character, currently handles UTF-8 1265void
938// will probably handle all sorts of other stuff in the future 1266rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1267{
942 while (cmdbuf_ptr < cmdbuf_endp) 1268 XDefineCursor (dpy, vt, TermWin_cursor);
943 { 1269 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1270
947 wchar_t wc; 1271#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1272 hidden_pointer = 0;
949 1273
950 if (len == (size_t)-2) 1274 if (option (Opt_pointerBlank))
951 return NOCHAR; 1275 pointer_ev.start (NOW + pointerBlankDelay);
952 1276#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 1277}
985 1278
986#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
987void 1280void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1001{ 1282{
1002 if (! (Options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1003 return; 1284 return;
1004 1285
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1006 XFlush (display->display); 1287 XFlush (dpy);
1007 1288
1008 hidden_pointer = 1; 1289 hidden_pointer = 1;
1009} 1290}
1010 1291
1011void 1292void
1012rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1013{ 1294{
1014 SET_R (this); 1295 make_current ();
1015 SET_LOCALE (locale);
1016 1296
1017 pointer_blank (); 1297 pointer_blank ();
1018} 1298}
1019#endif 1299#endif
1020 1300
1021void 1301void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1303{
1024 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1025 int x, y; 1305 int x, y;
1026 1306
1027 x = ev.x; 1307 x = ev.x;
1028 y = ev.y; 1308 y = ev.y;
1029 pixel_position (&x, &y); 1309 pixel_position (&x, &y);
1030 1310
1031 if (MEvent.button == AnyButton) 1311 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1312 button_number = 3;
1034 }
1035 else 1313 else
1036 { 1314 {
1037 button_number = MEvent.button - Button1; 1315 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1316 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1317 if (button_number >= 3)
1040 button_number += (64 - 3); 1318 button_number += (64 - 3);
1041 } 1319 }
1042 1320
1043 if (PrivateModes & PrivMode_MouseX10) 1321 if (priv_modes & PrivMode_MouseX10)
1044 { 1322 {
1045 /* 1323 /*
1046 * do not report ButtonRelease 1324 * do not report ButtonRelease
1047 * no state info allowed 1325 * no state info allowed
1048 */ 1326 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1341 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1342 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1343#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1344 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1345#endif
1068
1069 } 1346 }
1070 1347
1071#ifdef DEBUG_MOUSEREPORT 1348#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1349 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1350 if (key_state & 16)
1074 fputc ('C', stderr); 1351 fputc ('C', stderr);
1075 if (key_state & 4) 1352 if (key_state & 4)
1076 fputc ('S', stderr); 1353 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1357 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1358 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1359 button_number,
1083 x + 1, 1360 x + 1,
1084 y + 1); 1361 y + 1);
1085#else 1362#endif
1363
1086 tt_printf ("\033[M%c%c%c", 1364 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1088 (32 + x + 1), 1366 (32 + x + 1),
1089 (32 + y + 1)); 1367 (32 + y + 1));
1090#endif
1091} 1368}
1092
1093#ifdef USING_W11LIB
1094void
1095rxvt_W11_process_x_event (XEvent *ev)
1096{
1097 rxvt_t *r = rxvt_get_r ();
1098
1099 x_cb (*ev);
1100}
1101#endif
1102 1369
1103/*{{{ process an X event */ 1370/*{{{ process an X event */
1104void 1371void
1105rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1106{ 1373{
1107 SET_R (this); 1374 make_current ();
1108 SET_LOCALE (locale);
1109 1375
1110#if defined(CURSOR_BLINK) 1376 dLocal (Display *, dpy);
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118 1377
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1378 if (ev.xany.window == vt
1120 } 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1121#endif 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return; 1381 return;
1140#endif
1141 1382
1383 // for XQueryPointer
1142 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1386 unsigned int unused_mask;
1145
1146#ifdef DEBUG_X
1147 const char *const eventnames[] =
1148 { /* mason - this matches my system */
1149 "",
1150 "",
1151 "KeyPress",
1152 "KeyRelease",
1153 "ButtonPress",
1154 "ButtonRelease",
1155 "MotionNotify",
1156 "EnterNotify",
1157 "LeaveNotify",
1158 "FocusIn",
1159 "FocusOut",
1160 "KeymapNotify",
1161 "Expose",
1162 "GraphicsExpose",
1163 "NoExpose",
1164 "VisibilityNotify",
1165 "CreateNotify",
1166 "DestroyNotify",
1167 "UnmapNotify",
1168 "MapNotify",
1169 "MapRequest",
1170 "ReparentNotify",
1171 "ConfigureNotify",
1172 "ConfigureRequest",
1173 "GravityNotify",
1174 "ResizeRequest",
1175 "CirculateNotify",
1176 "CirculateRequest",
1177 "PropertyNotify",
1178 "SelectionClear",
1179 "SelectionRequest",
1180 "SelectionNotify",
1181 "ColormapNotify",
1182 "ClientMessage",
1183 "MappingNotify"
1184 };
1185#endif
1186
1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime (& (tp.tv_sec));
1192 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1193#endif
1194 1387
1195 switch (ev.type) 1388 switch (ev.type)
1196 { 1389 {
1197 case KeyPress: 1390 case KeyPress:
1198 lookup_key (ev.xkey); 1391 key_press (ev.xkey);
1199 break; 1392 break;
1200 1393
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease: 1394 case KeyRelease:
1203 { 1395 key_release (ev.xkey);
1204 if (! (ev.xkey.state & ControlMask))
1205 mouse_slip_wheel_speed = 0;
1206 else
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1396 break;
1215 }
1216#endif
1217 1397
1218 case ButtonPress: 1398 case ButtonPress:
1219 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1220 break; 1400 break;
1221 1401
… …
1223 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1224 break; 1404 break;
1225 1405
1226 case ClientMessage: 1406 case ClientMessage:
1227 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1229 destroy ();
1230#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink))
1236 { 1409 {
1237 /* Get Dnd data */ 1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1238 Atom ActualType; 1411 {
1239 int ActualFormat; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1240 unsigned char *data; 1413 {
1241 unsigned long Size, RemainingBytes; 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1242 1415 {
1243 XGetWindowProperty (display->display, display->root, 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1244 xa[XA_DNDSELECTION], 1417 destroy ();
1245 0L, 1000000L, 1418 }
1246 False, AnyPropertyType, 1419#if ENABLE_EWMH
1247 &ActualType, &ActualFormat, 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1248 &Size, &RemainingBytes, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1249 &data); 1423 &ev);
1250 XChangeProperty (display->display, display->root, 1424#endif
1251 XA_CUT_BUFFER0, XA_STRING, 1425 }
1252 8, PropModeReplace, 1426 }
1253 data, STRLEN (data)); 1427#if ENABLE_XEMBED
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1256 } 1436 }
1257#endif /* OFFIX_DND */
1258 break;
1259
1260 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping));
1262 break; 1437 break;
1263 1438
1264 /* 1439 /*
1265 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1285 break; 1460 break;
1286 } 1461 }
1287 break; 1462 break;
1288 1463
1289 case FocusIn: 1464 case FocusIn:
1290 if (!TermWin.focus) 1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out ();
1476 break;
1477
1478 case ConfigureNotify:
1479 if (ev.xconfigure.window == parent[0])
1291 { 1480 {
1292 TermWin.focus = 1; 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1482 ;
1294#ifdef USE_XIM
1295 if (Input_Context != NULL)
1296 XSetICFocus (Input_Context);
1297#endif
1298#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif
1302 1483
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 {
1486 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1496 }
1497
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 bgPixmap.render ();
1503#endif
1303 } 1504 }
1304 break; 1505 break;
1305 1506
1306 case FocusOut:
1307 if (TermWin.focus)
1308 {
1309 TermWin.focus = 0;
1310 want_refresh = 1;
1311#ifdef USE_XIM
1312 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink)
1317 cursor_blink_ev.stop ();
1318 hidden_cursor = 0;
1319#endif
1320
1321 }
1322 break;
1323
1324 case ConfigureNotify: 1507 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1326 { 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1327 int height, width; 1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1512
1329 do
1330 { /* Wrap lots of configures into one */
1331 width = ev.xconfigure.width;
1332 height = ev.xconfigure.height;
1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1334 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1337 if (szHint.width != width || szHint.height != height)
1338 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1340 resize_all_windows (width, height, 1);
1341 }
1342#ifdef DEBUG_SIZE
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent)
1350 {
1351 check_our_parents ();
1352 if (am_transparent)
1353 want_full_refresh = 1;
1354 }
1355#endif
1356
1357 }
1358 break; 1513 break;
1359 1514
1360 case SelectionClear: 1515 case SelectionClear:
1361 display->set_selection_owner (0); 1516 selection_clear ();
1362 break; 1517 break;
1363 1518
1364 case SelectionNotify: 1519 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1520 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1522 break;
1369 1523
1370 case SelectionRequest: 1524 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1372 break; 1526 break;
1373 1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break;
1535
1374 case UnmapNotify: 1536 case UnmapNotify:
1375 TermWin.mapped = 0; 1537 mapped = 0;
1376#ifdef TEXT_BLINK 1538#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1378#endif 1540#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1379 break; 1542 break;
1380 1543
1381 case MapNotify:
1382 TermWin.mapped = 1;
1383#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif
1386 break;
1387
1388#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1389 case ReparentNotify: 1545 case ReparentNotify:
1390 rootwin_cb (ev); 1546 rootwin_cb (ev);
1391 break; 1547 break;
1392#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1393 1549
1394 case GraphicsExpose: 1550 case GraphicsExpose:
1395 case Expose: 1551 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1552 if (ev.xany.window == vt)
1397 { 1553 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1554 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1558
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1564
1406 // ev.xexpose.width, TermWin.height, False);
1407#endif
1408 want_refresh = 1; 1565 want_refresh = 1;
1409 } 1566 }
1410 else 1567 else
1411 { 1568 {
1412 XEvent unused_event; 1569 XEvent unused_event;
1413 1570
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1415 Expose, 1572 ;
1416 &unused_event)) ; 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1574 ;
1418 GraphicsExpose, 1575
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1421 { 1577 {
1422 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1423 scrollbar_show (0); 1579 scrollbar_show (0);
1424 } 1580 }
1425#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose ();
1428#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432
1433 } 1581 }
1434 break; 1582 break;
1435 1583
1436 case MotionNotify: 1584 case MotionNotify:
1437#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1586 if (hidden_pointer)
1439 pointer_unblank (); 1587 pointer_unblank ();
1440#endif 1588#endif
1441#if MENUBAR 1589 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1442 if (isMenuBarWindow (ev.xany.window)) 1590 break;
1591
1592 if (ev.xany.window == vt)
1443 { 1593 {
1444 menubar_control (& (ev.xbutton)); 1594 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1445 break; 1595 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 } 1596 ; // nop
1447#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break;
1450
1451 if (ev.xany.window == TermWin.vt)
1452 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1597 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1598 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1599 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1456 ; 1600 ;
1457 1601
1458 XQueryPointer (display->display, TermWin.vt, 1602 XQueryPointer (dpy, vt,
1459 &unused_root, &unused_child, 1603 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1604 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1605 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1606 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1607#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1608 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1609 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1610 {
1467#endif 1611#endif
1612#if ISO_14755
1613 // 5.4
1614 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1615 {
1616 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1617 break;
1618 }
1619#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1620 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1621 ev.xbutton.state & Button3Mask ? 2 : 0);
1622
1470#ifdef SELECTION_SCROLLING 1623#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1624 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1625 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1626 {
1474 int dist; 1627 int dist;
1475
1476 pending_scroll_selection=1;
1477 1628
1478 /* don't clobber the current delay if we are 1629 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1630 * already in the middle of scrolling.
1480 */ 1631 */
1481 if (scroll_selection_delay<=0) 1632 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1633 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1634
1484 /* save the event params so we can highlight 1635 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1636 * the selection in the pending-scroll loop
1486 */ 1637 */
1487 selection_save_x=ev.xbutton.x; 1638 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1639 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1640 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1641
1492 /* calc number of lines to scroll */ 1642 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1643 if (ev.xbutton.y < int_bwidth)
1494 { 1644 {
1495 scroll_selection_dir = UP; 1645 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1646 dist = int_bwidth - ev.xbutton.y;
1497 } 1647 }
1498 else 1648 else
1499 { 1649 {
1500 scroll_selection_dir = DN; 1650 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1651 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1652 }
1653
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1654 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1655 / SELECTION_SCROLL_LINE_SPEEDUP
1656 + 1;
1506 MIN_IT (scroll_selection_lines, 1657 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1658 SELECTION_SCROLL_MAX_LINES);
1508 } 1659 }
1509 else 1660 else
1510 { 1661 {
1511 /* we are within the text window, so we 1662 /* we are within the text window, so we
1512 * shouldn't be scrolling 1663 * shouldn't be scrolling
1513 */ 1664 */
1514 pending_scroll_selection = 0; 1665 if (sel_scroll_ev.active)
1666 sel_scroll_ev.stop();
1515 } 1667 }
1516#endif 1668#endif
1517#ifdef MOUSE_THRESHOLD 1669#ifdef MOUSE_THRESHOLD
1518
1519 } 1670 }
1520#endif 1671#endif
1521
1522 } 1672 }
1523 } 1673 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1674 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1675 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1676 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1527 MotionNotify, &ev)) ; 1677 MotionNotify, &ev))
1678 ;
1679
1528 XQueryPointer (display->display, scrollBar.win, 1680 XQueryPointer (dpy, scrollBar.win,
1529 &unused_root, &unused_child, 1681 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1682 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1683 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1684 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1685 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1686 scrollbar_size ());
1535 scr_refresh (refresh_type);
1536 refresh_limit = 0; 1687 want_refresh = 1;
1537 scrollbar_show (1); 1688 scrollbar_show (1);
1538 } 1689 }
1539 break; 1690 break;
1540 } 1691 }
1541}
1542 1692
1693#if defined(CURSOR_BLINK)
1694 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1695 {
1696 if (hidden_cursor)
1697 {
1698 hidden_cursor = 0;
1699 want_refresh = 1;
1700 }
1701
1702 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1703 }
1704#endif
1705
1706#if defined(POINTER_BLANK)
1707 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1708 {
1709 if (ev.type == MotionNotify
1710 || ev.type == ButtonPress
1711 || ev.type == ButtonRelease)
1712 if (hidden_pointer)
1713 pointer_unblank ();
1714
1715 if (ev.type == KeyPress && hidden_pointer == 0)
1716 pointer_blank ();
1717 }
1718#endif
1719}
1720
1721void
1722rxvt_term::focus_in ()
1723{
1724 if (!focus)
1725 {
1726 focus = 1;
1727 want_refresh = 1;
1728
1729 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1730
1731#if USE_XIM
1732 if (Input_Context != NULL)
1733 {
1734 IMSetPosition ();
1735 XSetICFocus (Input_Context);
1736 }
1737#endif
1738#if CURSOR_BLINK
1739 if (option (Opt_cursorBlink))
1740 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1741#endif
1742#if OFF_FOCUS_FADING
1743 if (rs[Rs_fade])
1744 {
1745 pix_colors = pix_colors_focused;
1746 scr_recolour ();
1747 }
1748#endif
1749#if ENABLE_FRILLS
1750 if (option (Opt_urgentOnBell))
1751 {
1752 XWMHints *h;
1753
1754 h = XGetWMHints(dpy, parent[0]);
1755 if (h != NULL)
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints(dpy, parent[0], h);
1759 }
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ISO_14755
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1801}
1802
1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1543void 1817void
1544rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1819{
1546 SET_R (this); 1820 make_current ();
1547 SET_LOCALE (locale);
1548 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1549 switch (ev.type) 1827 switch (ev.type)
1550 { 1828 {
1551 case PropertyNotify: 1829 case PropertyNotify:
1830 /*
1831 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on.
1833 */
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1553 { 1836 {
1554 if (ev.xproperty.state == PropertyNewValue) 1837 bgPixmap.set_root_pixmap ();
1555 selection_property (ev.xproperty.window, ev.xproperty.atom); 1838 bgPixmap.render ();
1556 break;
1557 } 1839 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 /* FALLTHROUGH */
1573 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ())
1575 if (am_transparent)
1576 want_full_refresh = 1;
1577 break; 1840 break;
1841 }
1578#endif 1842# endif
1579 }
1580} 1843}
1844#endif
1581 1845
1582void 1846void
1583rxvt_term::button_press (const XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1584{ 1848{
1585 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1586 1850
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1588 if (!bypass_keystate) 1853 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1855
1590 /* 1856 /*
1591 * VT window processing of button press 1857 * VT window processing of button press
1592 */ 1858 */
1593 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1594 { 1860 {
1595#if RXVT_GRAPHICS 1861 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1596 if (ev.subwindow != None) 1862 return;
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600 1863
1864#if ISO_14755
1865 // 5.4
1866 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1867 {
1868 iso14755_54 (ev.x, ev.y);
1869 return;
1601 { 1870 }
1871#endif
1872
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1873 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1874
1603 if (reportmode) 1875 if (reportmode)
1876 {
1877 /* mouse report from vt window */
1878 /* save the xbutton state (for ButtonRelease) */
1879 MEvent.state = ev.state;
1880#ifdef MOUSE_REPORT_DOUBLECLICK
1881 if (ev.button == MEvent.button && clickintime)
1604 { 1882 {
1605 /* mouse report from vt window */ 1883 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1884 MEvent.clicks++;
1607 MEvent.state = ev.state; 1885
1608#ifdef MOUSE_REPORT_DOUBLECLICK 1886 if (MEvent.clicks > 1)
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1887 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1888 /* only report double clicks */
1616 MEvent.clicks = 2; 1889 MEvent.clicks = 2;
1617 mouse_report (ev); 1890 mouse_report (ev);
1618 1891
1619 /* don't report the release */ 1892 /* don't report the release */
1620 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1894 MEvent.button = AnyButton;
1622 }
1623 } 1895 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1896 }
1637 else 1897 else
1638 { 1898 {
1899 /* different button, or time expired */
1900 MEvent.clicks = 1;
1901 MEvent.button = ev.button;
1902 mouse_report (ev);
1903 }
1904#else
1905 MEvent.button = ev.button;
1906 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */
1908
1909 }
1910 else
1911 {
1639 if (ev.button != MEvent.button) 1912 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1913 MEvent.clicks = 0;
1914
1641 switch (ev.button) 1915 switch (ev.button)
1642 { 1916 {
1643 case Button1: 1917 case Button1:
1918 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */
1920#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask);
1922#else
1923 selection.rect = false;
1924#endif
1925
1644 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1646 { 1928 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1668 else 1931 else
1669 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933 }
1934 else
1935 {
1936 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++;
1938 else
1939 MEvent.clicks = 1;
1940
1941 selection_click (MEvent.clicks, ev.x, ev.y);
1942 }
1943
1944 MEvent.button = Button1;
1945 break;
1946
1947 case Button3:
1948 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y);
1950 else
1951 selection_extend (ev.x, ev.y, 1);
1952
1670 MEvent.button = Button3; 1953 MEvent.button = Button3;
1671 break; 1954 break;
1672 }
1673 } 1955 }
1956 }
1957
1674 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1675 return; 1959 return;
1676 }
1677 } 1960 }
1678 1961
1679 /* 1962 /*
1680 * Scrollbar window processing of button press 1963 * Scrollbar window processing of button press
1681 */ 1964 */
… …
1745 upordown = 1; /* down */ 2028 upordown = 1; /* down */
1746 } 2029 }
1747 if (upordown) 2030 if (upordown)
1748 { 2031 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 2034#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 2035 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 2036 {
1754 if (upordown < 0) 2037 if (upordown < 0)
1755 scrollBar.setUp (); 2038 scrollBar.setUp ();
… …
1771 break; 2054 break;
1772 case R_SB_ALIGN_BOTTOM: 2055 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 2056 csrO = scrollBar.bot - scrollBar.top;
1774 break; 2057 break;
1775 } 2058 }
2059
1776 if (scrollBar.style == R_SB_XTERM 2060 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 2061 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 2062 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 2064
1781 scrollBar.setMotion (); 2065 scrollBar.setMotion ();
1782 break; 2066 break;
1783 2067
1784 case Button1: 2068 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2069 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2073 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2074 if (scrollBar.style != R_SB_XTERM)
1791 { 2075 {
1792 if (scrollbar_above_slider (ev.y)) 2076 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2077# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2078 scr_page (UP, nrow - 1);
1795# else 2079# else
1796 scr_page (UP, TermWin.nrow / 4); 2080 scr_page (UP, nrow / 4);
1797# endif 2081# endif
1798 else if (scrollbar_below_slider (ev.y)) 2082 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2084 scr_page (DN, nrow - 1);
1801# else 2085# else
1802 scr_page (DN, TermWin.nrow / 4); 2086 scr_page (DN, nrow / 4);
1803# endif 2087# endif
1804 else 2088 else
1805 scrollBar.setMotion (); 2089 scrollBar.setMotion ();
1806 } 2090 }
1807 else 2091 else
1808 { 2092 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2093 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2094 (nrow
1811 * scrollbar_position (ev.y) 2095 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2096 / scrollbar_size ()));
1813 } 2097 }
2098
1814 break; 2099 break;
1815 } 2100 }
1816 } 2101 }
2102
1817 return; 2103 return;
1818 } 2104 }
1819#if MENUBAR
1820 /*
1821 * Menubar window processing of button press
1822 */
1823 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev);
1825#endif
1826} 2105}
1827 2106
1828void 2107void
1829rxvt_term::button_release (const XButtonEvent &ev) 2108rxvt_term::button_release (XButtonEvent &ev)
1830{ 2109{
1831 int reportmode = 0; 2110 int reportmode = 0;
1832 2111
1833 csrO = 0; /* reset csr Offset */ 2112 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2113 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2114 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2115
1837 if (scrollbar_isUpDn ()) 2116 if (scrollbar_isUpDn ())
1838 { 2117 {
1839 scrollBar.setIdle (); 2118 scrollBar.setIdle ();
1840 scrollbar_show (0); 2119 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH;
1843#endif
1844
1845 } 2120 }
2121
1846#ifdef SELECTION_SCROLLING 2122#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop();
1848#endif 2125#endif
2126
1849 if (ev.window == TermWin.vt) 2127 if (ev.window == vt)
1850 { 2128 {
1851#ifdef RXVT_GRAPHICS 2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1852 if (ev.subwindow != None) 2130 return;
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856 2131
1857 { 2132#if ISO_14755
2133 // 5.4
2134 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2135 return;
2136#endif
2137
1858 if (reportmode) 2138 if (reportmode)
2139 {
2140 /* mouse report from vt window */
2141 /* don't report release of wheel "buttons" */
2142 if (ev.button >= 4)
2143 return;
2144#ifdef MOUSE_REPORT_DOUBLECLICK
2145 /* only report the release of 'slow' single clicks */
2146 if (MEvent.button != AnyButton
2147 && (ev.button != MEvent.button
2148 || (ev.time - MEvent.time
2149 > MULTICLICK_TIME / 2)))
1859 { 2150 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 2151 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2152 MEvent.button = AnyButton;
1877 mouse_report (ev); 2153 mouse_report (ev);
2154 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton;
2157 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2158#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2159 return;
2160 }
2161
2162 /*
2163 * dumb hack to compensate for the failure of click-and-drag
2164 * when overriding mouse reporting
2165 */
2166 if (priv_modes & PrivMode_mouse_report
2167 && bypass_keystate
2168 && ev.button == Button1 && MEvent.clicks <= 1)
2169 selection_extend (ev.x, ev.y, 0);
2170
2171 switch (ev.button)
2172 {
2173 case Button1:
2174 case Button3:
2175 selection_make (ev.time);
2176 break;
2177
2178 case Button2:
2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2181 break;
2182
2183#ifdef MOUSE_WHEEL
2184 case Button4:
2185 case Button5:
2186 {
2187 int i;
2188 page_dirn v;
2189
2190 v = ev.button == Button4 ? UP : DN;
2191
2192 if (ev.state & ShiftMask)
2193 i = 1;
2194 else if (option (Opt_mouseWheelScrollPage))
2195 i = nrow - 1;
2196 else
2197 i = 5;
2198
2199# ifdef MOUSE_SLIP_WHEELING
2200 if (ev.state & ControlMask)
2201 {
2202 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205
2206 if (slip_wheel_ev.at < NOW)
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2208
2209 slip_wheel_ev.start ();
2210 }
2211 else
2212 {
2213# endif
2214 scr_page (v, i);
2215 scrollbar_show (1);
2216# ifdef MOUSE_SLIP_WHEELING
2217 }
2218# endif
1880 } 2219 }
2220 break;
2221#endif
2222 }
2223 }
2224}
2225
2226/*}}} */
2227
2228bool
2229rxvt_term::cmd_parse ()
2230{
2231 bool flag = false;
2232 wchar_t ch = NOCHAR;
2233 char *seq_begin; // remember start of esc-sequence here
2234
2235 for (;;)
2236 {
2237 if (ch == NOCHAR)
2238 {
2239 seq_begin = cmdbuf_ptr;
2240 ch = next_char ();
2241
2242 if (ch == NOCHAR)
2243 break;
2244 }
2245
2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2247 {
2248 if (!seen_input)
2249 {
2250 seen_input = 1;
2251 // many badly-written programs (e.g. jed) contain a race condition:
2252 // they first read the screensize and then install a SIGWINCH handler.
2253 // some window managers resize the window early, and these programs
2254 // then sometimes get the size wrong.
2255 // unfortunately other programs are even more buggy and dislike
2256 // being sent SIGWINCH, so only do it when we were in fact being
2257 // resized.
2258 if (seen_resize && cmd_pid)
2259 kill (-cmd_pid, SIGWINCH);
2260 }
2261
2262 /* Read a text string from the input buffer */
2263 wchar_t buf[UBUFSIZ];
2264 bool refreshnow = false;
2265 int nlines = 0;
2266 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ);
2268
2269 for (;;)
2270 {
2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2272 break;
2273
2274 *str++ = ch;
2275
2276 if (ch == C0_LF || str >= eol)
2277 {
2278 if (ch == C0_LF)
2279 nlines++;
2280
2281 refresh_count++;
2282
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 {
2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2290 ch = NOCHAR;
2291 break;
2292 }
2293 }
2294
2295 // scr_add_lines only works for nlines <= nrow - 1.
2296 if (nlines >= nrow - 1)
2297 {
2298 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2299 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2300 scr_add_lines (buf, str - buf, nlines);
2301
2302 nlines = 0;
2303 str = buf;
2304 eol = str + min (ncol, UBUFSIZ);
2305 }
2306
2307 if (str >= eol)
2308 {
2309 if (eol >= buf + UBUFSIZ)
2310 {
2311 ch = NOCHAR;
2312 break;
2313 }
2314 else
2315 eol = min (eol + ncol, buf + UBUFSIZ);
2316 }
2317
2318 }
2319
2320 seq_begin = cmdbuf_ptr;
2321 ch = next_char ();
2322 }
2323
2324 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2326 scr_add_lines (buf, str - buf, nlines);
2327
1881 /* 2328 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2329 * If there have been a lot of new lines, then update the screen
1883 * when overriding mouse reporting 2330 * What the heck we'll cheat and only refresh less than every page-full.
2331 * if skipScroll is enabled.
1884 */ 2332 */
1885 if (PrivateModes & PrivMode_mouse_report 2333 if (refreshnow)
1886 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0);
1889
1890 switch (ev.button)
1891 { 2334 {
1892 case Button1: 2335 flag = true;
1893 case Button3:
1894 selection_make (ev.time);
1895 break;
1896 case Button2:
1897 selection_request (ev.time, ev.x, ev.y);
1898 break;
1899#ifdef MOUSE_WHEEL
1900 case Button4:
1901 case Button5:
1902 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1918 }
1919# endif
1920# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2336 scr_refresh ();
1923 scrollbar_show (1); 2337 want_refresh = 1;
1924# else
1925 while (i--)
1926 {
1927 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1);
1930 }
1931# endif
1932
1933 }
1934 break;
1935#endif
1936
1937 } 2338 }
1938 }
1939 }
1940#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev);
1943#endif
1944}
1945 2339
1946
1947#ifdef TRANSPARENT
1948/*
1949 * Check our parents are still who we think they are.
1950 * Do transparency updates if required
1951 */
1952int
1953rxvt_term::check_our_parents ()
1954{
1955 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after;
1957 Atom atype;
1958 unsigned char *prop = NULL;
1959 Window root, oldp, *list;
1960 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr;
1962
1963 pchanged = 0;
1964
1965 if (! (Options & Opt_transparent))
1966 return pchanged; /* Don't try any more */
1967
1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth;
1970
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1972 if (rootdepth != wattr.depth)
1973 {
1974 if (am_transparent)
1975 { 2340 }
1976 pchanged = 1; 2341 else
1977 XSetWindowBackground (display->display, TermWin.vt,
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0;
1980 } 2342 {
1981 return pchanged; /* Don't try any more */ 2343 try
1982 }
1983
1984 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False);
1986
1987 /*
1988 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that.
1991 */
1992 i = (xa[XA_XROOTPMAPID] != 0
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success));
1996 if (!i || prop == NULL)
1997 have_pixmap = 0;
1998 else
1999 {
2000 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop);
2002 XFree (prop);
2003 }
2004 if (have_pixmap)
2005 {
2006 /*
2007 * Copy display->root pixmap transparency
2008 */
2009 int sx, sy, nx, ny;
2010 unsigned int nw, nh;
2011 Window cr;
2012 XImage *image;
2013 GC gc;
2014 XGCValues gcvalue;
2015
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height;
2020 nx = ny = 0;
2021 if (sx < 0)
2022 {
2023 nw += sx;
2024 nx = -sx;
2025 sx = 0;
2026 }
2027 if (sy < 0)
2028 {
2029 nh += sy;
2030 ny = -sy;
2031 sy = 0;
2032 }
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2037 ZPixmap);
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */
2040 allowedxerror = 0;
2041 if (image == NULL)
2042 {
2043 if (am_transparent && am_pixmap_trans)
2044 { 2344 {
2045 pchanged = 1; 2345 process_nonprinting (ch);
2046 if (TermWin.pixmap != None)
2047 {
2048 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None;
2050 }
2051 } 2346 }
2052 am_pixmap_trans = 0; 2347 catch (const class out_of_input &o)
2053 }
2054 else
2055 {
2056 if (TermWin.pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap);
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height,
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height);
2066 XFreeGC (display->display, gc);
2067 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2069 TermWin.pixmap);
2070 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1;
2072 am_transparent = am_pixmap_trans = 1;
2073 }
2074 }
2075 if (!am_pixmap_trans)
2076 {
2077 unsigned int n;
2078 /*
2079 * InheritPixmap transparency
2080 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2083 i++)
2084 {
2085 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n);
2088 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2090 if (TermWin.parent[i] == display->root)
2091 { 2348 {
2092 if (oldp != None) 2349 // we ran out of input, retry later
2093 pchanged = 1; 2350 cmdbuf_ptr = seq_begin;
2094 break; 2351 break;
2095 } 2352 }
2096 if (oldp != TermWin.parent[i]) 2353
2097 pchanged = 1; 2354 ch = NOCHAR;
2098 }
2099 n = 0;
2100 if (pchanged)
2101 { 2355 }
2102 for (; n < (unsigned int)i; n++) 2356 }
2103 { 2357
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2358 return flag;
2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2359}
2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2360
2107 { 2361// read the next character
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2362wchar_t
2109 break; 2363rxvt_term::next_char () NOTHROW
2110 } 2364{
2111 } 2365 while (cmdbuf_ptr < cmdbuf_endp)
2366 {
2367 // assume 7-bit to be ascii ALWAYS
2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2369 return *cmdbuf_ptr++;
2370
2371 wchar_t wc;
2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2373
2374 if (len == (size_t)-2)
2112 } 2375 {
2113 if (n > (int) (sizeof (TermWin.parent) 2376 // the mbstate stores incomplete sequences. didn't know this :/
2114 / sizeof (TermWin.parent[0]))) 2377 cmdbuf_ptr = cmdbuf_endp;
2378 break;
2115 { 2379 }
2116 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0],
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt,
2120 PixColors[Color_bg]);
2121 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */
2123 }
2124 else
2125 {
2126 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130 2380
2131 rqt.tv_sec = 1; 2381 if (len == (size_t)-1)
2132 rqt.tv_nsec = 0; 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2133 nanosleep (&rqt, NULL); 2383
2134# else 2384 // assume wchar == unicode
2135 sleep (1); 2385 cmdbuf_ptr += len;
2136# endif 2386 return wc & UNICODE_MASK;
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2140 ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2142 ParentRelative);
2143 am_transparent = 1;
2144 }
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None;
2147 } 2387 }
2388
2389 return NOCHAR;
2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2402
2403/* rxvt_cmd_getc () - Return next input character */
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{
2411 wchar_t c = next_char ();
2412
2413 if (c == NOCHAR)
2414 throw out_of_input;
2415
2148 return pchanged; 2416 return c;
2149} 2417}
2150#endif
2151 2418
2152/*}}} */ 2419uint32_t
2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{
2422 uint32_t c = next_octet ();
2423
2424 if (c == NOCHAR)
2425 throw out_of_input;
2426
2427 return c;
2428}
2153 2429
2154/*{{{ print pipe */ 2430/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2157FILE * 2433FILE *
2158rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2159{ 2435{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2437
2162 if (stream == NULL) 2438 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2440
2164 return stream; 2441 return stream;
2165} 2442}
2166 2443
2167int 2444int
2168rxvt_term::pclose_printer (FILE *stream) 2445rxvt_term::pclose_printer (FILE *stream)
2169{ 2446{
2170 fflush (stream); 2447 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2448 return pclose (stream);
2177# endif
2178} 2449}
2179 2450
2180/* 2451/*
2181 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2182 */ 2453 */
2183void 2454void
2184rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2185{ 2456{
2186 int done; 2457 int done;
2187 FILE *fd; 2458 FILE *fd;
2188 2459
2189 if ((fd = popen_printer ()) == NULL) 2460 if ((fd = popen_printer ()) == NULL)
2190 return; 2461 return;
2191 2462
2192 /* 2463 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2465 * is received.
2195 */ 2466 */
2196 for (done = 0; !done;) 2467 for (done = 0; !done;)
2197 { 2468 {
2198 unsigned char buf[8]; 2469 unsigned char buf[8];
2199 unsigned char ch; 2470 unicode_t ch;
2200 unsigned int i, len; 2471 unsigned int i, len;
2201 2472
2202 if ((ch = cmd_getc ()) != C0_ESC) 2473 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2474 {
2204 if (putc (ch, fd) == EOF) 2475 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2476 break; /* done = 1 */
… …
2220 { 2491 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2493 break; /* done = 1 */
2223 } 2494 }
2224 } 2495 }
2496
2225 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2227 { 2499 {
2228 done = 1; 2500 done = 1;
2229 break; 2501 break;
2230 } 2502 }
2231 } 2503 }
2232 } 2504 }
2505
2233 pclose_printer (fd); 2506 pclose_printer (fd);
2234} 2507}
2235#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2236/*}}} */ 2509/*}}} */
2237 2510
2238/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2239enum { 2512enum {
2240 C1_40 = 0x40, 2513 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2518};
2246/* *INDENT-ON* */ 2519/* *INDENT-ON* */
2247 2520
2248/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2249void 2522void
2250rxvt_term::process_nonprinting (unsigned char ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2524{
2252 switch (ch) 2525 switch (ch)
2253 { 2526 {
2527 case C0_ESC:
2528 process_escape_seq ();
2529 break;
2254 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2256 tt_write ( 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2257 (const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 2533 else
2260 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2261 (unsigned int)STRLEN (VT100_ANS));
2262 break; 2535 break;
2263 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2264 scr_bell (); 2537 scr_bell ();
2265 break; 2538 break;
2266 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2554 scr_charset_choose (1);
2282 break; 2555 break;
2283 case C0_SI: /* shift in - acs */ 2556 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2557 scr_charset_choose (0);
2285 break; 2558 break;
2559
2560#ifdef EIGHT_BIT_CONTROLS
2561 // 8-bit controls
2562 case 0x90: /* DCS */
2563 process_dcs_seq ();
2564 break;
2565 case 0x9b: /* CSI */
2566 process_csi_seq ();
2567 break;
2568 case 0x9d: /* OSC */
2569 process_osc_seq ();
2570 break;
2571#endif
2286 } 2572 }
2287} 2573}
2288/*}}} */ 2574/*}}} */
2289 2575
2290 2576
2291/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2292void 2578void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2580{
2295 int row, col; 2581 int row, col;
2296 2582
2297 switch (ch) 2583 switch (ch)
2298 { 2584 {
… …
2350 2636
2351/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2352void 2638void
2353rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2354{ 2640{
2355 unsigned char ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2356 2642
2357 if (PrivateModes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
2358 { 2644 {
2359 process_escape_vt52 (ch); 2645 process_escape_vt52 (ch);
2360 return; 2646 return;
2361 } 2647 }
2362 2648
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2664 break;
2379 case '+': 2665 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2667 break;
2382#ifdef MULTICHAR_SET 2668#if !ENABLE_MINIMAL
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS
2388 case '6': 2669 case '6':
2389 scr_backindex (); 2670 scr_backindex ();
2390 break; 2671 break;
2391#endif 2672#endif
2392 case '7': 2673 case '7':
2393 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
2394 break; 2675 break;
2395 case '8': 2676 case '8':
2396 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
2397 break; 2678 break;
2398#ifndef NO_FRILLS 2679#if !ENABLE_MINIMAL
2399 case '9': 2680 case '9':
2400 scr_forwardindex (); 2681 scr_forwardindex ();
2401 break; 2682 break;
2402#endif 2683#endif
2403 case '=': 2684 case '=':
… …
2413 break; 2694 break;
2414 2695
2415 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2417 { 2698 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2420 } 2701 }
2421 break; 2702 break;
2422 2703
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2424 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2434 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2435 scr_index (DN); 2716 scr_index (DN);
2436 break; 2717 break;
2437 2718
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /*case C1_SS2: scr_single_shift (2); break; */
2440 2721
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /*case C1_SS3: scr_single_shift (3); break; */
2443 2724
2444 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 2727 process_dcs_seq ();
2447 break; 2728 break;
2448 2729
2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2450 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2451 tt_write ((const unsigned char *)ESCZ_ANSWER, 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2453 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2454 2734
2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2456 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2457 process_csi_seq (); 2737 process_csi_seq ();
… …
2462 process_osc_seq (); 2742 process_osc_seq ();
2463 break; 2743 break;
2464 2744
2465 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 2746 case 'c':
2747 mbstate.reset ();
2467 scr_poweron (); 2748 scr_poweron ();
2468 scrollbar_show (1); 2749 scrollbar_show (1);
2469 break; 2750 break;
2470 2751
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 2764
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 2766/* *INDENT-OFF* */
2486enum { 2767enum {
2487 CSI_ICH = 0x40, 2768 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2772 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2773 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 2795 };
2515/* *INDENT-ON* */ 2796/* *INDENT-ON* */
2516 2797
2517void 2798void
2518rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
2519{ 2800{
2520 unsigned char ch, priv, i; 2801 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 2802 unsigned int nargs, p;
2522 int n, ndef; 2803 int n, ndef;
2523 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS];
2524 2805
2525 for (nargs = ESC_ARGS; nargs > 0;) 2806 memset (arg, 0, sizeof (arg));
2526 arg[--nargs] = 0; 2807 nargs = 0;
2527 2808
2528 priv = 0; 2809 priv = 0;
2529 ch = cmd_getc (); 2810 ch = cmd_getc ();
2530 if (ch >= '<' && ch <= '?') 2811 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 2812 { /* '<' '=' '>' '?' */
2532 priv = ch; 2813 priv = ch;
2533 ch = cmd_getc (); 2814 ch = cmd_getc ();
2534 } 2815 }
2816
2535 /* read any numerical arguments */ 2817 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 2818 for (n = -1; ch < CSI_ICH; )
2537 { 2819 {
2538 if (isdigit (ch)) 2820 if (isdigit (ch))
2539 { 2821 {
… …
2546 { 2828 {
2547 if (nargs < ESC_ARGS) 2829 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 2830 arg[nargs++] = n;
2549 n = -1; 2831 n = -1;
2550 } 2832 }
2551 else if (ch == '\b') 2833 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 2834 process_nonprinting (ch);
2563 } 2835
2564 ch = cmd_getc (); 2836 ch = cmd_getc ();
2565 } 2837 }
2566 2838
2567 if (ch > CSI_7F) 2839 if (ch > CSI_7F)
2568 return; 2840 return;
… …
2574 ndef = get_byte_array_bit (csi_defaults, i); 2846 ndef = get_byte_array_bit (csi_defaults, i);
2575 for (p = 0; p < nargs; p++) 2847 for (p = 0; p < nargs; p++)
2576 if (arg[p] == -1) 2848 if (arg[p] == -1)
2577 arg[p] = ndef; 2849 arg[p] = ndef;
2578 2850
2579#ifdef DEBUG_CMD
2580 fprintf (stderr, "CSI ");
2581 for (p = 0; p < nargs; p++)
2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2583 fprintf (stderr, "%c\n", ch);
2584#endif
2585
2586 /* 2851 /*
2587 * private mode handling 2852 * private mode handling
2588 */ 2853 */
2589 if (priv) 2854 if (priv)
2590 { 2855 {
2591 switch (priv) 2856 switch (priv)
2592 { 2857 {
2593 case '>': 2858 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 2859 if (ch == CSI_DA) /* secondary device attributes */
2860 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2866 // that we do not support xterm mouse reporting (should be 95 when we do).
2867 //
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2868 tt_printf ("\033[>%d;94;0c", 'U');
2869 }
2596 break; 2870 break;
2597 case '?': 2871 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 2874 break;
… …
2705 2979
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2980 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 2981 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 2982 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2983 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2984 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 2985 break;
2712 2986
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2987 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 2988 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 2989 break;
2717 2990
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2991 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 2992 process_sgr_mode (nargs, arg);
2720 break; 2993 break;
… …
2726 tt_printf ("\033[0n"); 2999 tt_printf ("\033[0n");
2727 break; 3000 break;
2728 case 6: /* CPR requested */ 3001 case 6: /* CPR requested */
2729 scr_report_position (); 3002 scr_report_position ();
2730 break; 3003 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3004 case 7: /* unofficial extension */
3005 if (option (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3006 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3007 break;
2735#endif
2736 case 8: /* unofficial extension */ 3008 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3009 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3010 break;
2739 } 3011 }
2740 break; 3012 break;
2741 3013
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3014 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3047 break;
2776 3048
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3049 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3050 if (arg[0] == 4)
2779 scr_insert_mode (0); 3051 scr_insert_mode (0);
3052 else if (arg[0] == 20)
3053 priv_modes &= ~PrivMode_LFNL;
2780 break; 3054 break;
2781 3055
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3056 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3057 if (arg[0] == 4)
2784 scr_insert_mode (1); 3058 scr_insert_mode (1);
3059 else if (arg[0] == 20)
3060 priv_modes |= PrivMode_LFNL;
2785 break; 3061 break;
2786 3062
2787 /* 3063 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3064 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3065 */
… …
2801 break; 3077 break;
2802 case CSI_75: 3078 case CSI_75:
2803 scr_cursor (RESTORE); 3079 scr_cursor (RESTORE);
2804 break; 3080 break;
2805 3081
2806#ifndef NO_FRILLS 3082#if !ENABLE_MINIMAL
2807 case CSI_74: 3083 case CSI_74:
2808 process_window_ops (arg, nargs); 3084 process_window_ops (arg, nargs);
2809 break; 3085 break;
2810#endif 3086#endif
2811 3087
2812 case CSI_78: /* DECREQTPARM */ 3088 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3089 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3090 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3091 break;
2816 3092
2817 default: 3093 default:
2818 break; 3094 break;
2819 } 3095 }
2820} 3096}
2821/*}}} */ 3097/*}}} */
2822 3098
2823#ifndef NO_FRILLS 3099#if !ENABLE_MINIMAL
2824/* ARGSUSED */ 3100/* ARGSUSED */
2825void 3101void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3102rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3103{
2828 int x, y; 3104 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3105 XWindowAttributes wattr;
2833 Window wdummy; 3106 Window wdummy;
3107
3108 dLocal (Display *, dpy);
2834 3109
2835 if (nargs == 0) 3110 if (nargs == 0)
2836 return; 3111 return;
3112
2837 switch (args[0]) 3113 switch (args[0])
2838 { 3114 {
2839 /* 3115 /*
2840 * commands 3116 * commands
2841 */ 3117 */
2842 case 1: /* deiconify window */ 3118 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3119 XMapWindow (dpy, parent[0]);
2844 break; 3120 break;
2845 case 2: /* iconify window */ 3121 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3122 XIconifyWindow (dpy, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3123 break;
2849 case 3: /* set position (pixels) */ 3124 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3125 XMoveWindow (dpy, parent[0], args[1], args[2]);
2851 break; 3126 break;
2852 case 4: /* set size (pixels) */ 3127 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3128 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3129 break;
2855 case 5: /* raise window */ 3130 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3131 XRaiseWindow (dpy, parent[0]);
2857 break; 3132 break;
2858 case 6: /* lower window */ 3133 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3134 XLowerWindow (dpy, parent[0]);
2860 break; 3135 break;
2861 case 7: /* refresh window */ 3136 case 7: /* refresh window */
2862 scr_touch (true); 3137 scr_touch (true);
2863 break; 3138 break;
2864 case 8: /* set size (chars) */ 3139 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3140 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3141 (unsigned int) (args[1] * fheight));
2867 break; 3142 break;
3143
3144 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3145 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3146 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3147 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3148 (unsigned int) (args[1] * fheight));
2872 break; 3149 break;
3150
2873 /* 3151 /*
2874 * reports - some output format copied from XTerm 3152 * reports - some output format copied from XTerm
2875 */ 3153 */
2876 case 11: /* report window state */ 3154 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3156 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3157 break;
2880 case 13: /* report window position */ 3158 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3160 XTranslateCoordinates (dpy, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3161 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3162 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3163 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3164 break;
2887 case 14: /* report window size (pixels) */ 3165 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3167 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3168 break;
3169 case 18: /* report text area size (chars) */
3170 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3171 break;
2891 case 18: /* report window size (chars) */ 3172 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3174 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3175 case 20: /* report icon label */
3176 {
3177 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3178 XGetIconName (dpy, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3180 XFree (s);
3181 }
2898 break; 3182 break;
2899 case 21: /* report window title */ 3183 case 21: /* report window title */
3184 {
3185 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3186 XFetchName (dpy, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188 XFree (s);
3189 }
2902 break; 3190 break;
2903#endif
2904
2905 } 3191 }
2906} 3192}
2907#endif 3193#endif
2908 3194
2909/*----------------------------------------------------------------------*/ 3195/*----------------------------------------------------------------------*/
2910/* 3196/*
2911 * get input up until STRING TERMINATOR (or BEL) 3197 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3198 * ends_how is terminator used. returned input must be free()'d
2913 */ 3199 */
2914unsigned char * 3200char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3201rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3202{
2917 int seen_esc = 0; /* seen escape? */ 3203 unicode_t ch;
3204 bool seen_esc = false;
2918 unsigned int n = 0; 3205 unsigned int n = 0;
2919 unsigned char *s; 3206 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3207
2922 for (; (ch = cmd_getc ());) 3208 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3209 {
2924 if (ch == C0_BEL 3210 if (seen_esc)
2925 || ch == CHAR_ST 3211 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3212 if (ch == 0x5c) /* 7bit ST */
2927 break; 3213 break;
3214 else
3215 return NULL;
3216 }
2928 if (ch == C0_ESC) 3217 else if (ch == C0_ESC)
2929 { 3218 {
2930 seen_esc = 1; 3219 seen_esc = true;
2931 continue; 3220 continue;
2932 } 3221 }
3222 else if (ch == C0_BEL || ch == CHAR_ST)
3223 break;
2933 else if (ch == '\t') 3224 else if (ch == C0_SYN)
2934 ch = ' '; /* translate '\t' to space */ 3225 ch = cmd_get8 ();
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3226 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3227 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3228
3229 seen_esc = false;
3230
3231 if (n >= STRING_MAX - 1)
3232 // stop at some sane length
3233 return NULL;
3234
2938 string[n++] = ch; 3235 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3236 }
3237
2941 string[n++] = '\0'; 3238 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3239
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3240 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3241
2946 return s; 3242 return rxvt_wcstombs (string);
2947} 3243}
2948 3244
2949/*----------------------------------------------------------------------*/ 3245/*----------------------------------------------------------------------*/
2950/* 3246/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3247 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3248 */
2953void 3249void
2954rxvt_term::process_dcs_seq () 3250rxvt_term::process_dcs_seq ()
2955{ 3251{
2956 unsigned char eh, *s; 3252 char *s;
3253 unicode_t eh;
3254
2957 /* 3255 /*
2958 * Not handled yet 3256 * Not handled yet
2959 */ 3257 */
2960 s = get_to_st (&eh); 3258 s = get_to_st (eh);
2961 if (s) 3259 if (s)
2962 free (s); 3260 free (s);
3261
2963 return; 3262 return;
2964} 3263}
2965 3264
2966/*----------------------------------------------------------------------*/ 3265/*----------------------------------------------------------------------*/
2967/* 3266/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3268 */
2970void 3269void
2971rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
2972{ 3271{
2973 unsigned char ch, eh, *s; 3272 unicode_t ch, eh;
2974 int arg; 3273 int arg;
2975 3274
2976 ch = cmd_getc (); 3275 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3276 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3277 arg = arg * 10 + (ch - '0');
2979 3278
2980 if (ch == ';') 3279 if (ch == ';')
2981 { 3280 {
2982 s = get_to_st (&eh); 3281 char *s = get_to_st (eh);
3282
2983 if (s) 3283 if (s)
2984 { 3284 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3285 process_xterm_seq (arg, s, eh);
2997 free (s); 3286 free (s);
2998 } 3287 }
2999 } 3288 }
3000} 3289}
3290
3291void
3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3293{
3294 if (str[0] == '?' && !str[1])
3295 {
3296 rgba c;
3297 pix_colors_focused[color].get (c);
3298
3299#if XFT
3300 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3302 else
3303#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 }
3306 else
3307 set_window_color (color, str);
3308}
3309
3001/* 3310/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title
3004 * 1 = change iconName
3005 * 2 = change title
3006 * 4 = change color
3007 * 12 = change text color
3008 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour
3010 * 18 = change bold character color
3011 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented)
3013 * 50 = change font
3014 *
3015 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap
3018 * 39 = change default fg color
3019 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen
3021 */ 3312 */
3022void 3313void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3314rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3024{ 3315{
3025 int changed = 0; 3316 int color;
3026 int color;
3027 char *buf, *name; 3317 char *buf, *name;
3318 bool query = str[0] == '?' && !str[1];
3319 int saveop = op;
3320
3321 dLocal (Display *, dpy);
3028 3322
3029 assert (str != NULL); 3323 assert (str != NULL);
3324
3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3326 return;
3327
3030 switch (op) 3328 switch (op)
3031 { 3329 {
3032 case XTerm_name: 3330 case XTerm_name:
3033 set_title (str); 3331 set_title (str);
3034 /* FALLTHROUGH */ 3332 /* FALLTHROUGH */
3035 case XTerm_iconName: 3333 case XTerm_iconName:
3036 set_iconName (str); 3334 set_icon_name (str);
3037 break; 3335 break;
3038 case XTerm_title: 3336 case XTerm_title:
3039 set_title (str); 3337 set_title (str);
3040 break; 3338 break;
3339 case XTerm_property:
3340 if (str[0] == '?')
3341 {
3342 Atom prop = display->atom (str + 1);
3343 Atom actual_type;
3344 int actual_format;
3345 unsigned long nitems;
3346 unsigned long bytes_after;
3347 unsigned char *value = 0;
3348 const char *str = "";
3349
3350 if (prop
3351 && XGetWindowProperty (dpy, parent[0],
3352 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None
3356 && actual_format == 8)
3357 str = (const char *)(value);
3358
3359 tt_printf ("\033]%d;%s%c", op, str, resp);
3360
3361 XFree (value);
3362 }
3363 else
3364 {
3365 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3366
3367 if (eq)
3368 {
3369 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1);
3371 }
3372 else
3373 XDeleteProperty (dpy, parent[0],
3374 display->atom (str));
3375 }
3376 break;
3377
3041 case XTerm_Color: 3378 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3379 for (buf = (char *)str; buf && *buf;)
3043 { 3380 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3381 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3382 break;
3383
3046 *name++ = '\0'; 3384 *name++ = '\0';
3047 color = atoi (buf); 3385 color = atoi (buf) + minCOLOR;
3048 if (color < 0 || color >= TOTAL_COLORS) 3386
3387 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3049 break; 3388 break;
3389
3050 if ((buf = STRCHR (name, ';')) != NULL) 3390 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3391 *buf++ = '\0';
3052 set_window_color (color + minCOLOR, name); 3392
3393 process_color_seq (op, color, name, resp);
3053 } 3394 }
3395 break;
3396 case XTerm_Color00:
3397 process_color_seq (op, Color_fg, str, resp);
3398 break;
3399 case XTerm_Color01:
3400 process_color_seq (op, Color_bg, str, resp);
3054 break; 3401 break;
3055#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3404 process_color_seq (op, Color_cursor, str, resp);
3058 break; 3405 break;
3059#endif 3406#endif
3060 case XTerm_Color_pointer: 3407 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3409 break;
3410 case XTerm_Color_pointer_bg:
3411 process_color_seq (op, Color_pointer_bg, str, resp);
3062 break; 3412 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3413#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str);
3066 break;
3067 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str);
3069 break;
3070 case XTerm_Color_RV: 3414 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3415 process_color_seq (op, Color_RV, str, resp);
3072 break; 3416 break;
3417 case Rxvt_Color_BD:
3418 case URxvt_Color_BD:
3419 process_color_seq (op, Color_BD, str, resp);
3420 break;
3421 case Rxvt_Color_UL:
3422 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp);
3424 break;
3425 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp);
3427 break;
3073#endif 3428#endif
3074 3429#if ENABLE_TRANSPARENCY
3075 case XTerm_Menu: 3430 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp);
3076 /* 3432 {
3077 * rxvt_menubar_dispatch () violates the constness of the string, 3433 bool changed = false;
3078 * so DON'T do it here 3434 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3436 else
3437 changed = bgPixmap.unset_tint ();
3438 if (changed)
3439 bgPixmap.render ();
3079 */ 3440 }
3441
3080 break; 3442 break;
3443#endif
3444
3445#if XPM_BACKGROUND
3081 case XTerm_Pixmap: 3446 case Rxvt_Pixmap:
3082 if (*str != ';') 3447 if (!strcmp (str, "?"))
3083 { 3448 {
3084#if XPM_BACKGROUND 3449 char str[256];
3085 scale_pixmap (""); /* reset to default scaling */ 3450
3086 set_bgPixmap (str); /* change pixmap */ 3451 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3087#endif 3452 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3088 scr_touch (true); 3453 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3089 } 3455 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3456 else
3091 { 3457 {
3458 int changed = 0;
3459
3460 if (*str != ';')
3461 {
3462 /* reset to default scaling :*/
3463 bgPixmap.unset_geometry ();
3464 if (bgPixmap.set_file (str)) /* change pixmap */
3465 changed++;
3466 str = strchr (str, ';');
3467 if (str == NULL)
3468 bgPixmap.set_defaultGeometry ();
3469 }
3470 while (str)
3471 {
3092 str++; 3472 str++;
3093#if XPM_BACKGROUND 3473 if (bgPixmap.set_geometry (str))
3094 changed += scale_pixmap (str); 3474 changed++;
3095#endif 3475 str = strchr (str, ';');
3096 3476 }
3477 if (changed)
3478 {
3479 bgPixmap.render ();
3480 scr_touch (true);
3481 }
3097 } 3482 }
3098 if (changed)
3099 {
3100#ifdef XPM_BACKGROUND
3101 resize_pixmap ();
3102#endif
3103 scr_touch (true);
3104 }
3105 break; 3483 break;
3484#endif
3106 3485
3107 case XTerm_restoreFG: 3486 case Rxvt_restoreFG:
3108 set_window_color (Color_fg, str); 3487 set_window_color (Color_fg, str);
3109 break; 3488 break;
3110 case XTerm_restoreBG: 3489 case Rxvt_restoreBG:
3111 set_window_color (Color_bg, str); 3490 set_window_color (Color_bg, str);
3112 break; 3491 break;
3492
3113 case XTerm_logfile: 3493 case XTerm_logfile:
3494 // TODO, when secure mode?
3114 break; 3495 break;
3115 case XTerm_font: 3496
3116 change_font (0, str);
3117 break;
3118#if 0 3497#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3498 case Rxvt_dumpscreen: /* no error notices */
3120 { 3499 {
3121 int fd; 3500 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3501 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3502 {
3124 scr_dump (fd); 3503 scr_dump (fd);
3125 close (fd); 3504 close (fd);
3126 } 3505 }
3127 } 3506 }
3128 break; 3507 break;
3129#endif 3508#endif
3509 case XTerm_font:
3510 op = URxvt_font;
3511 case URxvt_font:
3512#if ENABLE_STYLES
3513 case URxvt_boldFont:
3514 case URxvt_italicFont:
3515 case URxvt_boldItalicFont:
3516#endif
3517 if (query)
3518 tt_printf ("\33]%d;%-.250s%c", saveop,
3519 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3520 ? fontset[op - URxvt_font]->fontdesc : "",
3521 resp);
3522 else
3523 {
3524 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3525
3526 res = strdup (str);
3527 allocated.push_back ((void *)res);
3528 set_fonts ();
3529 }
3530 break;
3531
3532 case URxvt_version:
3533 if (query)
3534 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3535 op,
3536 rs[Rs_name], VERSION[0], VERSION[2],
3537 resp);
3538 break;
3539
3540#if !ENABLE_MINIMAL
3541 case URxvt_locale:
3542 if (query)
3543 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3544 else
3545 {
3546 set_locale (str);
3547 pty->set_utf8_mode (enc_utf8);
3548 init_xlocale ();
3549 }
3550 break;
3551
3552 case URxvt_view_up:
3553 case URxvt_view_down:
3554 {
3555 int lines = atoi (str);
3556
3557 if (lines)
3558 scr_page (op == URxvt_view_up ? UP : DN, lines);
3559 else
3560 scr_erase_savelines ();
3561 }
3562
3563 break;
3564#endif
3565
3566#if ENABLE_PERL
3567 case URxvt_perl:
3568 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3569 ; // no responses yet
3570 break;
3571#endif
3131 } 3572 }
3132} 3573}
3133/*----------------------------------------------------------------------*/ 3574/*----------------------------------------------------------------------*/
3134 3575
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3576/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3584 * so no need for fancy checking
3144 */ 3585 */
3145int 3586int
3146rxvt_term::privcases (int mode, unsigned long bit) 3587rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3588{
3148 int state; 3589 int state;
3149 3590
3150 if (mode == 's') 3591 if (mode == 's')
3151 { 3592 {
3152 SavedModes |= (PrivateModes & bit); 3593 SavedModes |= (priv_modes & bit);
3153 return -1; 3594 return -1;
3154 } 3595 }
3155 else 3596 else
3156 { 3597 {
3157 if (mode == 'r') 3598 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3599 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3600 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3601 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3602 PrivMode (state, bit);
3162 } 3603 }
3604
3163 return state; 3605 return state;
3164} 3606}
3165 3607
3166/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3167void 3609void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3169{ 3611{
3170 unsigned int i, j; 3612 unsigned int i, j;
3171 int state; 3613 int state;
3614
3172 static const struct 3615 static const struct
3173 { 3616 {
3174 const int argval; 3617 const int argval;
3175 const unsigned long bit; 3618 const unsigned long bit;
3176 }
3177 argtopriv[] = { 3619 } argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 3625 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 3626 { 7, PrivMode_Autowrap },
3627 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 3629 // 18, 19 printing-related
3187 { menuBar_esc, PrivMode_menuBar }, 3630 { 25, PrivMode_VisibleCursor },
3188#endif
3189#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3633#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3635 { 40, PrivMode_132OK },
3636 // 41 xterm more fixes NYI
3637 // 45 margin bell NYI
3638 // 46 start logging
3195 { 47, PrivMode_Screen }, 3639 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3640 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3641#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3642 { 67, PrivMode_BackSpace },
3199#endif 3643#endif
3200 { 1000, PrivMode_MouseX11 }, 3644 { 1000, PrivMode_MouseX11 },
3645 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3646 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3647 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3648 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3649 { 1011, PrivMode_Keypress }, // rxvt extension
3650 // 1035 enable modifiers for alt, numlock NYI
3651 // 1036 send ESC for meta keys NYI
3652 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3654 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 3657 };
3206 3658
3207 if (nargs == 0) 3659 if (nargs == 0)
3208 return; 3660 return;
3209 3661
… …
3224 state = privcases (mode, argtopriv[j].bit); 3676 state = privcases (mode, argtopriv[j].bit);
3225 break; 3677 break;
3226 } 3678 }
3227 3679
3228 /* extra handling for values with state unkept */ 3680 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3681 switch (arg[i])
3231 { 3682 {
3683#if ENABLE_STYLES
3684 case 1021:
3685 set_option (Opt_intensityStyles, mode);
3686
3687 scr_touch (true);
3688 break;
3689#endif
3232 case 1048: /* alternative cursor save */ 3690 case 1048: /* alternative cursor save */
3691 case 1049:
3692 if (option (Opt_secondaryScreen))
3233 if (mode == 0) 3693 if (mode == 0)
3234 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3235 else if (mode == 1) 3695 else if (mode == 1)
3236 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 3697 break;
3698 }
3699
3700 if (state >= 0)
3701 /* extra handling for values with valid 0 or 1 state */
3702 switch (arg[i])
3703 {
3704 /* case 1: - application cursor keys */
3705 case 2: /* VT52 mode */
3706 /* oddball mode. should be set regardless of set/reset
3707 * parameter. Return from VT52 mode with an ESC < from
3708 * within VT52 mode
3709 */
3710 PrivMode (1, PrivMode_vt52);
3711 break;
3253 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3714 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 3715 break;
3258 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3259 if (state)
3260 Options &= ~Opt_jumpScroll;
3261 else
3262 Options |= Opt_jumpScroll; 3717 set_option (Opt_jumpScroll, !state);
3263 break; 3718 break;
3264 case 5: /* reverse video */ 3719 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 3720 scr_rvideo_mode (state);
3266 break; 3721 break;
3267 case 6: /* relative/absolute origins */ 3722 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 3723 scr_relative_origin (state);
3269 break; 3724 break;
3270 case 7: /* autowrap */ 3725 case 7: /* autowrap */
3271 scr_autowrap (state); 3726 scr_autowrap (state);
3272 break; 3727 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 3728 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 3729 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 3731 priv_modes &= ~PrivMode_MouseX11;
3277 break; 3732 break;
3278#ifdef menuBar_esc
3279 case menuBar_esc:
3280#ifdef MENUBAR
3281 map_menuBar (state);
3282#endif
3283 break;
3284#endif
3285#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3286 case scrollBar_esc: 3734 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 3735 if (scrollbar_mapping (state))
3288 { 3736 {
3289 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 3738 scr_touch (true);
3291 } 3739 }
3292 break; 3740 break;
3293#endif 3741#endif
3294 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3296 break; 3744 break;
3297 /* case 35: - shift keys */ 3745 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 3746 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 3747 case 47: /* secondary screen */
3300 scr_change_screen (state); 3748 scr_change_screen (state);
3301 break; 3749 break;
3302 /* case 66: - application key pad */ 3750 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 3751 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 3752 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 3753 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 3754 priv_modes &= ~PrivMode_MouseX10;
3307 break; 3755 break;
3308#if 0 3756#if 0
3309 case 1001: 3757 case 1001:
3310 break; /* X11 mouse highlighting */ 3758 break; /* X11 mouse highlighting */
3311#endif 3759#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 3760 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state)
3314 Options &= ~Opt_scrollTtyOutput;
3315 else
3316 Options |= Opt_scrollTtyOutput; 3761 set_option (Opt_scrollTtyOutput, !state);
3317 break; 3762 break;
3318 case 1011: /* scroll to bottom on key press */ 3763 case 1011: /* scroll to bottom on key press */
3319 if (state)
3320 Options |= Opt_scrollTtyKeypress; 3764 set_option (Opt_scrollTtyKeypress, state);
3321 else
3322 Options &= ~Opt_scrollTtyKeypress;
3323 break; 3765 break;
3324 case 1047: /* secondary screen w/ clearing */ 3766 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3767 if (option (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 3769 scr_erase_screen (2);
3328 scr_change_screen (state); 3770 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 3771 break;
3772 case 1049: /* secondary screen w/ clearing first */
3773 scr_change_screen (state);
3774 if (option (Opt_secondaryScreen))
3775 if (current_screen != PRIMARY)
3776 scr_erase_screen (2);
3777 break;
3778 default:
3779 break;
3332 } 3780 }
3333 } 3781 }
3334} 3782}
3335/*}}} */ 3783/*}}} */
3336 3784
3337/*{{{ process sgr sequences */ 3785/*{{{ process sgr sequences */
3338void 3786void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3787rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 3788{
3341 unsigned int i; 3789 unsigned int i;
3342 short rendset; 3790 short rendset;
3343 int rendstyle; 3791 int rendstyle;
3344 3792
3345 if (nargs == 0) 3793 if (nargs == 0)
3346 { 3794 {
3347 scr_rendition (0, ~RS_None); 3795 scr_rendition (0, ~RS_None);
3348 return; 3796 return;
3349 } 3797 }
3798
3350 for (i = 0; i < nargs; i++) 3799 for (i = 0; i < nargs; i++)
3351 { 3800 {
3352 rendset = -1; 3801 rendset = -1;
3353 switch (arg[i]) 3802 switch (arg[i])
3354 { 3803 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 3805 rendset = 0, rendstyle = ~RS_None;
3357 break; 3806 break;
3358 case 1: 3807 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 3808 rendset = 1, rendstyle = RS_Bold;
3360 break; 3809 break;
3810 //case 2: // low intensity
3811 case 3:
3812 rendset = 1, rendstyle = RS_Italic;
3813 break;
3361 case 4: 3814 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 3815 rendset = 1, rendstyle = RS_Uline;
3363 break; 3816 break;
3364 case 5: 3817 case 5: // slowly blinking
3818 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 3819 rendset = 1, rendstyle = RS_Blink;
3366 break; 3820 break;
3821 //case 6: // scoansi light background
3367 case 7: 3822 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 3823 rendset = 1, rendstyle = RS_RVid;
3369 break; 3824 break;
3370 case 22: 3825 case 8:
3826 // invisible. NYI
3827 break;
3828 //case 9: // crossed out
3829 //case 10: // scoansi acs off, primary font
3830 //case 11: // scoansi acs on, first alt font
3831 //case 12: // scoansi acs on, |0x80, second alt font
3832 //...
3833 //case 19: // ninth alt font
3834 //case 20: // gothic
3835 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 3836 rendset = 0, rendstyle = RS_Bold;
3837 break;
3838 case 22: // normal intensity
3839 rendset = 0, rendstyle = RS_Bold;
3840 break;
3841 case 23: // disable italic
3842 rendset = 0, rendstyle = RS_Italic;
3372 break; 3843 break;
3373 case 24: 3844 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 3845 rendset = 0, rendstyle = RS_Uline;
3375 break; 3846 break;
3376 case 25: 3847 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 3848 rendset = 0, rendstyle = RS_Blink;
3378 break; 3849 break;
3850 case 26: // variable spacing (iso 8613)
3851 rendset = 0, rendstyle = RS_Blink;
3852 break;
3379 case 27: 3853 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 3854 rendset = 0, rendstyle = RS_RVid;
3381 break; 3855 break;
3856 //case 28: // visible. NYI
3857 //case 29: // not crossed-out
3382 } 3858 }
3859
3383 if (rendset != -1) 3860 if (rendset != -1)
3384 { 3861 {
3385 scr_rendition (rendset, rendstyle); 3862 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 3863 continue; /* for (;i;) */
3387 } 3864 }
… …
3394 case 33: 3871 case 33:
3395 case 34: 3872 case 34:
3396 case 35: 3873 case 35:
3397 case 36: 3874 case 36:
3398 case 37: 3875 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3876 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 3877 break;
3402#ifdef TTY_256COLOR 3878 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 3879 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 3880 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3881 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 3882 i += 2;
3409 } 3883 }
3410 break; 3884 break;
3411#endif
3412 case 39: /* default fg */ 3885 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 3886 scr_color (Color_fg, Color_fg);
3414 break; 3887 break;
3415 3888
3416 case 40: 3889 case 40:
… …
3419 case 43: 3892 case 43:
3420 case 44: 3893 case 44:
3421 case 45: 3894 case 45:
3422 case 46: 3895 case 46:
3423 case 47: 3896 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3897 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 3898 break;
3427#ifdef TTY_256COLOR 3899 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 3900 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 3901 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3902 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 3903 i += 2;
3434 } 3904 }
3435 break; 3905 break;
3436#endif
3437 case 49: /* default bg */ 3906 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 3907 scr_color (Color_bg, Color_bg);
3439 break; 3908 break;
3440 3909
3441#ifndef NO_BRIGHTCOLOR 3910 //case 50: // not variable spacing
3911
3912#if !ENABLE_MINIMAL
3442 case 90: 3913 case 90:
3443 case 91: /* set bright fg color */ 3914 case 91: /* set bright fg color */
3444 case 92: 3915 case 92:
3445 case 93: 3916 case 93:
3446 case 94: 3917 case 94:
3447 case 95: 3918 case 95:
3448 case 96: 3919 case 96:
3449 case 97: 3920 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3921 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 3922 break;
3453 case 100: 3923 case 100:
3454 case 101: /* set bright bg color */ 3924 case 101: /* set bright bg color */
3455 case 102: 3925 case 102:
3456 case 103: 3926 case 103:
3457 case 104: 3927 case 104:
3458 case 105: 3928 case 105:
3459 case 106: 3929 case 106:
3460 case 107: 3930 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3931 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 3932 break;
3464#endif 3933#endif
3465
3466 } 3934 }
3467 } 3935 }
3468} 3936}
3469/*}}} */ 3937/*}}} */
3470 3938
3471/*{{{ process Rob Nation's own graphics mode sequences */ 3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 3940void
3473rxvt_term::process_graphics () 3941rxvt_term::process_graphics ()
3474{ 3942{
3475 unsigned char ch, cmd = cmd_getc (); 3943 unicode_t ch, cmd = cmd_getc ();
3476 3944
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 3945 if (cmd == 'Q')
3479 { /* query graphics */ 3946 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 3947 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 3948 return;
3482 } 3949 }
3483 /* swallow other graphics sequences until terminating ':' */ 3950 /* swallow other graphics sequences until terminating ':' */
3484 do 3951 do
3485 ch = cmd_getc (); 3952 ch = cmd_getc ();
3486 while (ch != ':'); 3953 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 3954}
3533/*}}} */ 3955/*}}} */
3534 3956
3535/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3536 3958
… …
3540 */ 3962 */
3541void 3963void
3542rxvt_term::tt_printf (const char *fmt,...) 3964rxvt_term::tt_printf (const char *fmt,...)
3543{ 3965{
3544 va_list arg_ptr; 3966 va_list arg_ptr;
3545 unsigned char buf[256]; 3967 char buf[256];
3546 3968
3547 va_start (arg_ptr, fmt); 3969 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3970 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 3971 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 3972 tt_write (buf, strlen (buf));
3551} 3973}
3552 3974
3553/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* Write data to the pty as typed by the user, pasted with the mouse,
3555 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
3556 */ 3978 */
3979const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3980
3557void 3981void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3559{ 3983{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3985 return;
3561 3986
3562 if (len) 3987 if (pty->pty < 0)
3988 return;
3989
3990 if (v_buflen == 0)
3991 {
3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3993
3994 if ((unsigned int)written == len)
3995 return;
3996
3997 data += written;
3998 len -= written;
3563 { 3999 }
4000
4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4002
4003 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len;
4005
4006 pty_ev.set (EVENT_READ | EVENT_WRITE);
4007}
4008
4009void rxvt_term::pty_write ()
4010{
4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4012
4013 if (written > 0)
4014 {
4015 v_buflen -= written;
4016
3564 if (v_buflen == 0) 4017 if (v_buflen == 0)
3565 { 4018 {
3566 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3567
3568 if ((unsigned int)written == len)
3569 return;
3570
3571 data += written;
3572 len -= written;
3573 }
3574
3575
3576 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3577
3578 memcpy (v_buffer + v_buflen, data, len);
3579 v_buflen += len;
3580 }
3581
3582 for (;;)
3583 {
3584 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3585
3586 if (written > 0)
3587 {
3588 v_buflen -= written;
3589
3590 if (v_buflen == 0)
3591 {
3592 free (v_buffer); 4019 free (v_buffer);
3593 v_buffer = 0; 4020 v_buffer = 0;
3594 v_buflen = 0; 4021 v_buflen = 0;
3595 4022
3596 pty_ev.set (EVENT_READ); 4023 pty_ev.set (EVENT_READ);
3597 return;
3598 }
3599
3600 memmove (v_buffer, v_buffer + written, v_buflen);
3601 }
3602 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3603 // original code just ignores this...
3604 destroy ();
3605 else
3606 {
3607 pty_ev.set (EVENT_READ | EVENT_WRITE);
3608 return; 4024 return;
3609 } 4025 }
4026
4027 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4028 }
4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4030 pty_ev.set (EVENT_READ);
3611} 4031}
3612 4032
3613/*----------------------- end-of-file (C source) -----------------------*/ 4033/*----------------------- end-of-file (C source) -----------------------*/
3614 4034

Diff Legend

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