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

Diff Legend

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