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

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

Diff Legend

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