ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

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

Diff Legend

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