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

Diff Legend

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