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.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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