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

Diff Legend

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