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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

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

Diff Legend

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