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

Diff Legend

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