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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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