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

Diff Legend

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