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

Diff Legend

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