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

Diff Legend

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