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

Diff Legend

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