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.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

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

Diff Legend

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