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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.426 by root, Wed Nov 5 13:49:36 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>
… …
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 } 1024 }
678 1025
679 display->flush (); 1026 display->flush ();
680} 1027}
681 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
682void 1030void
683rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
684{ 1032{
685 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
686 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
687 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;
688 flush (); 1045 flush ();
689} 1046}
690 1047
691#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
692void 1049void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1051{
695 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1053 want_refresh = 1;
697 1054 refresh_check ();
698 w.start (w.at + BLINK_INTERVAL);
699} 1055}
700#endif 1056#endif
701 1057
702#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
703void 1059void
704rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1061{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1063 {
708 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
709 want_refresh = 1; 1065 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
711 } 1067 }
1068 else
1069 w.stop ();
712} 1070}
713#endif 1071#endif
714 1072
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void 1074void
717rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
718{ 1076{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
721 { 1079 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1080 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
725 } 1082 }
1083 else
1084 w.stop ();
726} 1085}
727#endif 1086#endif
728 1087
729#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
730void 1089void
731rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
732{ 1091{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1093 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1095 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
739 } 1097 }
1098 else
1099 w.stop ();
740} 1100}
741#endif 1101#endif
742 1102
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void 1104void
745rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
746{ 1106{
747 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1108 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1109 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
754 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
755} 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 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1139 w.stop ();
1140 }
1141
1142 event_handler ()
1143 : yield_ev (this, &event_handler::yield_cb)
1144 {
1145 }
1146} event_handler;
756#endif 1147#endif
757 1148
758bool 1149bool
759rxvt_term::pty_fill () 1150rxvt_term::pty_fill ()
760{ 1151{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1153
763 if (CBUFSIZ == n) 1154 if (CBUFSIZ == n)
764 { 1155 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
766 n = 0; 1157 n = 0;
767 } 1158 }
768 1159
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1161 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1162 cmdbuf_endp = cmdbuf_ptr + n;
772 1163
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
774 1165
775 if (n > 0) 1166 if (r > 0)
776 { 1167 {
777 cmdbuf_endp += n; 1168 cmdbuf_endp += r;
778 return true; 1169 return true;
779 } 1170 }
780 else if (n < 0 && errno != EAGAIN) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1172 {
1173#if LINUX_YIELD_HACK
1174 if (display->is_local)
1175 event_handler.yield_ev.start ();
1176#endif
1177 }
1178 else
1179 {
1180 pty_ev.stop ();
1181
1182 if (!option (Opt_hold))
781 destroy (); 1183 destroy ();
782 1184 }
1185
783 return false; 1186 return false;
784} 1187}
785 1188
786void 1189void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
788{ 1191{
789 SET_R (this); 1192 make_current ();
790 SET_LOCALE (locale);
791 1193
792 if (revents & EVENT_WRITE) 1194 if (revents & ev::READ)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
797 if (cmd_parse ()) 1197 cmd_parse ();
798 break; 1198
1199 if (revents & ev::WRITE)
1200 pty_write ();
1201
1202 refresh_check ();
799} 1203}
1204
1205void
1206rxvt_term::pointer_unblank ()
1207{
1208 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor ();
800 1210
801#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
802void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0; 1212 hidden_pointer = 0;
809 1213
810 if (Options & Opt_pointerBlank) 1214 if (option (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1216#endif
812} 1217}
813 1218
1219#ifdef POINTER_BLANK
814void 1220void
815rxvt_term::pointer_blank () 1221rxvt_term::pointer_blank ()
816{ 1222{
817 if (! (Options & Opt_pointerBlank)) 1223 if (!option (Opt_pointerBlank))
818 return; 1224 return;
819 1225
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1226 XDefineCursor (dpy, vt, display->blank_cursor);
821 XFlush (display->display); 1227 XFlush (dpy);
822 1228
823 hidden_pointer = 1; 1229 hidden_pointer = 1;
824} 1230}
825 1231
826void 1232void
827rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
828{ 1234{
829 SET_R (this); 1235 make_current ();
830 SET_LOCALE (locale);
831 1236
832 pointer_blank (); 1237 pointer_blank ();
833} 1238}
834#endif 1239#endif
835 1240
836void 1241void
837rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
838{ 1243{
839 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
840 int x, y; 1245 int x, y;
1246 int code = 32;
841 1247
842 x = ev.x; 1248 x = Pixel2Col (ev.x);
843 y = ev.y; 1249 y = Pixel2Row (ev.y);
844 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
845 1258
846 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1260 button_number = 3;
849 }
850 else 1261 else
851 { 1262 {
852 button_number = MEvent.button - Button1; 1263 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1264 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1265 if (button_number >= 3)
855 button_number += (64 - 3); 1266 button_number += (64 - 3);
856 } 1267 }
857 1268
858 if (PrivateModes & PrivMode_MouseX10) 1269 if (priv_modes & PrivMode_MouseX10)
859 { 1270 {
860 /* 1271 /*
861 * do not report ButtonRelease 1272 * do not report ButtonRelease
862 * no state info allowed 1273 * no state info allowed
863 */ 1274 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1289 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1290 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1291#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1292 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1293#endif
883
884 } 1294 }
885 1295
886#ifdef DEBUG_MOUSEREPORT 1296#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1297 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1298 if (key_state & 16)
889 fputc ('C', stderr); 1299 fputc ('C', stderr);
890 if (key_state & 4) 1300 if (key_state & 4)
891 fputc ('S', stderr); 1301 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1305 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1306 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1307 button_number,
898 x + 1, 1308 x + 1,
899 y + 1); 1309 y + 1);
900#else 1310#endif
1311
901 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1313 (code + button_number + key_state),
903 (32 + x + 1), 1314 (32 + x + 1),
904 (32 + y + 1)); 1315 (32 + y + 1));
905#endif
906} 1316}
907
908#ifdef USING_W11LIB
909void
910rxvt_W11_process_x_event (XEvent *ev)
911{
912 rxvt_t *r = rxvt_get_r ();
913
914 x_cb (*ev);
915}
916#endif
917 1317
918/*{{{ process an X event */ 1318/*{{{ process an X event */
919void 1319void
920rxvt_term::x_cb (XEvent &ev) 1320rxvt_term::x_cb (XEvent &ev)
921{ 1321{
922 SET_R (this); 1322 make_current ();
923 SET_LOCALE (locale);
924 1323
925#if defined(CURSOR_BLINK) 1324 dLocal (Display *, dpy);
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
927 {
928 if (hidden_cursor)
929 {
930 hidden_cursor = 0;
931 want_refresh = 1;
932 }
933 1325
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 if (ev.xany.window == vt
935 } 1327 && SHOULD_INVOKE (HOOK_X_EVENT)
936#endif 1328 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
937
938#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 {
941 if (ev.type == MotionNotify
942 || ev.type == ButtonPress
943 || ev.type == ButtonRelease)
944 if (hidden_pointer)
945 pointer_unblank ();
946
947 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank ();
949 }
950#endif
951
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return; 1329 return;
955#endif
956 1330
1331 // for XQueryPointer
957 Window unused_root, unused_child; 1332 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1333 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1334 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1335
1010 switch (ev.type) 1336 switch (ev.type)
1011 { 1337 {
1012 case KeyPress: 1338 case KeyPress:
1013 lookup_key (ev.xkey); 1339 key_press (ev.xkey);
1014 break; 1340 break;
1015 1341
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease: 1342 case KeyRelease:
1018 { 1343 key_release (ev.xkey);
1019 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0;
1028 }
1029 break; 1344 break;
1030 }
1031#endif
1032 1345
1033 case ButtonPress: 1346 case ButtonPress:
1034 button_press (ev.xbutton); 1347 button_press (ev.xbutton);
1035 break; 1348 break;
1036 1349
… …
1038 button_release (ev.xbutton); 1351 button_release (ev.xbutton);
1039 break; 1352 break;
1040 1353
1041 case ClientMessage: 1354 case ClientMessage:
1042 if (ev.xclient.format == 32 1355 if (ev.xclient.format == 32
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1356 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1044 destroy ();
1045#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink))
1051 { 1357 {
1052 /* Get Dnd data */ 1358 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1053 Atom ActualType; 1359 {
1054 int ActualFormat; 1360 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1055 unsigned char *data; 1361 {
1056 unsigned long Size, RemainingBytes; 1362 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1057 1363 {
1058 XGetWindowProperty (display->display, display->root, 1364 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1059 xa[XA_DNDSELECTION], 1365 destroy ();
1060 0L, 1000000L, 1366 }
1061 False, AnyPropertyType, 1367#if ENABLE_EWMH
1062 &ActualType, &ActualFormat, 1368 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1063 &Size, &RemainingBytes, 1369 XSendEvent (dpy, ev.xclient.window = display->root,
1370 False, SubstructureRedirectMask | SubstructureNotifyMask,
1064 &data); 1371 &ev);
1065 XChangeProperty (display->display, display->root, 1372#endif
1066 XA_CUT_BUFFER0, XA_STRING, 1373 }
1067 8, PropModeReplace, 1374 }
1068 data, STRLEN (data)); 1375#if ENABLE_XEMBED
1069 XFree (data); 1376 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1377 {
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1378 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1379 focus_in ();
1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1381 focus_out ();
1382 }
1383#endif
1072 } 1384 }
1073#endif /* OFFIX_DND */
1074 break;
1075
1076 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping));
1078 break; 1385 break;
1079 1386
1080 /* 1387 /*
1081 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1101 break; 1408 break;
1102 } 1409 }
1103 break; 1410 break;
1104 1411
1105 case FocusIn: 1412 case FocusIn:
1106 if (!TermWin.focus) 1413 if (ev.xfocus.detail != NotifyInferior
1414 && ev.xfocus.detail != NotifyPointer
1415 && ev.xfocus.mode != NotifyGrab)
1416 focus_in ();
1417 break;
1418
1419 case FocusOut:
1420 if (ev.xfocus.detail != NotifyInferior
1421 && ev.xfocus.detail != NotifyPointer
1422 && ev.xfocus.mode != NotifyGrab)
1423 focus_out ();
1424 break;
1425
1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0])
1107 { 1431 {
1108 TermWin.focus = 1; 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1109 want_refresh = 1;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118
1119 } 1433 ;
1120 break;
1121 1434
1122 case FocusOut: 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1123 if (TermWin.focus)
1124 { 1436 {
1125 TermWin.focus = 0; 1437 seen_resize = 1;
1126 want_refresh = 1; 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break;
1139
1140 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0])
1142 {
1143 int height, width;
1144
1145 do
1146 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1439 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152
1153 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1);
1157 }
1158#ifdef DEBUG_SIZE
1159 else 1440 else
1160 { 1441 {
1161 D_SIZE ((stderr, "Size: Not resizing")); 1442#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif
1162 } 1451 }
1163#endif 1452
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1165 if (Options & Opt_transparent)
1166 {
1167 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif
1172 } 1454 }
1455 break;
1456
1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1173 break; 1463 break;
1174 1464
1175 case SelectionClear: 1465 case SelectionClear:
1176 selection_clear (); 1466 selection_clear ();
1177 break; 1467 break;
1178 1468
1179 case SelectionNotify: 1469 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1472 break;
1184 1473
1185 case SelectionRequest: 1474 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1187 break; 1476 break;
1188 1477
1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start ();
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break;
1501
1189 case UnmapNotify: 1502 case UnmapNotify:
1190 TermWin.mapped = 0; 1503 mapped = 0;
1191#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1193#endif 1506#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1194 break; 1508 break;
1195
1196 case MapNotify:
1197 TermWin.mapped = 1;
1198#ifdef TEXT_BLINK
1199 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1200#endif
1201 break;
1202
1203#ifdef TRANSPARENT
1204 case ReparentNotify:
1205 rootwin_cb (ev);
1206 break;
1207#endif /* TRANSPARENT */
1208 1509
1209 case GraphicsExpose: 1510 case GraphicsExpose:
1210 case Expose: 1511 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1512 if (ev.xany.window == vt)
1212 { 1513 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1514 do
1515 {
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1518 }
1217 // I don't understand this, so I changed it :) 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1527 }
1221 // ev.xexpose.width, TermWin.height, False); 1528
1222#endif
1223 want_refresh = 1; 1529 want_refresh = 1;
1224 } 1530 }
1225 else 1531 else
1226 { 1532 {
1227 XEvent unused_event; 1533 XEvent unused_event;
1228 1534
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1230 ; 1536 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1538 ;
1233 1539
1234 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1235 { 1541 {
1236 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1237 scrollbar_show (0); 1543 scrollBar.show (0);
1238 } 1544 }
1239#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose ();
1242#endif
1243 } 1545 }
1244 break; 1546 break;
1245 1547
1246 case MotionNotify: 1548 case MotionNotify:
1247#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1248 if (hidden_pointer) 1550 if (hidden_pointer)
1249 pointer_unblank (); 1551 pointer_unblank ();
1250#endif 1552#endif
1251#if MENUBAR 1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1252 if (isMenuBarWindow (ev.xany.window)) 1554 || priv_modes & PrivMode_MouseAnyEvent)
1555 mouse_report (ev.xbutton);
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break;
1558
1559 if (ev.xany.window == vt)
1253 { 1560 {
1254 menubar_control (ev.xbutton); 1561 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1255 break; 1562 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1256 } 1563 ; // nop
1257#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1259 break;
1260
1261 if (ev.xany.window == TermWin.vt)
1262 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1564 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1565 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1266 ; 1567 ;
1267 1568
1268 XQueryPointer (display->display, TermWin.vt, 1569 XQueryPointer (dpy, vt,
1269 &unused_root, &unused_child, 1570 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1571 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1572 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1573 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1574#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1575 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1576 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1577 {
1277#endif 1578#endif
1579#if ISO_14755
1580 // 5.4
1581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1582 {
1583 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1584 break;
1585 }
1586#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1587 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1588 ev.xbutton.state & Button3Mask ? 2 : 0);
1589
1280#ifdef SELECTION_SCROLLING 1590#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1591 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1592 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1593 {
1284 int dist; 1594 int dist;
1285 1595
1286 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1288 */ 1598 */
1289 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1291 1601
1292 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1294 */ 1604 */
1295 selection_save_x=ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1606 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1607 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1608
1300 /* calc number of lines to scroll */ 1609 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1610 if (ev.xbutton.y < int_bwidth)
1302 { 1611 {
1303 scroll_selection_dir = UP; 1612 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1613 dist = int_bwidth - ev.xbutton.y;
1305 } 1614 }
1306 else 1615 else
1307 { 1616 {
1308 scroll_selection_dir = DN; 1617 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1618 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1619 }
1620
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1621 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1622 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1;
1314 MIN_IT (scroll_selection_lines, 1624 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1625 SELECTION_SCROLL_MAX_LINES);
1316 } 1626 }
1317 else 1627 else
1318 { 1628 {
1319 /* we are within the text window, so we 1629 /* we are within the text window, so we
1320 * shouldn't be scrolling 1630 * shouldn't be scrolling
1321 */ 1631 */
1322 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1324 } 1633 }
1325#endif 1634#endif
1326#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1327
1328 } 1636 }
1329#endif 1637#endif
1330
1331 } 1638 }
1332 } 1639 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1334 { 1641 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1336 MotionNotify, &ev)) ; 1643 MotionNotify, &ev))
1644 ;
1645
1337 XQueryPointer (display->display, scrollBar.win, 1646 XQueryPointer (dpy, scrollBar.win,
1338 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1649 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1650 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1652 scrollBar.size ());
1344 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1653 want_refresh = 1;
1346 scrollbar_show (1); 1654 scrollBar.show (1);
1347 } 1655 }
1348 break; 1656 break;
1349 } 1657 }
1350}
1351 1658
1659#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again ();
1669 }
1670#endif
1671
1672#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 {
1675 if (ev.type == MotionNotify
1676 || ev.type == ButtonPress
1677 || ev.type == ButtonRelease)
1678 if (hidden_pointer)
1679 pointer_unblank ();
1680
1681 if (ev.type == KeyPress && hidden_pointer == 0)
1682 pointer_blank ();
1683 }
1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1701}
1702
1703void
1704rxvt_term::focus_in ()
1705{
1706 if (!focus)
1707 {
1708 focus = 1;
1709 want_refresh = 1;
1710
1711#if USE_XIM
1712 if (Input_Context != NULL)
1713 {
1714 IMSetPosition ();
1715 XSetICFocus (Input_Context);
1716 }
1717#endif
1718#if CURSOR_BLINK
1719 if (option (Opt_cursorBlink))
1720 cursor_blink_ev.again ();
1721#endif
1722#if OFF_FOCUS_FADING
1723 if (rs[Rs_fade])
1724 {
1725 pix_colors = pix_colors_focused;
1726 scr_recolour ();
1727 }
1728#endif
1729#if ENABLE_FRILLS
1730 if (option (Opt_urgentOnBell))
1731 set_urgency (0);
1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 }
1736}
1737
1738void
1739rxvt_term::focus_out ()
1740{
1741 if (focus)
1742 {
1743 focus = 0;
1744 want_refresh = 1;
1745
1746#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1750#if ENABLE_FRILLS || ISO_14755
1751 if (iso14755buf)
1752 {
1753 iso14755buf = 0;
1754# if ISO_14755
1755 scr_overlay_off ();
1756# endif
1757 }
1758#endif
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 XUnsetICFocus (Input_Context);
1762#endif
1763#if CURSOR_BLINK
1764 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.stop ();
1766
1767 hidden_cursor = 0;
1768#endif
1769#if OFF_FOCUS_FADING
1770 if (rs[Rs_fade])
1771 {
1772 pix_colors = pix_colors_unfocused;
1773 scr_recolour ();
1774 }
1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 }
1779}
1780
1781void
1782rxvt_term::update_fade_color (unsigned int idx)
1783{
1784#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade])
1786 {
1787 rgba c;
1788 pix_colors [Color_fade].get (c);
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 }
1791#endif
1792}
1793
1794#if ENABLE_TRANSPARENCY || ENABLE_PERL
1352void 1795void
1353rxvt_term::rootwin_cb (XEvent &ev) 1796rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1797{
1355 SET_R (this); 1798 make_current ();
1356 SET_LOCALE (locale);
1357 1799
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return;
1803
1804# if ENABLE_TRANSPARENCY
1358 switch (ev.type) 1805 switch (ev.type)
1359 { 1806 {
1360 case PropertyNotify: 1807 case PropertyNotify:
1808 /*
1809 * if user used some Esetroot compatible prog to set the root bg,
1810 * use the property to determine the pixmap. We use it later on.
1811 */
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1362 { 1814 {
1363 if (ev.xproperty.state == PropertyNewValue) 1815 bgPixmap.set_root_pixmap ();
1364 selection_property (ev.xproperty.window, ev.xproperty.atom); 1816 update_background ();
1365 break;
1366 } 1817 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /*
1371 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on.
1373 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376 1818
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1378 return;
1379 }
1380
1381 /* FALLTHROUGH */
1382 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1;
1385 break; 1819 break;
1820 }
1386#endif 1821# endif
1387 } 1822
1823 refresh_check ();
1388} 1824}
1825#endif
1389 1826
1390void 1827void
1391rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1392{ 1829{
1393 int reportmode = 0, clickintime; 1830 int reportmode = 0, clickintime;
1394 1831
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1832 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1833
1396 if (!bypass_keystate) 1834 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836
1398 /* 1837 /*
1399 * VT window processing of button press 1838 * VT window processing of button press
1400 */ 1839 */
1401 if (ev.window == TermWin.vt) 1840 if (ev.window == vt)
1402 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1404 if (reportmode) 1856 if (reportmode)
1405 { 1857 {
1406 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1409#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1410 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1411 { 1863 {
1412 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1413 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1414 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1415 { 1868 {
1416 /* only report double clicks */ 1869 /* only report double clicks */
1417 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1418 mouse_report (ev); 1871 mouse_report (ev);
… …
1430 mouse_report (ev); 1883 mouse_report (ev);
1431 } 1884 }
1432#else 1885#else
1433 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1434 mouse_report (ev); 1887 mouse_report (ev);
1435#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1436 1889
1437 } 1890 }
1438 else 1891 else
1439 { 1892 {
1440 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1442 switch (ev.button) 1896 switch (ev.button)
1443 { 1897 {
1444 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1445 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1447 { 1909 {
1448 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1450 else 1912 else
1451 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1928 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1469 else 1931 else
1470 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1471 MEvent.button = Button3; 1934 MEvent.button = Button3;
1472 break; 1935 break;
1473 } 1936 }
1474 } 1937 }
1938
1475 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1476 return; 1940 return;
1477 } 1941 }
1478 1942
1479 /* 1943 /*
1480 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1481 */ 1945 */
1482 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1483 { 1947 {
1484 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1485 /* 1956 /*
1486 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1487 * move up if mouse is above slider 1958 * move up if mouse is above slider
1488 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1489 * 1960 *
… …
1498 /* 1969 /*
1499 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1500 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1501 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1502 */ 1973 */
1503 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1504 && scrollbarnext_upButton (ev.y))
1505 || (scrollBar.style == R_SB_RXVT
1506 && scrollbarrxvt_upButton (ev.y)))
1507 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1508 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1509 && scrollbarnext_dnButton (ev.y))
1510 || (scrollBar.style == R_SB_RXVT
1511 && scrollbarrxvt_dnButton (ev.y)))
1512 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1513 else 1978 else
1514 switch (ev.button) 1979 switch (ev.button)
1515 { 1980 {
1516 case Button2: 1981 case Button2:
… …
1523 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
1524 break; 1989 break;
1525 } 1990 }
1526 } 1991 }
1527 else 1992 else
1528#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
1529
1530 {
1531 char upordown = 0;
1532
1533 if (scrollBar.style == R_SB_NEXT)
1534 { 1994 {
1535 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
1536 upordown = -1; /* up */
1537 else if (scrollbarnext_dnButton (ev.y))
1538 upordown = 1; /* down */
1539 }
1540 else if (scrollBar.style == R_SB_RXVT)
1541 {
1542 if (scrollbarrxvt_upButton (ev.y))
1543 upordown = -1; /* up */
1544 else if (scrollbarrxvt_dnButton (ev.y))
1545 upordown = 1; /* down */
1546 }
1547 if (upordown)
1548 { 1996 {
1549#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
1550 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1551#endif 2000#endif
1552 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
1553 { 2002 {
1554 if (upordown < 0) 2003 if (direction == UP)
1555 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
1556 else 2005 else
1557 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
1558 } 2007 }
1559 } 2008 }
1560 else 2009 else
1561 switch (ev.button) 2010 switch (ev.button)
1562 { 2011 {
1563 case Button2: 2012 case Button2:
1564 switch (scrollbar_align) 2013 switch (scrollBar.align)
1565 { 2014 {
1566 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1567 csrO = 0; 2016 csrO = 0;
1568 break; 2017 break;
1569 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
1571 break; 2020 break;
1572 case R_SB_ALIGN_BOTTOM: 2021 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 2022 csrO = scrollBar.bot - scrollBar.top;
1574 break; 2023 break;
1575 } 2024 }
2025
1576 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1580 scrollbar_size ()); 2030
1581 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
1582 break; 2032 break;
1583 2033
1584 case Button1: 2034 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1586 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
1587 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
1588 2038
1589 case Button3: 2039 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
1591 { 2041 {
1592 if (scrollbar_above_slider (ev.y)) 2042 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2044 scr_page (UP, nrow - 1);
1595# else 2045# else
1596 scr_page (UP, TermWin.nrow / 4); 2046 scr_page (UP, nrow / 4);
1597# endif 2047# endif
1598 else if (scrollbar_below_slider (ev.y)) 2048 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2049# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2050 scr_page (DN, nrow - 1);
1601# else 2051# else
1602 scr_page (DN, TermWin.nrow / 4); 2052 scr_page (DN, nrow / 4);
1603# endif 2053# endif
1604 else 2054 else
1605 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
1606 } 2056 }
1607 else 2057 else
1608 { 2058 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2060 (nrow
1611 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2062 / scrollBar.size ()));
1613 } 2063 }
2064
1614 break; 2065 break;
1615 } 2066 }
1616 } 2067 }
2068
1617 return; 2069 return;
1618 } 2070 }
1619#if MENUBAR
1620 /*
1621 * Menubar window processing of button press
1622 */
1623 if (isMenuBarWindow (ev.window))
1624 menubar_control (ev);
1625#endif
1626} 2071}
1627 2072
1628void 2073void
1629rxvt_term::button_release (XButtonEvent &ev) 2074rxvt_term::button_release (XButtonEvent &ev)
1630{ 2075{
1631 int reportmode = 0; 2076 int reportmode = 0;
1632 2077
1633 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2079 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2081
1637 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1638 { 2083 {
1639 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
1640 scrollbar_show (0); 2085 scrollBar.show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH;
1643#endif
1644
1645 } 2086 }
2087
1646#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
1649#endif 2090#endif
2091
1650 if (ev.window == TermWin.vt) 2092 if (ev.window == vt)
1651 { 2093 {
2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2095 return;
2096
2097#if ISO_14755
2098 // 5.4
2099 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2100 return;
2101#endif
2102
1652 if (reportmode) 2103 if (reportmode)
1653 { 2104 {
1654 /* mouse report from vt window */ 2105 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
1667 mouse_report (ev); 2118 mouse_report (ev);
1668 } 2119 }
1669#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
1670 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
1671 mouse_report (ev); 2122 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2124 return;
1674 } 2125 }
2126
1675 /* 2127 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2129 * when overriding mouse reporting
1678 */ 2130 */
1679 if (PrivateModes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2132 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
1683 2135
1684 switch (ev.button) 2136 switch (ev.button)
1685 { 2137 {
1686 case Button1: 2138 case Button1:
1687 case Button3: 2139 case Button3:
1688 selection_make (ev.time); 2140 selection_make (ev.time);
1689 break; 2141 break;
2142
1690 case Button2: 2143 case Button2:
1691 selection_request (ev.time, ev.x, ev.y); 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1692 break; 2146 break;
2147
1693#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
1694 case Button4: 2149 case Button4:
1695 case Button5: 2150 case Button5:
1696 { 2151 {
1697 int i; 2152 int i;
… …
1699 2154
1700 v = ev.button == Button4 ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
1701 2156
1702 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
1703 i = 1; 2158 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2159 else if (option (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2160 i = nrow - 1;
1706 else 2161 else
1707 i = 5; 2162 i = 5;
1708 2163
1709# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2165 if (ev.state & ControlMask)
1711 { 2166 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2170
2171 if (!slip_wheel_ev.is_active ())
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1714 } 2173 }
2174 else
1715# endif 2175# endif
1716# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 { 2176 {
1723 scr_page (v, 1); 2177 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2178 scrollBar.show (1);
1726 } 2179 }
1727# endif
1728
1729 } 2180 }
1730 break; 2181 break;
1731#endif 2182#endif
1732
1733 }
1734 }
1735#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev);
1738#endif
1739}
1740
1741#ifdef TRANSPARENT
1742#if TINTING
1743/* shading taken from eterm-0.9.2 */
1744/* RGB 15 */
1745
1746static void
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0x7c00) * rm;
1761 g = (b & 0x3e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1764 | ((g >> 8) & 0x3e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0x7c00) * rm;
1776 g = (b & 0x3e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 15) - 1);
1779 g |= (!(g >> 10) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1782 | ((g >> 8) & 0x3e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 16 */
1791static void
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 }
1814 } else {
1815 for (y = h; --y >= 0;) {
1816 for (x = -w; x < 0; x++) {
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 }
1830 ptr += bpl;
1831 }
1832 }
1833}
1834
1835/* RGB 24 */
1836static void
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1838{
1839 unsigned char *ptr;
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 }
1867 } else {
1868 for (y = h; --y >= 0;) {
1869 for (x = -(w * 3); x < 0; x += 3) {
1870 int r, g, b;
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 }
1898 ptr += bpl;
1899 }
1900 }
1901}
1902
1903/* RGB 32 */
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973}
1974
1975#endif
1976
1977/*
1978 * Check our parents are still who we think they are.
1979 * Do transparency updates if required
1980 */
1981int
1982rxvt_term::check_our_parents ()
1983{
1984 int i, pchanged, aformat, have_pixmap, rootdepth;
1985 unsigned long nitems, bytes_after;
1986 Atom atype;
1987 unsigned char *prop = NULL;
1988 Window root, oldp, *list;
1989 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr;
1991
1992 pchanged = 0;
1993
1994 if (!(Options & Opt_transparent))
1995 return pchanged; /* Don't try any more */
1996
1997 XGetWindowAttributes (display->display, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth;
1999
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2001
2002 if (rootdepth != wattr.depth)
2003 {
2004 if (am_transparent)
2005 { 2183 }
2006 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0;
2009 }
2010
2011 return pchanged; /* Don't try any more */
2012 }
2013
2014 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False);
2016
2017 /*
2018 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that.
2021 */
2022 i = (xa[XA_XROOTPMAPID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success);
2026
2027 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success);
2032
2033 if (!i || prop == NULL)
2034 have_pixmap = 0;
2035 else
2036 { 2184 }
2037 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop;
2039 XFree (prop);
2040 }
2041
2042 if (have_pixmap)
2043 {
2044 /*
2045 * Copy display->root pixmap transparency
2046 */
2047 int sx, sy, nx, ny;
2048 unsigned int nw, nh;
2049 Window cr;
2050 XImage *image;
2051 GC gc;
2052 XGCValues gcvalue;
2053
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2055 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height;
2058 nx = ny = 0;
2059
2060 if (sx < 0)
2061 {
2062 nw += sx;
2063 nx = -sx;
2064 sx = 0;
2065 }
2066
2067 if (sy < 0)
2068 {
2069 nh += sy;
2070 ny = -sy;
2071 sy = 0;
2072 }
2073
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2076 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */
2081 allowedxerror = 0;
2082
2083 if (image == NULL)
2084 {
2085 if (am_transparent && am_pixmap_trans)
2086 {
2087 pchanged = 1;
2088 if (TermWin.pixmap != None)
2089 {
2090 XFreePixmap (display->display, TermWin.pixmap);
2091 TermWin.pixmap = None;
2092 }
2093 }
2094
2095 am_pixmap_trans = 0;
2096 }
2097 else
2098 {
2099 if (TermWin.pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap);
2101
2102#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint))
2104 {
2105 unsigned short shade, rm, gm, bm;
2106
2107 PixColors[Color_tint].get (display, rm, gm, bm);
2108
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 }
2120#endif
2121
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2123 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc);
2128 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2130 TermWin.pixmap);
2131
2132 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1;
2134
2135 am_transparent = am_pixmap_trans = 1;
2136 }
2137 }
2138
2139 if (!am_pixmap_trans)
2140 {
2141 unsigned int n;
2142 /*
2143 * InheritPixmap transparency
2144 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 {
2148 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n);
2151 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153
2154 if (TermWin.parent[i] == display->root)
2155 {
2156 if (oldp != None)
2157 pchanged = 1;
2158
2159 break;
2160 }
2161
2162 if (oldp != TermWin.parent[i])
2163 pchanged = 1;
2164 }
2165
2166 n = 0;
2167
2168 if (pchanged)
2169 {
2170 for (; n < (unsigned int)i; n++)
2171 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break;
2178 }
2179 }
2180 }
2181
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2187 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */
2189 }
2190 else
2191 {
2192#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1);
2196#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++)
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2200
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2202 am_transparent = 1;
2203 }
2204
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None;
2207 }
2208
2209 return pchanged;
2210} 2185}
2211#endif
2212 2186
2213/*}}} */ 2187/*}}} */
2214 2188
2215bool 2189void
2216rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2217{ 2191{
2218 bool flag = false;
2219 unicode_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2221 2194
2222 for (;;) 2195 for (;;)
2223 { 2196 {
2224 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2225 { 2198 {
2226 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2200 ch = next_char ();
2228 }
2229 2201
2230 if (ch == NOCHAR) // TODO: improve 2202 if (ch == NOCHAR)
2231 break; 2203 break;
2204 }
2232 2205
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 {
2208 if (expect_false (!seen_input))
2234 { 2209 {
2210 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs
2214 // then sometimes get the size wrong.
2215 // unfortunately other programs are even more buggy and dislike
2216 // being sent SIGWINCH, so only do it when we were in fact being
2217 // resized.
2218 if (seen_resize && cmd_pid)
2219 kill (-cmd_pid, SIGWINCH);
2220 }
2221
2235 /* Read a text string from the input buffer */ 2222 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2223 wchar_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2224 bool refreshnow = false;
2238 int nlines = 0; 2225 int nlines = 0;
2239 unicode_t *str = buf; 2226 wchar_t *str = buf;
2240 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2228
2243 for (;;) 2229 for (;;)
2244 { 2230 {
2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break;
2233
2234 *str++ = ch;
2235
2236 if (expect_false (ch == C0_LF || str >= eol))
2237 {
2238 if (ch == C0_LF)
2239 nlines++;
2240
2241 refresh_count++;
2242
2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2244 {
2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2250 ch = NOCHAR;
2251 break;
2252 }
2253 }
2254
2255 // scr_add_lines only works for nlines <= nrow - 1.
2256 if (nlines >= nrow - 1)
2257 {
2258 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2259 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2260 scr_add_lines (buf, str - buf, nlines);
2261
2262 nlines = 0;
2263 str = buf;
2264 eol = str + min (ncol, UBUFSIZ);
2265 }
2266
2267 if (str >= eol)
2268 {
2269 if (eol >= buf + UBUFSIZ)
2270 {
2271 ch = NOCHAR;
2272 break;
2273 }
2274 else
2275 eol = min (eol + ncol, buf + UBUFSIZ);
2276 }
2277
2278 }
2279
2245 seq_begin = cmdbuf_ptr; 2280 seq_begin = cmdbuf_ptr;
2246 ch = next_char (); 2281 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break;
2250
2251 *str++ = ch;
2252
2253 if (ch == C0_LF)
2254 {
2255 nlines++;
2256 refresh_count++;
2257
2258 if (! (Options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2260 {
2261 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR;
2264 break;
2265 }
2266
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1)
2269 {
2270 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0;
2272 str = buf;
2273 }
2274 }
2275
2276 if (str >= buf + UBUFSIZ)
2277 {
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2282 }
2282 2283
2284 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2283 scr_add_lines (buf, nlines, str - buf); 2286 scr_add_lines (buf, str - buf, nlines);
2284 2287
2285 /* 2288 /*
2286 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2289 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2292 */
2294 if (refreshnow) 2293 if (refreshnow)
2295 { 2294 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++;
2298 else
2299 scr_refresh (refresh_type); 2295 scr_refresh ();
2296 want_refresh = 1;
2300 } 2297 }
2301
2302 } 2298 }
2303 else 2299 else
2304 { 2300 {
2305 try 2301 try
2306 { 2302 {
… …
2314 } 2310 }
2315 2311
2316 ch = NOCHAR; 2312 ch = NOCHAR;
2317 } 2313 }
2318 } 2314 }
2319
2320 return flag;
2321}
2322
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330} 2315}
2331 2316
2332// read the next character 2317// read the next character
2333unicode_t 2318wchar_t
2334rxvt_term::next_char () 2319rxvt_term::next_char () NOTHROW
2335{ 2320{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2322 {
2338 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2340 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2341 2326
2342 wchar_t wc; 2327 wchar_t wc;
2343 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2344 2329
2345 if (len == (size_t)-2) 2330 if (len == (size_t)-2)
2346 { 2331 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2332 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2349 break; 2334 break;
2350 } 2335 }
2351 2336
2352 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2354 2342
2355 // assume wchar == unicode 2343 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2357 return wc; 2345 return wc & UNICODE_MASK;
2358 } 2346 }
2359 2347
2360 return NOCHAR; 2348 return NOCHAR;
2361} 2349}
2350
2351// read the next octet
2352uint32_t
2353rxvt_term::next_octet () NOTHROW
2354{
2355 return cmdbuf_ptr < cmdbuf_endp
2356 ? (unsigned char)*cmdbuf_ptr++
2357 : NOCHAR;
2358}
2359
2360static class out_of_input out_of_input;
2362 2361
2363/* rxvt_cmd_getc () - Return next input character */ 2362/* rxvt_cmd_getc () - Return next input character */
2364/* 2363/*
2365 * Return the next input character after first passing any keyboard input 2364 * Return the next input character after first passing any keyboard input
2366 * to the command. 2365 * to the command.
2367 */ 2366 */
2368unicode_t 2367wchar_t
2369rxvt_term::cmd_getc () 2368rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2369{
2371 unicode_t c = next_char (); 2370 wchar_t c = next_char ();
2372 2371
2373 if (c == NOCHAR) 2372 if (c == NOCHAR)
2374 throw out_of_input; 2373 throw out_of_input;
2375 2374
2376 return c; 2375 return c;
2377} 2376}
2378 2377
2379unicode_t 2378uint32_t
2380rxvt_term::cmd_get8 () 2379rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2380{
2382 unicode_t c = next_octet (); 2381 uint32_t c = next_octet ();
2383 2382
2384 if (c == NOCHAR) 2383 if (c == NOCHAR)
2385 throw out_of_input; 2384 throw out_of_input;
2386 2385
2387 return c; 2386 return c;
… …
2391/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2393FILE * 2392FILE *
2394rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2395{ 2394{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2396
2398 if (stream == NULL) 2397 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2399
2401 return stream; 2400 return stream;
… …
2412 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2413 */ 2412 */
2414void 2413void
2415rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2416{ 2415{
2417 int done; 2416 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2417
2420 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2421 return; 2419 return;
2422 2420
2423 /* 2421 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2423 * is received.
2426 */ 2424 */
2427 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2428 { 2426 {
2429 unsigned char buf[8]; 2427 unsigned char buf[8];
2430 unicode_t ch; 2428 unicode_t ch;
2431 unsigned int i, len; 2429 unsigned int i, len;
2432 2430
… …
2451 { 2449 {
2452 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2453 break; /* done = 1 */ 2451 break; /* done = 1 */
2454 } 2452 }
2455 } 2453 }
2456 2454
2457 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2458 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2459 { 2457 {
2460 done = 1; 2458 done = 1;
2461 break; 2459 break;
… …
2463 } 2461 }
2464 } 2462 }
2465 2463
2466 pclose_printer (fd); 2464 pclose_printer (fd);
2467} 2465}
2468#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2469/*}}} */ 2467/*}}} */
2470 2468
2471/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2472enum { 2470enum {
2473 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
2487 case C0_ESC: 2485 case C0_ESC:
2488 process_escape_seq (); 2486 process_escape_seq ();
2489 break; 2487 break;
2490 case C0_ENQ: /* terminal Status */ 2488 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2489 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2490 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 2491 else
2495 tt_write ((unsigned char *)VT100_ANS, 2492 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 2493 break;
2498 case C0_BEL: /* bell */ 2494 case C0_BEL: /* bell */
2499 scr_bell (); 2495 scr_bell ();
2500 break; 2496 break;
2501 case C0_BS: /* backspace */ 2497 case C0_BS: /* backspace */
… …
2525 process_dcs_seq (); 2521 process_dcs_seq ();
2526 break; 2522 break;
2527 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
2528 process_csi_seq (); 2524 process_csi_seq ();
2529 break; 2525 break;
2530 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
2531 process_osc_seq (); 2527 process_osc_seq ();
2532 break; 2528 break;
2533#endif 2529#endif
2534 } 2530 }
2535} 2531}
… …
2579 break; 2575 break;
2580 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2578 break;
2583 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
2585 break; 2581 break;
2586 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
2588 /* unimplemented */ 2584 /* unimplemented */
2589 break; 2585 break;
… …
2600void 2596void
2601rxvt_term::process_escape_seq () 2597rxvt_term::process_escape_seq ()
2602{ 2598{
2603 unicode_t ch = cmd_getc (); 2599 unicode_t ch = cmd_getc ();
2604 2600
2605 if (PrivateModes & PrivMode_vt52) 2601 if (priv_modes & PrivMode_vt52)
2606 { 2602 {
2607 process_escape_vt52 (ch); 2603 process_escape_vt52 (ch);
2608 return; 2604 return;
2609 } 2605 }
2610 2606
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2622 break;
2627 case '+': 2623 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 2625 break;
2630#ifndef NO_FRILLS 2626#if !ENABLE_MINIMAL
2631 case '6': 2627 case '6':
2632 scr_backindex (); 2628 scr_backindex ();
2633 break; 2629 break;
2634#endif 2630#endif
2635 case '7': 2631 case '7':
2636 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
2637 break; 2633 break;
2638 case '8': 2634 case '8':
2639 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
2640 break; 2636 break;
2641#ifndef NO_FRILLS 2637#if !ENABLE_MINIMAL
2642 case '9': 2638 case '9':
2643 scr_forwardindex (); 2639 scr_forwardindex ();
2644 break; 2640 break;
2645#endif 2641#endif
2646 case '=': 2642 case '=':
2647 case '>': 2643 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2645 break;
2650 2646
2651 case C1_40: 2647 case C1_40:
2652 cmd_getc (); 2648 cmd_getc ();
2653 break; 2649 break;
… …
2656 break; 2652 break;
2657 2653
2658 /* 8.3.87: NEXT LINE */ 2654 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2655 case C1_NEL: /* ESC E */
2660 { 2656 {
2661 unicode_t nlcr[] = { C0_LF, C0_CR }; 2657 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, 1, 2); 2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2663 } 2659 }
2664 break; 2660 break;
2665 2661
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2662 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2663 case C1_ESA: /* ESC G */
… …
2689 process_dcs_seq (); 2685 process_dcs_seq ();
2690 break; 2686 break;
2691 2687
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
2697 2692
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2699 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2695 process_csi_seq ();
2701 break; 2696 break;
2702 2697
2703 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2704 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
2705 process_osc_seq (); 2700 process_osc_seq ();
2706 break; 2701 break;
2707 2702
2708 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2709 case 'c': 2704 case 'c':
2710 mbstate.reset (); 2705 mbstate.reset ();
2711 scr_poweron (); 2706 scr_poweron ();
2712 scrollbar_show (1); 2707 scrollBar.show (1);
2713 break; 2708 break;
2714 2709
2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2716 case 'n': 2711 case 'n':
2717 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
2762rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
2763{ 2758{
2764 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
2765 unsigned int nargs, p; 2760 unsigned int nargs, p;
2766 int n, ndef; 2761 int n, ndef;
2767 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
2768 2763
2769 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
2770 arg[--nargs] = 0;
2771 2765
2772 priv = 0; 2766 priv = 0;
2773 ch = cmd_getc (); 2767 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 {
2775 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
2776 priv = ch; 2771 priv = ch;
2777 ch = cmd_getc (); 2772 ch = cmd_getc ();
2778 } 2773 }
2779 2774
2780 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
2809 ndef = get_byte_array_bit (csi_defaults, i); 2804 ndef = get_byte_array_bit (csi_defaults, i);
2810 for (p = 0; p < nargs; p++) 2805 for (p = 0; p < nargs; p++)
2811 if (arg[p] == -1) 2806 if (arg[p] == -1)
2812 arg[p] = ndef; 2807 arg[p] = ndef;
2813 2808
2814#ifdef DEBUG_CMD
2815 fprintf (stderr, "CSI ");
2816 for (p = 0; p < nargs; p++)
2817 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2818 fprintf (stderr, "%c\n", ch);
2819#endif
2820
2821 /* 2809 /*
2822 * private mode handling 2810 * private mode handling
2823 */ 2811 */
2824 if (priv) 2812 if (priv)
2825 { 2813 {
2826 switch (priv) 2814 switch (priv)
2827 { 2815 {
2828 case '>': 2816 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
2818 {
2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2821 //
2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2824 // versions.
2825 //
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2827 }
2831 break; 2828 break;
2829
2832 case '?': 2830 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 2833 break;
2834
2835 case '!':
2836 if (ch == CSI_70)
2837 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset ();
2840
2841 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2836 } 2846 }
2847 break;
2848 }
2849
2837 return; 2850 return;
2838 } 2851 }
2839 2852
2840 switch (ch) 2853 switch (ch)
2841 { 2854 {
… …
2940 2953
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2954 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 2955 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 2956 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2957 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2958 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 2959 break;
2947 2960
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2961 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 2963 break;
2952 2964
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2965 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 2966 process_sgr_mode (nargs, arg);
2955 break; 2967 break;
… …
2962 break; 2974 break;
2963 case 6: /* CPR requested */ 2975 case 6: /* CPR requested */
2964 scr_report_position (); 2976 scr_report_position ();
2965 break; 2977 break;
2966 case 7: /* unofficial extension */ 2978 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 2979 if (option (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2980 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 2981 break;
2970 case 8: /* unofficial extension */ 2982 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2983 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 2984 break;
2973 } 2985 }
… …
3009 break; 3021 break;
3010 3022
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3023 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3024 if (arg[0] == 4)
3013 scr_insert_mode (0); 3025 scr_insert_mode (0);
3026 else if (arg[0] == 20)
3027 priv_modes &= ~PrivMode_LFNL;
3014 break; 3028 break;
3015 3029
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3030 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3031 if (arg[0] == 4)
3018 scr_insert_mode (1); 3032 scr_insert_mode (1);
3033 else if (arg[0] == 20)
3034 priv_modes |= PrivMode_LFNL;
3019 break; 3035 break;
3020 3036
3021 /* 3037 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3038 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3039 */
… …
3035 break; 3051 break;
3036 case CSI_75: 3052 case CSI_75:
3037 scr_cursor (RESTORE); 3053 scr_cursor (RESTORE);
3038 break; 3054 break;
3039 3055
3040#ifndef NO_FRILLS 3056#if !ENABLE_MINIMAL
3041 case CSI_74: 3057 case CSI_74:
3042 process_window_ops (arg, nargs); 3058 process_window_ops (arg, nargs);
3043 break; 3059 break;
3044#endif 3060#endif
3045 3061
… …
3052 break; 3068 break;
3053 } 3069 }
3054} 3070}
3055/*}}} */ 3071/*}}} */
3056 3072
3057#ifndef NO_FRILLS 3073#if !ENABLE_MINIMAL
3058/* ARGSUSED */ 3074/* ARGSUSED */
3059void 3075void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3076rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3077{
3062 int x, y; 3078 int x, y;
3063 XWindowAttributes wattr; 3079 XWindowAttributes wattr;
3064 Window wdummy; 3080 Window wdummy;
3081
3082 dLocal (Display *, dpy);
3065 3083
3066 if (nargs == 0) 3084 if (nargs == 0)
3067 return; 3085 return;
3068 3086
3069 switch (args[0]) 3087 switch (args[0])
3070 { 3088 {
3071 /* 3089 /*
3072 * commands 3090 * commands
3073 */ 3091 */
3074 case 1: /* deiconify window */ 3092 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3093 XMapWindow (dpy, parent[0]);
3076 break; 3094 break;
3077 case 2: /* iconify window */ 3095 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3096 XIconifyWindow (dpy, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3097 break;
3081 case 3: /* set position (pixels) */ 3098 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3099 XMoveWindow (dpy, parent[0], args[1], args[2]);
3083 break; 3100 break;
3084 case 4: /* set size (pixels) */ 3101 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3103 break;
3087 case 5: /* raise window */ 3104 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3105 XRaiseWindow (dpy, parent[0]);
3089 break; 3106 break;
3090 case 6: /* lower window */ 3107 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3108 XLowerWindow (dpy, parent[0]);
3092 break; 3109 break;
3093 case 7: /* refresh window */ 3110 case 7: /* refresh window */
3094 scr_touch (true); 3111 scr_touch (true);
3095 break; 3112 break;
3096 case 8: /* set size (chars) */ 3113 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3114 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3115 (unsigned int) (args[1] * fheight));
3099 break; 3116 break;
3100 3117
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3118 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3119 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3120 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3121 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3122 (unsigned int) (args[1] * fheight));
3106 break; 3123 break;
3107
3108 3124
3109 /* 3125 /*
3110 * reports - some output format copied from XTerm 3126 * reports - some output format copied from XTerm
3111 */ 3127 */
3112 case 11: /* report window state */ 3128 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3131 break;
3116 case 13: /* report window position */ 3132 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3134 XTranslateCoordinates (dpy, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3135 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3136 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3137 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3138 break;
3123 case 14: /* report window size (pixels) */ 3139 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3142 break;
3127 case 18: /* report text area size (chars) */ 3143 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3144 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3145 break;
3130 case 19: /* report window size (chars) */ 3146 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3147 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3148 break;
3133 case 20: /* report icon label */ 3149 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3150 {
3136 char *s; 3151 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3152 XGetIconName (dpy, parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s);
3139 } 3155 }
3140 break; 3156 break;
3141 case 21: /* report window title */ 3157 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3158 {
3144 char *s; 3159 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3160 XFetchName (dpy, parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s);
3147 } 3163 }
3148 break; 3164 break;
3149 } 3165 }
3150} 3166}
3151#endif 3167#endif
3152 3168
3153/*----------------------------------------------------------------------*/ 3169/*----------------------------------------------------------------------*/
3154/* 3170/*
3155 * get input up until STRING TERMINATOR (or BEL) 3171 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3172 * ends_how is terminator used. returned input must be free()'d
3157 */ 3173 */
3158unsigned char * 3174char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3175rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3176{
3161 unicode_t prev = 0, ch; 3177 unicode_t ch;
3178 bool seen_esc = false;
3162 unsigned int n = 0; 3179 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3180 wchar_t string[STRING_MAX];
3165 3181
3166 while ((ch = cmd_getc ()) != NOCHAR) 3182 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3183 {
3168 if (prev == C0_ESC) 3184 if (seen_esc)
3169 { 3185 {
3170 if (ch == 0x5c) /* 7bit ST */ 3186 if (ch == 0x5c) /* 7bit ST */
3171 break; 3187 break;
3172 else 3188 else
3173 return NULL; 3189 return NULL;
3174 } 3190 }
3191 else if (ch == C0_ESC)
3192 {
3193 seen_esc = true;
3194 continue;
3195 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3196 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3197 break;
3198 else if (ch == C0_SYN)
3199 ch = cmd_get8 ();
3177 else if (ch < 0x20) 3200 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3201 return NULL; /* other control character - exit */
3179 3202
3180 if (n >= sizeof (string) - 1) 3203 seen_esc = false;
3204
3205 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3206 // stop at some sane length
3182 return NULL; 3207 return NULL;
3183 3208
3184 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else
3190 string[n++] = prev = ch; 3209 string[n++] = ch;
3191 } 3210 }
3192 3211
3193 string[n++] = '\0'; 3212 string[n++] = '\0';
3194 3213
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3214 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3215
3200 return s; 3216 return rxvt_wcstombs (string);
3201} 3217}
3202 3218
3203/*----------------------------------------------------------------------*/ 3219/*----------------------------------------------------------------------*/
3204/* 3220/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3222 */
3207void 3223void
3208rxvt_term::process_dcs_seq () 3224rxvt_term::process_dcs_seq ()
3209{ 3225{
3210 unsigned char *s; 3226 char *s;
3211 unicode_t eh; 3227 unicode_t eh;
3212 3228
3213 /* 3229 /*
3214 * Not handled yet 3230 * Not handled yet
3215 */ 3231 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3250 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3251 arg = arg * 10 + (ch - '0');
3236 3252
3237 if (ch == ';') 3253 if (ch == ';')
3238 { 3254 {
3239 unsigned char *s = get_to_st (eh); 3255 char *s = get_to_st (eh);
3240 3256
3241 if (s) 3257 if (s)
3242 { 3258 {
3243 process_xterm_seq (arg, (char *)s, eh); 3259 process_xterm_seq (arg, s, eh);
3244 free (s); 3260 free (s);
3245 } 3261 }
3246 } 3262 }
3247} 3263}
3248 3264
3249void 3265void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3266rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3251{ 3267{
3252 if (str[0] == '?' && !str[1]) 3268 if (str[0] == '?' && !str[1])
3253 { 3269 {
3254 if (Options & Opt_insecure) 3270 rgba c;
3255 { 3271 pix_colors_focused[color].get (c);
3256 unsigned short r, g, b; 3272
3257 PixColors[color].get (display, r, g, b); 3273#if XFT
3274 if (c.a != rgba::MAX_CC)
3275 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3276 else
3277#endif
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3278 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3259 }
3260 } 3279 }
3261 else 3280 else
3262 set_window_color (color, str); 3281 set_window_color (color, str);
3263} 3282}
3264 3283
3265/* 3284/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3286 */
3290void 3287void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3288rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3289{
3293 int changed = 0;
3294 int color; 3290 int color;
3295 char *buf, *name; 3291 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3292 bool query = str[0] == '?' && !str[1];
3293 int saveop = op;
3294
3295 dLocal (Display *, dpy);
3297 3296
3298 assert (str != NULL); 3297 assert (str != NULL);
3298
3299 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3300 return;
3301
3299 switch (op) 3302 switch (op)
3300 { 3303 {
3301 case XTerm_name: 3304 case XTerm_name:
3302 set_title (str); 3305 set_title (str);
3303 /* FALLTHROUGH */ 3306 /* FALLTHROUGH */
… …
3308 set_title (str); 3311 set_title (str);
3309 break; 3312 break;
3310 case XTerm_property: 3313 case XTerm_property:
3311 if (str[0] == '?') 3314 if (str[0] == '?')
3312 { 3315 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3316 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3317 Atom actual_type;
3315 int actual_format; 3318 int actual_format;
3316 unsigned long nitems; 3319 unsigned long nitems;
3317 unsigned long bytes_after; 3320 unsigned long bytes_after;
3318 unsigned char *value = 0; 3321 unsigned char *value = 0;
3319 const char *str = ""; 3322 const char *str = "";
3320 3323
3321 if (prop 3324 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3325 && XGetWindowProperty (dpy, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3326 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3327 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3328 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3329 && actual_type != None
3327 && actual_format == 8) 3330 && actual_format == 8)
3328 str = (const char *)(value); 3331 str = (const char *)(value);
3329 3332
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3333 tt_printf ("\033]%d;%s%c", op, str, resp);
3331 3334
3332 XFree (value); 3335 XFree (value);
3333 } 3336 }
3334 else 3337 else
3335 { 3338 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3340
3338 if (eq) 3341 if (eq)
3339 { 3342 {
3340 *eq = 0; 3343 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3344 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3345 }
3346 else 3346 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3347 XDeleteProperty (dpy, parent[0],
3348 display->atom (str)); 3348 display->atom (str));
3349 } 3349 }
3350 break; 3350 break;
3351 3351
3352 case XTerm_Color: 3352 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3353 for (buf = (char *)str; buf && *buf;)
3354 { 3354 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3355 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3356 break;
3357 3357
3358 *name++ = '\0'; 3358 *name++ = '\0';
3359 color = atoi (buf); 3359 color = atoi (buf) + minCOLOR;
3360 3360
3361 if (color < 0 || color >= TOTAL_COLORS) 3361 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3362 break; 3362 break;
3363 3363
3364 if ((buf = STRCHR (name, ';')) != NULL) 3364 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3365 *buf++ = '\0';
3366 3366
3367 if (name[0] == '?' && !name[1]) 3367 process_color_seq (op, color, name, resp);
3368 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 }
3376 else
3377 set_window_color (color + minCOLOR, name);
3378 } 3368 }
3379 break; 3369 break;
3370 case Rxvt_restoreFG:
3380 case XTerm_Color00: 3371 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3372 process_color_seq (op, Color_fg, str, resp);
3382 break; 3373 break;
3374 case Rxvt_restoreBG:
3383 case XTerm_Color01: 3375 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3376 process_color_seq (op, Color_bg, str, resp);
3385 break; 3377 break;
3386#ifndef NO_CURSORCOLOR 3378#ifndef NO_CURSORCOLOR
3387 case XTerm_Color_cursor: 3379 case XTerm_Color_cursor:
3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3380 process_color_seq (op, Color_cursor, str, resp);
3389 break; 3381 break;
3390#endif 3382#endif
3391 case XTerm_Color_pointer_fg: 3383 case XTerm_Color_pointer_fg:
3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3384 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3385 break;
3394 case XTerm_Color_pointer_bg: 3386 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3387 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3388 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3389#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break;
3401 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break;
3404 case XTerm_Color_RV: 3390 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3391 process_color_seq (op, Color_RV, str, resp);
3406 break; 3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp);
3396 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp);
3400 break;
3401 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp);
3403 break;
3407#endif 3404#endif
3405#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp);
3408 {
3409 bool changed = false;
3408 3410
3411 if (ISSET_PIXCOLOR (Color_tint))
3412 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3413 else
3414 changed = bgPixmap.unset_tint ();
3415
3416 if (changed)
3417 update_background ();
3418 }
3419
3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3409 case XTerm_Pixmap: 3424 case Rxvt_Pixmap:
3410 if (*str != ';') 3425 if (!strcmp (str, "?"))
3411 { 3426 {
3412#if XPM_BACKGROUND 3427 char str[256];
3413 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */
3415#endif
3416 scr_touch (true);
3417 }
3418 while ((str = STRCHR (str, ';')) != NULL)
3419 {
3420 str++;
3421#if XPM_BACKGROUND
3422 changed += scale_pixmap (str);
3423#endif
3424 3428
3425 } 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3426 if (changed) 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427 { 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428#ifdef XPM_BACKGROUND 3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 resize_pixmap ();
3430#endif
3431 scr_touch (true);
3432 }
3433 break;
3434
3435 case XTerm_restoreFG:
3436 set_window_color (Color_fg, str);
3437 break;
3438 case XTerm_restoreBG:
3439 set_window_color (Color_bg, str);
3440 break;
3441
3442 case XTerm_logfile:
3443 // TODO, when secure mode?
3444 break;
3445
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 } 3433 }
3467 else 3434 else
3468 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3448
3469 set_locale (str); 3449 while (str)
3470# ifdef USE_XIM 3450 {
3471 im_cb (); 3451 str++;
3472# endif 3452 if (bgPixmap.set_geometry (str))
3453 changed++;
3454 str = strchr (str, ';');
3455 }
3456
3457 if (changed)
3458 update_background ();
3473 } 3459 }
3474 break; 3460 break;
3461#endif
3475 3462
3476 case XTerm_findfont: 3463 case XTerm_logfile:
3477 if (Options & Opt_insecure) 3464 // TODO, when secure mode?
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR
3487 case XTerm_Menu:
3488 if (Options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3465 break;
3491#endif 3466
3492#if 0 3467#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3468 case Rxvt_dumpscreen: /* no error notices */
3494 { 3469 {
3495 int fd; 3470 int fd;
3496 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3471 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3497 { 3472 {
3498 scr_dump (fd); 3473 scr_dump (fd);
3499 close (fd); 3474 close (fd);
3500 } 3475 }
3501 } 3476 }
3477 break;
3478#endif
3479 case XTerm_font:
3480 op = URxvt_font;
3481 case URxvt_font:
3482#if ENABLE_STYLES
3483 case URxvt_boldFont:
3484 case URxvt_italicFont:
3485 case URxvt_boldItalicFont:
3486#endif
3487 if (query)
3488 tt_printf ("\33]%d;%-.250s%c", saveop,
3489 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3490 ? fontset[op - URxvt_font]->fontdesc : "",
3491 resp);
3492 else
3493 {
3494 const char *&res = rs[Rs_font + (op - URxvt_font)];
3495
3496 res = strdup (str);
3497 allocated.push_back ((void *)res);
3498 set_fonts ();
3499 }
3500 break;
3501
3502 case URxvt_version:
3503 if (query)
3504 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3505 op,
3506 rs[Rs_name], VERSION[0], VERSION[2],
3507 resp);
3508 break;
3509
3510#if !ENABLE_MINIMAL
3511 case URxvt_locale:
3512 if (query)
3513 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3514 else
3515 {
3516 set_locale (str);
3517 pty->set_utf8_mode (enc_utf8);
3518 init_xlocale ();
3519 }
3520 break;
3521
3522 case URxvt_view_up:
3523 case URxvt_view_down:
3524 {
3525 int lines = atoi (str);
3526
3527 if (lines)
3528 scr_page (op == URxvt_view_up ? UP : DN, lines);
3529 else
3530 scr_erase_savelines ();
3531 }
3532
3533 break;
3534#endif
3535
3536#if ENABLE_PERL
3537 case URxvt_perl:
3538 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3502 break; 3539 break;
3503#endif 3540#endif
3504 } 3541 }
3505} 3542}
3506/*----------------------------------------------------------------------*/ 3543/*----------------------------------------------------------------------*/
… …
3520{ 3557{
3521 int state; 3558 int state;
3522 3559
3523 if (mode == 's') 3560 if (mode == 's')
3524 { 3561 {
3525 SavedModes |= (PrivateModes & bit); 3562 SavedModes |= (priv_modes & bit);
3526 return -1; 3563 return -1;
3527 } 3564 }
3528 else 3565 else
3529 { 3566 {
3530 if (mode == 'r') 3567 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3569 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3570 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3571 set_privmode (bit, state);
3535 } 3572 }
3536 3573
3537 return state; 3574 return state;
3538} 3575}
3539 3576
3540/* we're not using priv _yet_ */ 3577/* we're not using priv _yet_ */
3541void 3578void
3542rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3579rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3543{ 3580{
3544 unsigned int i, j; 3581 unsigned int i, j;
3545 int state; 3582 int state;
3546 3583
3547 static const struct 3584 static const struct
3548 { 3585 {
3549 const int argval; 3586 const int argval;
3550 const unsigned long bit; 3587 const unsigned long bit;
3551 }
3552
3553 argtopriv[] = { 3588 } argtopriv[] = {
3554 { 1, PrivMode_aplCUR }, 3589 { 1, PrivMode_aplCUR }, // DECCKM
3555 { 2, PrivMode_vt52 }, 3590 { 2, PrivMode_vt52 },
3556 { 3, PrivMode_132 }, 3591 { 3, PrivMode_132 }, // DECCOLM
3557 { 4, PrivMode_smoothScroll }, 3592 { 4, PrivMode_smoothScroll }, // DECSCLM
3558 { 5, PrivMode_rVideo }, 3593 { 5, PrivMode_rVideo }, // DECSCNM
3559 { 6, PrivMode_relOrigin }, 3594 { 6, PrivMode_relOrigin }, // DECOM
3560 { 7, PrivMode_Autowrap }, 3595 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, auto-repeat keys // DECARM
3561 { 9, PrivMode_MouseX10 }, 3597 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3598 // 18 end FF to printer after print screen
3563 { menuBar_esc, PrivMode_menuBar }, 3599 // 19 Print screen prints full screen/scorll region
3564#endif 3600 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3565#ifdef scrollBar_esc 3601#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3602 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3603#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3604 { 35, PrivMode_ShiftKeys }, // rxvt extension
3605 // 38, tektronix mode // DECTEK
3572 { 40, PrivMode_132OK }, 3606 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3607 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3608 // 45 margin bell NYI
3575 // 46 start logging 3609 // 46 start logging
3576 { 47, PrivMode_Screen }, 3610 { 47, PrivMode_Screen },
3577 { 66, PrivMode_aplKP }, 3611 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3578#ifndef NO_BACKSPACE_KEY 3612#ifndef NO_BACKSPACE_KEY
3579 { 67, PrivMode_BackSpace }, 3613 { 67, PrivMode_BackSpace }, // DECBKM
3580#endif 3614#endif
3581 { 1000, PrivMode_MouseX11 }, 3615 { 1000, PrivMode_MouseX11 },
3582 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3616 { 1002, PrivMode_MouseBtnEvent },
3583 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3617 { 1003, PrivMode_MouseAnyEvent },
3584 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3585 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3618 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3586 { 1011, PrivMode_Keypress }, // rxvt extension 3619 { 1011, PrivMode_Keypress }, // rxvt extension
3587 // 1035 enable modifiers for alt, numlock NYI 3620 // 1035 enable modifiers for alt, numlock NYI
3588 // 1036 send ESC for meta keys NYI 3621 // 1036 send ESC for meta keys NYI
3589 // 1037 send DEL for keypad delete NYI 3622 // 1037 send DEL for keypad delete NYI
3590 { 1047, PrivMode_Screen }, 3623 { 1047, PrivMode_Screen },
3591 // 1048 save and restore cursor 3624 // 1048 save and restore cursor
3592 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3625 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3593 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3626 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3627 { 2004, PrivMode_BracketPaste },
3594 }; 3628 };
3595 3629
3596 if (nargs == 0) 3630 if (nargs == 0)
3597 return; 3631 return;
3598 3632
… …
3615 } 3649 }
3616 3650
3617 /* extra handling for values with state unkept */ 3651 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3652 switch (arg[i])
3619 { 3653 {
3654#if ENABLE_STYLES
3655 case 1021:
3656 set_option (Opt_intensityStyles, mode);
3657
3658 scr_touch (true);
3659 break;
3660#endif
3620 case 1048: /* alternative cursor save */ 3661 case 1048: /* alternative cursor save */
3662 case 1049:
3621 if (Options & Opt_secondaryScreen) 3663 if (option (Opt_secondaryScreen))
3622 if (mode == 0) 3664 if (mode == 0)
3623 scr_cursor (RESTORE); 3665 scr_cursor (RESTORE);
3624 else if (mode == 1) 3666 else if (mode == 1)
3625 scr_cursor (SAVE); 3667 scr_cursor (SAVE);
3626 break; 3668 break;
… …
3634 case 2: /* VT52 mode */ 3676 case 2: /* VT52 mode */
3635 /* oddball mode. should be set regardless of set/reset 3677 /* oddball mode. should be set regardless of set/reset
3636 * parameter. Return from VT52 mode with an ESC < from 3678 * parameter. Return from VT52 mode with an ESC < from
3637 * within VT52 mode 3679 * within VT52 mode
3638 */ 3680 */
3639 PrivMode (1, PrivMode_vt52); 3681 set_privmode (PrivMode_vt52, 1);
3640 break; 3682 break;
3641 case 3: /* 80/132 */ 3683 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 3684 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3685 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3644 break; 3686 break;
3645 case 4: /* smooth scrolling */ 3687 case 4: /* smooth scrolling */
3646 if (state) 3688 set_option (Opt_jumpScroll, !state);
3647 Options &= ~Opt_jumpScroll;
3648 else
3649 Options |= Opt_jumpScroll;
3650 break; 3689 break;
3651 case 5: /* reverse video */ 3690 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 3691 scr_rvideo_mode (state);
3653 break; 3692 break;
3654 case 6: /* relative/absolute origins */ 3693 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 3697 scr_autowrap (state);
3659 break; 3698 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 3699 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 3700 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 3702 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3664 break; 3703 break;
3665#ifdef menuBar_esc
3666 case menuBar_esc:
3667#ifdef MENUBAR
3668 map_menuBar (state);
3669#endif
3670 break;
3671#endif
3672#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3673 case scrollBar_esc: 3705 case scrollBar_esc:
3674 if (scrollbar_mapping (state)) 3706 if (scrollBar.map (state))
3675 { 3707 {
3676 resize_all_windows (0, 0, 0); 3708 resize_all_windows (0, 0, 0);
3677 scr_touch (true); 3709 scr_touch (true);
3678 } 3710 }
3679 break; 3711 break;
… …
3688 break; 3720 break;
3689 /* case 66: - application key pad */ 3721 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 3722 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 3723 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 3724 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 3725 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3726 break;
3695#if 0
3696 case 1001: 3727 case 1002:
3697 break; /* X11 mouse highlighting */ 3728 case 1003:
3698#endif 3729 if (state)
3730 {
3731 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3732 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3733 vt_emask_mouse = PointerMotionMask;
3734 }
3735 else
3736 vt_emask_mouse = NoEventMask;
3737
3738 vt_select_input ();
3739 break;
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 3740 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state)
3701 Options &= ~Opt_scrollTtyOutput;
3702 else
3703 Options |= Opt_scrollTtyOutput; 3741 set_option (Opt_scrollTtyOutput, !state);
3704 break; 3742 break;
3705 case 1011: /* scroll to bottom on key press */ 3743 case 1011: /* scroll to bottom on key press */
3706 if (state)
3707 Options |= Opt_scrollTtyKeypress; 3744 set_option (Opt_scrollTtyKeypress, state);
3708 else
3709 Options &= ~Opt_scrollTtyKeypress;
3710 break; 3745 break;
3711 case 1047: /* secondary screen w/ clearing last */ 3746 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 3747 if (option (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 3748 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 3749 scr_erase_screen (2);
3750
3715 scr_change_screen (state); 3751 scr_change_screen (state);
3716 break; 3752 break;
3717 case 1049: /* secondary screen w/ clearing first */ 3753 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 3754 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 3755 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3756 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 3757 scr_erase_screen (2);
3722 break; 3758 break;
3723 default: 3759 default:
3724 break; 3760 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 3786 rendset = 0, rendstyle = ~RS_None;
3751 break; 3787 break;
3752 case 1: 3788 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 3789 rendset = 1, rendstyle = RS_Bold;
3754 break; 3790 break;
3791 //case 2: // low intensity
3792 case 3:
3793 rendset = 1, rendstyle = RS_Italic;
3794 break;
3755 case 4: 3795 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 3796 rendset = 1, rendstyle = RS_Uline;
3757 break; 3797 break;
3758 case 5: 3798 case 5: // slowly blinking
3799 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 3800 rendset = 1, rendstyle = RS_Blink;
3760 break; 3801 break;
3761 //case 6: // scoansi light background 3802 //case 6: // scoansi light background
3762 case 7: 3803 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 3804 rendset = 1, rendstyle = RS_RVid;
3764 break; 3805 break;
3765 case 8: 3806 case 8:
3766 // invisible. NYI 3807 // invisible. NYI
3767 break; 3808 break;
3809 //case 9: // crossed out
3768 //case 10: // scoansi acs off 3810 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 3811 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 3812 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 3813 //...
3814 //case 19: // ninth alt font
3815 //case 20: // gothic
3816 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3817 rendset = 0, rendstyle = RS_Bold;
3773 break; 3818 break;
3774 case 22: 3819 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 3820 rendset = 0, rendstyle = RS_Bold;
3821 break;
3822 case 23: // disable italic
3823 rendset = 0, rendstyle = RS_Italic;
3776 break; 3824 break;
3777 case 24: 3825 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 3826 rendset = 0, rendstyle = RS_Uline;
3779 break; 3827 break;
3780 case 25: 3828 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 3829 rendset = 0, rendstyle = RS_Blink;
3782 break; 3830 break;
3831 case 26: // variable spacing (iso 8613)
3832 rendset = 0, rendstyle = RS_Blink;
3833 break;
3783 case 27: 3834 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 3835 rendset = 0, rendstyle = RS_RVid;
3785 break; 3836 break;
3786 case 28:
3787 // visible. NYI 3837 //case 28: // visible. NYI
3788 break; 3838 //case 29: // not crossed-out
3789 } 3839 }
3790 3840
3791 if (rendset != -1) 3841 if (rendset != -1)
3792 { 3842 {
3793 scr_rendition (rendset, rendstyle); 3843 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 3854 case 35:
3805 case 36: 3855 case 36:
3806 case 37: 3856 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3857 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 3858 break;
3809#ifdef TTY_256COLOR 3859 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 3860 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 3861 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3862 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 3863 i += 2;
3815 } 3864 }
3816 break; 3865 break;
3817#endif
3818 case 39: /* default fg */ 3866 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 3867 scr_color (Color_fg, Color_fg);
3820 break; 3868 break;
3821 3869
3822 case 40: 3870 case 40:
… …
3827 case 45: 3875 case 45:
3828 case 46: 3876 case 46:
3829 case 47: 3877 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3878 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 3879 break;
3832#ifdef TTY_256COLOR 3880 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 3881 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 3882 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3883 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 3884 i += 2;
3838 } 3885 }
3839 break; 3886 break;
3840#endif
3841 case 49: /* default bg */ 3887 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 3888 scr_color (Color_bg, Color_bg);
3843 break; 3889 break;
3844 3890
3845#ifndef NO_BRIGHTCOLOR 3891 //case 50: // not variable spacing
3892
3893#if !ENABLE_MINIMAL
3846 case 90: 3894 case 90:
3847 case 91: /* set bright fg color */ 3895 case 91: /* set bright fg color */
3848 case 92: 3896 case 92:
3849 case 93: 3897 case 93:
3850 case 94: 3898 case 94:
3851 case 95: 3899 case 95:
3852 case 96: 3900 case 96:
3853 case 97: 3901 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3902 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 3903 break;
3857 case 100: 3904 case 100:
3858 case 101: /* set bright bg color */ 3905 case 101: /* set bright bg color */
3859 case 102: 3906 case 102:
3860 case 103: 3907 case 103:
3861 case 104: 3908 case 104:
3862 case 105: 3909 case 105:
3863 case 106: 3910 case 106:
3864 case 107: 3911 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3912 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 3913 break;
3868#endif 3914#endif
3869
3870 } 3915 }
3871 } 3916 }
3872} 3917}
3873/*}}} */ 3918/*}}} */
3874 3919
… …
3877rxvt_term::process_graphics () 3922rxvt_term::process_graphics ()
3878{ 3923{
3879 unicode_t ch, cmd = cmd_getc (); 3924 unicode_t ch, cmd = cmd_getc ();
3880 3925
3881 if (cmd == 'Q') 3926 if (cmd == 'Q')
3927 {
3882 { /* query graphics */ 3928 /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 3929 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 3930 return;
3885 } 3931 }
3886 /* swallow other graphics sequences until terminating ':' */ 3932 /* swallow other graphics sequences until terminating ':' */
3887 do 3933 do
3888 ch = cmd_getc (); 3934 ch = cmd_getc ();
… …
3898 */ 3944 */
3899void 3945void
3900rxvt_term::tt_printf (const char *fmt,...) 3946rxvt_term::tt_printf (const char *fmt,...)
3901{ 3947{
3902 va_list arg_ptr; 3948 va_list arg_ptr;
3903 unsigned char buf[256]; 3949 char buf[256];
3904 3950
3905 va_start (arg_ptr, fmt); 3951 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3952 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 3953 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 3954 tt_write (buf, strlen (buf));
3909} 3955}
3910 3956
3911/* ---------------------------------------------------------------------- */ 3957/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 3958/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 3959 * or generated by us in response to a query ESC sequence.
3914 */ 3960 */
3915void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3917{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3961const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3919 3962
3920 if (len) 3963void
3964rxvt_term::tt_write (const char *data, unsigned int len)
3965{
3966 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3967 return;
3968
3969 if (pty->pty < 0)
3970 return;
3971
3972 if (v_buflen == 0)
3973 {
3974 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3975
3976 if ((unsigned int)written == len)
3977 return;
3978
3979 data += written;
3980 len -= written;
3921 { 3981 }
3982
3983 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3984
3985 memcpy (v_buffer + v_buflen, data, len);
3986 v_buflen += len;
3987
3988 pty_ev.set (ev::READ | ev::WRITE);
3989}
3990
3991void rxvt_term::pty_write ()
3992{
3993 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3922 if (v_buflen == 0) 3999 if (v_buflen == 0)
3923 { 4000 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4001 free (v_buffer);
3951 v_buffer = 0; 4002 v_buffer = 0;
3952 v_buflen = 0;
3953 4003
3954 pty_ev.set (EVENT_READ); 4004 pty_ev.set (ev::READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4005 return;
3967 } 4006 }
4007
4008 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4009 }
4010 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4011 pty_ev.set (ev::READ);
3969} 4012}
3970 4013
3971/*----------------------- end-of-file (C source) -----------------------*/ 4014/*----------------------- end-of-file (C source) -----------------------*/
3972 4015

Diff Legend

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