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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
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; 70
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_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0,
107 XK_Home, 0x21f1,
108 XK_End, 0x21f2,
109
110 XK_Execute, 0x2318,
111 XK_Begin, 0x2320,
112 XK_Delete, 0x2326,
113 XK_Clear, 0x2327,
114 XK_BackSpace, 0x232b,
115 XK_Insert, 0x2380,
116 XK_Control_L, 0x2388,
117 XK_Control_R, 0x2388,
118 XK_Pause, 0x2389,
119 XK_Break, 0x238a,
120 XK_Escape, 0x238b,
121 XK_Undo, 0x238c,
122 XK_Print, 0x2399,
123
124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
132 XK_KP_Space, 0x2422,
133#endif
134 0,
135};
136
137void
138rxvt_term::iso14755_54 (int x, int y)
139{
140 x = Pixel2Col (x);
141 y = Pixel2Row (y);
142
143 if (!IN_RANGE_EXC (x, 0, ncol)
144 || !IN_RANGE_EXC (y, 0, nrow))
145 return;
146
147 for (;;)
148 {
149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
152
153 if (t != NOCHAR || !x)
154 {
155 iso14755_51 (l.t[x], l.r[x], x, y);
156 iso14755buf = ISO_14755_54;
157 break;
158 }
159
160 x--;
161 }
162}
163
164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname;
170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173
174# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch))
176 {
177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr);
180 }
181 else
182# endif
183 {
184 ch2 = ch;
185
186 alloc = 0;
187 chr = &ch2;
188 len = 1;
189 }
190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
215
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217
218 for (int y = 0; y < len; y++)
219 {
220 char buf[9];
221
222 ch = *chr++;
223
224 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '=');
227# if !UNICODE3
228 if (ch >= 0x10000)
229 ch = 0xfffd;
230# endif
231 scr_overlay_set (11, y, ch, r);
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname);
237
238 free (fname);
239
240# if ENABLE_COMBINING
241 if (alloc)
242 delete [] alloc;
243# endif
244}
245#endif
246
247void
248rxvt_term::commit_iso14755 ()
249{
250 wchar_t ch[2];
251
252 ch[0] = iso14755buf & ISO_14755_MASK;
253 ch[1] = 0;
254
255 if (iso14755buf & ISO_14755_51)
256 {
257 char mb[16];
258 int len;
259
260 // allow verbatim 0-bytes and control-bytes to be entered
261 if (ch[0] >= 0x20)
262 len = wcstombs (mb, ch, 16);
263 else
264 {
265 mb[0] = ch[0];
266 len = 1;
267 }
268
269 if (len > 0)
270 tt_write (mb, len);
271 else
272 scr_bell ();
273 }
274
275 iso14755buf = 0;
276}
277
278int
279rxvt_term::hex_keyval (XKeyEvent &ev)
280{
281 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++)
284 {
285 KeySym k = XLookupKeysym (&ev, index);
286
287 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
288 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
289 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
290 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
291 }
292
293 return -1;
294}
295#endif
61 296
62/*{{{ Convert the keypress event into a string */ 297/*{{{ Convert the keypress event into a string */
63void 298void
64rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
65{ 300{
… …
68 KeySym keysym; 303 KeySym keysym;
69#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
71#endif 306#endif
72 int valid_keysym; 307 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
74 309
75 /* 310 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
78 * 313 *
79 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
80 */ 315 */
81 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
84 319
85 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
86 { 321 {
87 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 331 Status status_return;
97 332
98#if 0 333#if 0
99#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
103 else 338 else
104#endif 339#endif
105#endif 340#endif
106 { 341 {
… …
108 343
109 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
113 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
116 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 354 SET_LOCALE (locale);
118 355
119 if (status_return == XLookupChars 356 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
142 } 379 }
143 else 380 else
144#endif 381#endif
145 { 382 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
148 } 385 }
149 386
150 if (valid_keysym) 387 if (valid_keysym)
151 { 388 {
389#ifdef KEYSYM_RESOURCE
390 if (keyboard->dispatch (this, keysym, ev.state))
391 return;
392#endif
393
152 if (TermWin.saveLines) 394 if (saveLines)
153 { 395 {
154#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 397 if (!ctrl && !meta)
156 {
157#else 398#else
158 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
400#endif
159 { 401 {
160#endif
161 int lnsppg; 402 int lnsppg;
162 403
163#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 406#else
166 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
167#endif 408#endif
168 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
169 { 410 {
170 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
171 return; 412 return;
… …
199 scr_move_to (0, 1); 440 scr_move_to (0, 1);
200 return; 441 return;
201 } 442 }
202 else if (keysym == XK_End) 443 else if (keysym == XK_End)
203 { 444 {
204 scr_move_to (1, 0); 445 scr_move_to (1, 1);
205 return; 446 return;
206 } 447 }
207 } 448 }
208#endif 449#endif
209 } 450 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 455 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 456 {
216 keysym += (XK_F11 - XK_F1); 457 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 458 shft = 0; /* turn off Shift */
218 } 459 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 460 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 461 {
221 switch (keysym) 462 switch (keysym)
222 { 463 {
223 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
226 return; 467 return;
468#if TODO
227 /* rxvt extras */ 469 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 471 change_font (FONT_UP);
230 return; 472 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 473 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 474 change_font (FONT_DN);
233 return; 475 return;
476#endif
234 } 477 }
235 } 478 }
236 } 479 }
237#ifdef PRINTPIPE 480
238 if (keysym == XK_Print) 481#if ENABLE_FRILLS || ISO_14755
239 { 482 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 483 if (shft && ctrl)
241 return;
242 } 484 {
243#endif 485 int hv;
244 486
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 487 if (iso14755buf & ISO_14755_51
246 { 488 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 489 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 490 {
250 unsigned int l; 491 commit_iso14755 ();
251 const unsigned char *kbuf0; 492 iso14755buf = ISO_14755_51;
252 493# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 494 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 495# endif
261 ) 496 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 497 }
266 498 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 499 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51;
502# if ISO_14755
503 iso14755_51 (iso14755buf & ISO_14755_MASK);
504# endif
268 return; 505 return;
269 } 506 }
270 else 507 else
508 {
509# if ENABLE_OVERLAY
510 scr_overlay_off ();
271#endif 511# endif
512 iso14755buf = 0;
513 }
514 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED))
518 {
519 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif
524 }
525#endif
526
527#ifdef PRINTPIPE
528 if (keysym == XK_Print)
529 {
530 scr_printscreen (ctrl | shft);
531 return;
532 }
533#endif
534
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 {
272 { 537 {
273 newlen = 1; 538 newlen = 1;
274 switch (keysym) 539 switch (keysym)
275 { 540 {
276#ifndef NO_BACKSPACE_KEY 541#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 542 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 543 if (priv_modes & PrivMode_HaveBackSpace)
279 { 544 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 546 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 547 kbuf[1] = '\0';
283 } 548 }
284 else 549 else
285 STRCPY (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
286 break; 551 break;
287#endif 552#endif
288#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
289 case XK_Delete: 564 case XK_Delete:
290 STRCPY (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
291 break; 566 break;
292#endif 567#endif
293 case XK_Tab: 568 case XK_Tab:
294 if (shft) 569 if (shft)
295 STRCPY (kbuf, "\033[Z"); 570 strcpy (kbuf, "\033[Z");
296 else 571 else
297 { 572 {
298#ifdef CTRL_TAB_MAKES_META 573#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 574 if (ctrl)
300 meta = 1; 575 meta = 1;
… …
306 newlen = 0; 581 newlen = 0;
307 } 582 }
308 break; 583 break;
309 584
310#ifdef XK_KP_Left 585#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 586 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 587 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 588 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 589 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 591 {
317 STRCPY (kbuf, "\033OZ"); 592 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 594 break;
320 } 595 }
321 else 596 else
322 /* translate to std. cursor key */ 597 /* translate to std. cursor key */
… …
325#endif 600#endif
326 case XK_Up: /* "\033[A" */ 601 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 602 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 603 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 604 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 606 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 607 /* do Shift first */
333 if (shft) 608 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 609 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 610 else if (ctrl)
336 { 611 {
337 kbuf[1] = 'O'; 612 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 613 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 614 }
340 else if (PrivateModes & PrivMode_aplCUR) 615 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 616 kbuf[1] = 'O';
342 break; 617 break;
343 618
344#ifndef UNSHIFTED_SCROLLKEYS 619#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 620# ifdef XK_KP_Prior
346 case XK_KP_Prior: 621 case XK_KP_Prior:
347 /* allow shift to override */ 622 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 624 {
350 STRCPY (kbuf, "\033Oy"); 625 strcpy (kbuf, "\033Oy");
351 break; 626 break;
352 } 627 }
353 /* FALLTHROUGH */ 628 /* FALLTHROUGH */
354# endif 629# endif
355 case XK_Prior: 630 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 631 strcpy (kbuf, "\033[5~");
357 break; 632 break;
358# ifdef XK_KP_Next 633# ifdef XK_KP_Next
359 case XK_KP_Next: 634 case XK_KP_Next:
360 /* allow shift to override */ 635 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 637 {
363 STRCPY (kbuf, "\033Os"); 638 strcpy (kbuf, "\033Os");
364 break; 639 break;
365 } 640 }
366 /* FALLTHROUGH */ 641 /* FALLTHROUGH */
367# endif 642# endif
368 case XK_Next: 643 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
370 break; 645 break;
371#endif 646#endif
372 case XK_KP_Enter: 647 case XK_KP_Enter:
373 /* allow shift to override */ 648 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 650 {
376 STRCPY (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
377 } 663 }
378 else 664 else
379 { 665 {
380 kbuf[0] = '\r'; 666 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
382 } 668 }
383 break; 669 break;
384 670
385#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
386 case XK_KP_Begin: 672 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
388 break; 674 break;
389 675
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 676#endif
398 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 681 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 682 kbuf[2] += (keysym - XK_KP_F1);
404 break; 683 break;
405 684
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 685 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 686 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 697 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 698 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 699 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 700 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 701 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 703 {
425 STRCPY (kbuf, "\033Oj"); 704 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 705 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 706 }
428 else 707 else
429 { 708 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 710 kbuf[1] = '\0';
432 } 711 }
433 break; 712 break;
434 713
435 case XK_Find: 714 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
437 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
438 case XK_Insert: 728 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
440 break; 730 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 732 case DXK_Remove:
443 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
444#endif 734#endif
445 case XK_Execute: 735 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 736 strcpy (kbuf, "\033[3~");
447 break; 737 break;
448 case XK_Select: 738 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 739 strcpy (kbuf, "\033[4~");
450 break; 740 break;
451#ifdef XK_KP_End 741#ifdef XK_KP_End
452 case XK_KP_End: 742 case XK_KP_End:
453 /* allow shift to override */ 743 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 745 {
456 STRCPY (kbuf, "\033Oq"); 746 strcpy (kbuf, "\033Oq");
457 break; 747 break;
458 } 748 }
459 /* FALLTHROUGH */ 749 /* FALLTHROUGH */
460#endif 750#endif
461 case XK_End: 751 case XK_End:
462 STRCPY (kbuf, KS_END); 752 strcpy (kbuf, KS_END);
463 break; 753 break;
464#ifdef XK_KP_Home 754#ifdef XK_KP_Home
465 case XK_KP_Home: 755 case XK_KP_Home:
466 /* allow shift to override */ 756 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 758 {
469 STRCPY (kbuf, "\033Ow"); 759 strcpy (kbuf, "\033Ow");
470 break; 760 break;
471 } 761 }
472 /* FALLTHROUGH */ 762 /* FALLTHROUGH */
473#endif 763#endif
474 case XK_Home: 764 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 765 strcpy (kbuf, KS_HOME);
476 break; 766 break;
477 767
478#define FKEY(n, fkey) \ 768#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 770
… …
532#undef FKEY 822#undef FKEY
533 default: 823 default:
534 newlen = 0; 824 newlen = 0;
535 break; 825 break;
536 } 826 }
827
537 if (newlen) 828 if (newlen)
538 len = STRLEN (kbuf); 829 len = strlen (kbuf);
539 } 830 }
540 831
541 /* 832 /*
542 * Pass meta for all function keys, if 'meta' option set 833 * Pass meta for all function keys, if 'meta' option set
543 */ 834 */
… …
550 else if (ctrl && keysym == XK_minus) 841 else if (ctrl && keysym == XK_minus)
551 { 842 {
552 len = 1; 843 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 844 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 845 }
846 else if (keysym == XK_ISO_Left_Tab)
847 {
848 strcpy (kbuf, "\033[Z");
849 len = 3;
850 }
555 else 851 else
556 { 852 {
557#ifdef META8_OPTION 853#ifdef META8_OPTION
558 /* set 8-bit on */ 854 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
560 { 856 {
561 unsigned char *ch; 857 char *ch;
562 858
563 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 860 *ch |= 0x80;
565 861
566 meta = 0; 862 meta = 0;
… …
568#endif 864#endif
569 /* nil */ ; 865 /* nil */ ;
570 } 866 }
571 } 867 }
572 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
573 if (len <= 0) 872 if (len <= 0)
574 return; /* not mapped */ 873 return; /* not mapped */
575 874
576 if (Options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 876 if (view_start)
578 { 877 {
579 TermWin.view_start = 0; 878 view_start = 0;
580 want_refresh = 1; 879 want_refresh = 1;
581 } 880 }
582 881
583 /* 882 /*
584 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 898#ifdef META8_OPTION
600 && meta_char == C0_ESC 899 && meta_char == C0_ESC
601#endif 900#endif
602 ) 901 )
603 { 902 {
604 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
605 tt_write (&ch, 1); 904 tt_write (&ch, 1);
606 } 905 }
607 906
608#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
617#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
619} 918}
620/*}}} */ 919/*}}} */
621 920
622#if (MENUBAR_MAX) 921#if defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 922unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 924{
628 unsigned int n, s; 925 unsigned int n, s;
629 926
630 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 929
633 if (n > 0 && s < count) 930 if (n > 0 && s < count)
634 { 931 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 932 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 933 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 934 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 935 cmdbuf_endp -= n;
639 s += n; 936 s += n;
640 } 937 }
… …
650 947
651 cmd_parse (); 948 cmd_parse ();
652 949
653 return 0; 950 return 0;
654} 951}
655#endif /* MENUBAR_MAX */ 952#endif
656 953
657void 954void
658rxvt_term::flush () 955rxvt_term::flush ()
659{ 956{
957 flush_ev.stop ();
958
660#ifdef TRANSPARENT 959#ifdef TRANSPARENT
661 if (want_full_refresh) 960 if (want_full_refresh)
662 { 961 {
663 want_full_refresh = 0; 962 want_full_refresh = 0;
664 scr_clear (); 963 scr_clear ();
665 scr_touch (false); 964 scr_touch (false);
666 want_refresh = 1;
667 } 965 }
668#endif 966#endif
669 967
670 if (want_refresh) 968 if (want_refresh)
671 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
672 scr_refresh (refresh_type); 1008 scr_refresh ();
673 scrollbar_show (1); 1009 scrollbar_show (1);
674#ifdef USE_XIM 1010#ifdef USE_XIM
675 IMSendSpot (); 1011 IMSendSpot ();
676#endif 1012#endif
677
678 } 1013 }
679 1014
680 display->flush (); 1015 display->flush ();
681} 1016}
682 1017
683void 1018void
684rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
685{ 1020{
686 SET_R (this); 1021 make_current ();
687 SET_LOCALE (locale);
688 1022
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0;
689 flush (); 1036 flush ();
690} 1037}
691 1038
692#ifdef CURSOR_BLINK 1039#ifdef CURSOR_BLINK
693void 1040void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1042{
696 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1044 want_refresh = 1;
698 1045
699 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1047}
701#endif 1048#endif
702 1049
703#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
704void 1051void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1058 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1059 }
713} 1060}
714#endif 1061#endif
715 1062
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void
1065rxvt_term::cont_scroll_cb (time_watcher &w)
1066{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 }
1073}
1074#endif
1075
1076#ifdef SELECTION_SCROLLING
1077void
1078rxvt_term::sel_scroll_cb (time_watcher &w)
1079{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 }
1086}
1087#endif
1088
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void
1091rxvt_term::slip_wheel_cb (time_watcher &w)
1092{
1093 if (mouse_slip_wheel_speed == 0
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 }
1103}
1104#endif
1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
716bool 1124bool
717rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
718{ 1126{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128
1129 if (CBUFSIZ == n)
1130 {
1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1132 n = 0;
1133 }
720 1134
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
724 1138
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1140
727 if (n > 0) 1141 if (r > 0)
728 { 1142 {
729 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
730 return true; 1144 return true;
731 } 1145 }
732 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
733 destroy (); 1158 destroy ();
1159 }
734 1160
735 return false; 1161 return false;
736} 1162}
737 1163
738void 1164void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1166{
741 SET_R (this); 1167 make_current ();
742 SET_LOCALE (locale); 1168
1169 if (revents & EVENT_READ)
1170 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ())
1172 if (cmd_parse ())
1173 break;
743 1174
744 if (revents & EVENT_WRITE) 1175 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1176 pty_write ();
746 else if (revents & EVENT_READ) 1177}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1178
760 if (cmd_parse ()) 1179void
761 break; 1180rxvt_term::pointer_unblank ()
762 } 1181{
763 } 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1183 recolour_cursor ();
1184
1185#ifdef POINTER_BLANK
1186 hidden_pointer = 0;
1187
1188 if (OPTION (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif
764} 1191}
765 1192
766#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
767void 1194void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
781{ 1196{
782 if (! (Options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
783 return; 1198 return;
784 1199
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1201 XFlush (display->display);
787 1202
788 hidden_pointer = 1; 1203 hidden_pointer = 1;
789} 1204}
790 1205
791void 1206void
792rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
793{ 1208{
794 SET_R (this); 1209 make_current ();
795 SET_LOCALE (locale);
796 1210
797 pointer_blank (); 1211 pointer_blank ();
798} 1212}
799#endif 1213#endif
800 1214
… …
807 x = ev.x; 1221 x = ev.x;
808 y = ev.y; 1222 y = ev.y;
809 pixel_position (&x, &y); 1223 pixel_position (&x, &y);
810 1224
811 if (MEvent.button == AnyButton) 1225 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1226 button_number = 3;
814 }
815 else 1227 else
816 { 1228 {
817 button_number = MEvent.button - Button1; 1229 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1230 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1231 if (button_number >= 3)
820 button_number += (64 - 3); 1232 button_number += (64 - 3);
821 } 1233 }
822 1234
823 if (PrivateModes & PrivMode_MouseX10) 1235 if (priv_modes & PrivMode_MouseX10)
824 { 1236 {
825 /* 1237 /*
826 * do not report ButtonRelease 1238 * do not report ButtonRelease
827 * no state info allowed 1239 * no state info allowed
828 */ 1240 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1255 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1256 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1257#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1258 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1259#endif
848
849 } 1260 }
850 1261
851#ifdef DEBUG_MOUSEREPORT 1262#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1263 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1264 if (key_state & 16)
854 fputc ('C', stderr); 1265 fputc ('C', stderr);
855 if (key_state & 4) 1266 if (key_state & 4)
856 fputc ('S', stderr); 1267 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1271 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1272 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1273 button_number,
863 x + 1, 1274 x + 1,
864 y + 1); 1275 y + 1);
865#else 1276#endif
1277
866 tt_printf ("\033[M%c%c%c", 1278 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
868 (32 + x + 1), 1280 (32 + x + 1),
869 (32 + y + 1)); 1281 (32 + y + 1));
870#endif
871} 1282}
872 1283
873#ifdef USING_W11LIB 1284#ifdef USING_W11LIB
874void 1285void
875rxvt_W11_process_x_event (XEvent *ev) 1286rxvt_W11_process_x_event (XEvent *ev)
… …
882 1293
883/*{{{ process an X event */ 1294/*{{{ process an X event */
884void 1295void
885rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
886{ 1297{
887 SET_R (this); 1298 make_current ();
888 SET_LOCALE (locale);
889 1299
890#if defined(CURSOR_BLINK) 1300 dDisp;
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1301
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
900 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1305 return;
920#endif
921 1306
1307 // for XQueryPointer
922 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1310 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1311
975 switch (ev.type) 1312 switch (ev.type)
976 { 1313 {
977 case KeyPress: 1314 case KeyPress:
1315#if ISO_14755
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
978 lookup_key (ev.xkey); 1318 lookup_key (ev.xkey);
1319
1320 break;
1321
1322 case KeyRelease:
1323 {
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
979 break; 1386 break;
980 1387
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
986 else 1393#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1394 break;
995 } 1395 }
996#endif
997 1396
998 case ButtonPress: 1397 case ButtonPress:
999 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1000 break; 1399 break;
1001 1400
… …
1003 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1004 break; 1403 break;
1005 1404
1006 case ClientMessage: 1405 case ClientMessage:
1007 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1408 {
1017 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1410 {
1019 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1412 {
1021 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1414 {
1023 XGetWindowProperty (display->display, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1416 destroy ();
1025 0L, 1000000L, 1417 }
1026 False, AnyPropertyType, 1418#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1422 &ev);
1030 XChangeProperty (display->display, display->root, 1423#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1424 }
1032 8, PropModeReplace, 1425 }
1033 data, STRLEN (data)); 1426#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1036 } 1435 }
1037#endif /* OFFIX_DND */
1038 break; 1436 break;
1039 1437
1040 case MappingNotify: 1438 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1440 break;
1043 1441
1044 /* 1442 /*
1045 * XXX: this is not the _current_ arrangement 1443 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1444 * Here's my conclusion:
… …
1065 break; 1463 break;
1066 } 1464 }
1067 break; 1465 break;
1068 1466
1069 case FocusIn: 1467 case FocusIn:
1070 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1071 { 1477 {
1072 TermWin.focus = 1; 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1479 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1480
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 {
1483 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 }
1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1083 } 1493 }
1084 break; 1494 break;
1085 1495
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1496 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1498 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1500
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 }
1138 break; 1501 break;
1139 1502
1140 case SelectionClear: 1503 case SelectionClear:
1141 selection_clear (); 1504 selection_clear ();
1142 break; 1505 break;
1143 1506
1144 case SelectionNotify: 1507 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1510 break;
1149 1511
1150 case SelectionRequest: 1512 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1152 break; 1514 break;
1153 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1154 case UnmapNotify: 1524 case UnmapNotify:
1155 TermWin.mapped = 0; 1525 mapped = 0;
1156#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1158#endif 1528#endif
1159 break; 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break; 1530 break;
1167 1531
1168#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1169 case ReparentNotify: 1533 case ReparentNotify:
1170 rootwin_cb (ev); 1534 rootwin_cb (ev);
1171 break; 1535 break;
1172#endif /* TRANSPARENT */ 1536#endif /* TRANSPARENT */
1173 1537
1174 case GraphicsExpose: 1538 case GraphicsExpose:
1175 case Expose: 1539 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1177 { 1541 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1542 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1546
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1552
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1553 want_refresh = 1;
1189 } 1554 }
1190 else 1555 else
1191 { 1556 {
1192 XEvent unused_event; 1557 XEvent unused_event;
1193 1558
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1560 ;
1196 &unused_event)) ; 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1562 ;
1198 GraphicsExpose, 1563
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1201 { 1565 {
1202 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1203 scrollbar_show (0); 1567 scrollbar_show (0);
1204 } 1568 }
1205#ifdef MENUBAR 1569
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1570#ifdef TRANSPARENT
1207 menubar_expose (); 1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window);
1208#endif 1573#endif
1209 } 1574 }
1210 break; 1575 break;
1211 1576
1212 case MotionNotify: 1577 case MotionNotify:
1213#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1579 if (hidden_pointer)
1215 pointer_unblank (); 1580 pointer_unblank ();
1216#endif 1581#endif
1217#if MENUBAR 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1583 break;
1584
1585 if (ev.xany.window == vt)
1219 { 1586 {
1220 menubar_control (ev.xbutton); 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1589 ; // nop
1223#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break;
1226
1227 if (ev.xany.window == TermWin.vt)
1228 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1591 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1593 ;
1233 1594
1234 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1598 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1599 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1601 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1602 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1603 {
1243#endif 1604#endif
1605#if ISO_14755
1606 // 5.4
1607 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1608 {
1609 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1610 break;
1611 }
1612#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1615
1246#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1619 {
1250 int dist; 1620 int dist;
1251
1252 pending_scroll_selection=1;
1253 1621
1254 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
1256 */ 1624 */
1257 if (scroll_selection_delay<=0) 1625 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1627
1260 /* save the event params so we can highlight 1628 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1629 * the selection in the pending-scroll loop
1262 */ 1630 */
1263 selection_save_x=ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1634
1268 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1270 { 1637 {
1271 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1273 } 1640 }
1274 else 1641 else
1275 { 1642 {
1276 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1644 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1645 }
1646
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1647 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1;
1282 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1284 } 1652 }
1285 else 1653 else
1286 { 1654 {
1287 /* we are within the text window, so we 1655 /* we are within the text window, so we
1288 * shouldn't be scrolling 1656 * shouldn't be scrolling
1289 */ 1657 */
1290 pending_scroll_selection = 0; 1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop();
1291 } 1660 }
1292#endif 1661#endif
1293#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1294
1295 } 1663 }
1296#endif 1664#endif
1297
1298 } 1665 }
1299 } 1666 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1668 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1670 MotionNotify, &ev))
1671 ;
1672
1304 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1676 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1677 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1679 scrollbar_size ());
1311 scr_refresh (refresh_type); 1680 want_refresh = 1;
1312 refresh_limit = 0; 1681 refresh_limit = 0;
1313 scrollbar_show (1); 1682 scrollbar_show (1);
1314 } 1683 }
1315 break; 1684 break;
1316 } 1685 }
1317}
1318 1686
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1715}
1716
1717void
1718rxvt_term::focus_in ()
1719{
1720 if (!focus)
1721 {
1722 focus = 1;
1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1726
1727#if USE_XIM
1728 if (Input_Context != NULL)
1729 {
1730 IMSetStatusPosition ();
1731 XSetICFocus (Input_Context);
1732 }
1733#endif
1734#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_focused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1746}
1747
1748void
1749rxvt_term::focus_out ()
1750{
1751 if (focus)
1752 {
1753 focus = 0;
1754 want_refresh = 1;
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1757
1758#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf)
1760 {
1761 iso14755buf = 0;
1762# if ENABLE_OVERLAY
1763 scr_overlay_off ();
1764# endif
1765 }
1766#endif
1767#if USE_XIM
1768 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context);
1770#endif
1771#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.stop ();
1774 hidden_cursor = 0;
1775#endif
1776#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade])
1778 {
1779 pix_colors = pix_colors_unfocused;
1780 scr_recolour ();
1781 }
1782#endif
1783 }
1784}
1785
1786#if TRANSPARENT
1319void 1787void
1320rxvt_term::rootwin_cb (XEvent &ev) 1788rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1789{
1322 SET_R (this); 1790 make_current ();
1323 SET_LOCALE (locale);
1324 1791
1325 switch (ev.type) 1792 switch (ev.type)
1326 { 1793 {
1327 case PropertyNotify: 1794 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1795 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1340 */ 1798 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1799 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1801 return;
1346 }
1347 1802
1348 /* FALLTHROUGH */ 1803 /* FALLTHROUGH */
1349 case ReparentNotify: 1804 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1806 want_refresh = want_full_refresh = 1;
1353 break; 1807 break;
1354#endif
1355 } 1808 }
1356} 1809}
1810#endif
1357 1811
1358void 1812void
1359rxvt_term::button_press (XButtonEvent &ev) 1813rxvt_term::button_press (XButtonEvent &ev)
1360{ 1814{
1361 int reportmode = 0, clickintime; 1815 int reportmode = 0, clickintime;
1362 1816
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1817 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1818
1364 if (!bypass_keystate) 1819 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1820 reportmode = !! (priv_modes & PrivMode_mouse_report);
1821
1366 /* 1822 /*
1367 * VT window processing of button press 1823 * VT window processing of button press
1368 */ 1824 */
1369 if (ev.window == TermWin.vt) 1825 if (ev.window == vt)
1370 { 1826 {
1827#if ISO_14755
1828 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 {
1831 iso14755_54 (ev.x, ev.y);
1832 return;
1833 }
1834#endif
1835
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1836 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1837
1372 if (reportmode) 1838 if (reportmode)
1373 { 1839 {
1374 /* mouse report from vt window */ 1840 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1841 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1842 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1843#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1844 if (ev.button == MEvent.button && clickintime)
1379 { 1845 {
1380 /* same button, within alloted time */ 1846 /* same button, within alloted time */
1381 MEvent.clicks++; 1847 MEvent.clicks++;
1848
1382 if (MEvent.clicks > 1) 1849 if (MEvent.clicks > 1)
1383 { 1850 {
1384 /* only report double clicks */ 1851 /* only report double clicks */
1385 MEvent.clicks = 2; 1852 MEvent.clicks = 2;
1386 mouse_report (ev); 1853 mouse_report (ev);
… …
1405 } 1872 }
1406 else 1873 else
1407 { 1874 {
1408 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1876 MEvent.clicks = 0;
1877
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1879 switch (ev.button)
1411 { 1880 {
1412 case Button1: 1881 case Button1:
1882 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */
1884#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask);
1886#else
1887 selection.rect = false;
1888#endif
1889
1413 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1892 {
1416 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1418 else 1895 else
1419 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1420 } 1897 }
1421 else 1898 else
1422 { 1899 {
1423 if (MEvent.button == Button1 && clickintime) 1900 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1901 MEvent.clicks++;
1425 else 1902 else
1426 MEvent.clicks = 1; 1903 MEvent.clicks = 1;
1427 1904
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1905 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1906 }
1430 1907
1431 MEvent.button = Button1; 1908 MEvent.button = Button1;
1432 break; 1909 break;
1433 1910
1434 case Button3: 1911 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1437 else 1914 else
1438 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1916
1439 MEvent.button = Button3; 1917 MEvent.button = Button3;
1440 break; 1918 break;
1441 } 1919 }
1442 } 1920 }
1921
1443 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1444 return; 1923 return;
1445 } 1924 }
1446 1925
1447 /* 1926 /*
… …
1513 upordown = 1; /* down */ 1992 upordown = 1; /* down */
1514 } 1993 }
1515 if (upordown) 1994 if (upordown)
1516 { 1995 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1997 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1998#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1999 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2000 {
1522 if (upordown < 0) 2001 if (upordown < 0)
1523 scrollBar.setUp (); 2002 scrollBar.setUp ();
… …
1539 break; 2018 break;
1540 case R_SB_ALIGN_BOTTOM: 2019 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2020 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2021 break;
1543 } 2022 }
2023
1544 if (scrollBar.style == R_SB_XTERM 2024 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2025 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2026 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2028
1549 scrollBar.setMotion (); 2029 scrollBar.setMotion ();
1550 break; 2030 break;
1551 2031
1552 case Button1: 2032 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2033 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2037 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2038 if (scrollBar.style != R_SB_XTERM)
1559 { 2039 {
1560 if (scrollbar_above_slider (ev.y)) 2040 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2041# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2042 scr_page (UP, nrow - 1);
1563# else 2043# else
1564 scr_page (UP, TermWin.nrow / 4); 2044 scr_page (UP, nrow / 4);
1565# endif 2045# endif
1566 else if (scrollbar_below_slider (ev.y)) 2046 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2047# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2048 scr_page (DN, nrow - 1);
1569# else 2049# else
1570 scr_page (DN, TermWin.nrow / 4); 2050 scr_page (DN, nrow / 4);
1571# endif 2051# endif
1572 else 2052 else
1573 scrollBar.setMotion (); 2053 scrollBar.setMotion ();
1574 } 2054 }
1575 else 2055 else
1576 { 2056 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2057 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2058 (nrow
1579 * scrollbar_position (ev.y) 2059 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2060 / scrollbar_size ()));
1581 } 2061 }
2062
1582 break; 2063 break;
1583 } 2064 }
1584 } 2065 }
2066
1585 return; 2067 return;
1586 } 2068 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2069}
1595 2070
1596void 2071void
1597rxvt_term::button_release (XButtonEvent &ev) 2072rxvt_term::button_release (XButtonEvent &ev)
1598{ 2073{
1599 int reportmode = 0; 2074 int reportmode = 0;
1600 2075
1601 csrO = 0; /* reset csr Offset */ 2076 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2077 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2078 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2079
1605 if (scrollbar_isUpDn ()) 2080 if (scrollbar_isUpDn ())
1606 { 2081 {
1607 scrollBar.setIdle (); 2082 scrollBar.setIdle ();
1608 scrollbar_show (0); 2083 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2084 }
2085
1614#ifdef SELECTION_SCROLLING 2086#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2087 if (sel_scroll_ev.active)
2088 sel_scroll_ev.stop();
1616#endif 2089#endif
2090
1617 if (ev.window == TermWin.vt) 2091 if (ev.window == vt)
1618 { 2092 {
2093#if ISO_14755
2094 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return;
2097#endif
1619 if (reportmode) 2098 if (reportmode)
1620 { 2099 {
1621 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
1638 mouse_report (ev); 2117 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2119 return;
1641 } 2120 }
2121
1642 /* 2122 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2124 * when overriding mouse reporting
1645 */ 2125 */
1646 if (PrivateModes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2127 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2130
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
1650 2133
1651 switch (ev.button) 2134 switch (ev.button)
1652 { 2135 {
1653 case Button1: 2136 case Button1:
1654 case Button3: 2137 case Button3:
1655 selection_make (ev.time); 2138 selection_make (ev.time);
1656 break; 2139 break;
2140
1657 case Button2: 2141 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2144 break;
2145
1660#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
1661 case Button4: 2147 case Button4:
1662 case Button5: 2148 case Button5:
1663 { 2149 {
1664 int i; 2150 int i;
1665 page_dirn v; 2151 page_dirn v;
1666 2152
1667 v = (ev.button == Button4) ? UP : DN; 2153 v = ev.button == Button4 ? UP : DN;
2154
1668 if (ev.state & ShiftMask) 2155 if (ev.state & ShiftMask)
1669 i = 1; 2156 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2157 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2158 i = nrow - 1;
1672 else 2159 else
1673 i = 5; 2160 i = 5;
2161
1674# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2163 if (ev.state & ControlMask)
1676 { 2164 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2165 mouse_slip_wheel_speed += v ? -1 : 1;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168
2169 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2170 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2171
2172 slip_wheel_ev.start ();
2173 }
2174 else
2175 {
2176# endif
2177 scr_page (v, i);
2178 scrollbar_show (1);
2179# ifdef MOUSE_SLIP_WHEELING
1679 } 2180 }
1680# endif 2181# endif
1681# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1);
1691 }
1692# endif
1693
1694 } 2182 }
1695 break; 2183 break;
1696#endif 2184#endif
1697
1698 } 2185 }
1699 } 2186 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704} 2187}
1705
1706 2188
1707#ifdef TRANSPARENT 2189#ifdef TRANSPARENT
2190#if TINTING
2191/* taken from aterm-0.4.2 */
2192
2193typedef uint32_t RUINT32T;
2194
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{
2197 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i;
2203
2204 Visual *visual = display->visual;
2205
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208 /* for convenience */
2209 mask_r = visual->red_mask;
2210 mask_g = visual->green_mask;
2211 mask_b = visual->blue_mask;
2212
2213 /* boring lookup table pre-initialization */
2214 switch (srcImage->bits_per_pixel) {
2215 case 15:
2216 if ((mask_r != 0x7c00) ||
2217 (mask_g != 0x03e0) ||
2218 (mask_b != 0x001f))
2219 return;
2220 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221 lookup_r = lookup;
2222 lookup_g = lookup+32;
2223 lookup_b = lookup+32+32;
2224 sh_r = 10;
2225 sh_g = 5;
2226 sh_b = 0;
2227 break;
2228 case 16:
2229 if ((mask_r != 0xf800) ||
2230 (mask_g != 0x07e0) ||
2231 (mask_b != 0x001f))
2232 return;
2233 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234 lookup_r = lookup;
2235 lookup_g = lookup+32;
2236 lookup_b = lookup+32+64;
2237 sh_r = 11;
2238 sh_g = 5;
2239 sh_b = 0;
2240 break;
2241 case 24:
2242 if ((mask_r != 0xff0000) ||
2243 (mask_g != 0x00ff00) ||
2244 (mask_b != 0x0000ff))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247 lookup_r = lookup;
2248 lookup_g = lookup+256;
2249 lookup_b = lookup+256+256;
2250 sh_r = 16;
2251 sh_g = 8;
2252 sh_b = 0;
2253 break;
2254 case 32:
2255 if ((mask_r != 0xff0000) ||
2256 (mask_g != 0x00ff00) ||
2257 (mask_b != 0x0000ff))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260 lookup_r = lookup;
2261 lookup_g = lookup+256;
2262 lookup_b = lookup+256+256;
2263 sh_r = 16;
2264 sh_g = 8;
2265 sh_b = 0;
2266 break;
2267 default:
2268 return; /* we do not support this color depth */
2269 }
2270
2271 /* prepare limits for color transformation (each channel is handled separately) */
2272 if (shade < 0) {
2273 shade = -shade;
2274 if (shade < 0) shade = 0;
2275 if (shade > 100) shade = 100;
2276
2277 lower_lim_r = 65535-rm;
2278 lower_lim_g = 65535-gm;
2279 lower_lim_b = 65535-bm;
2280
2281 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286 } else {
2287 if (shade < 0) shade = 0;
2288 if (shade > 100) shade = 100;
2289
2290 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295 }
2296
2297 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299 {
2300 unsigned int tmp;
2301
2302 tmp = lower_lim_r;
2303 lower_lim_r = lower_lim_b;
2304 lower_lim_b = tmp;
2305
2306 tmp = upper_lim_r;
2307 upper_lim_r = upper_lim_b;
2308 upper_lim_b = tmp;
2309 }
2310
2311 /* fill our lookup tables */
2312 for (i = 0; i <= mask_r>>sh_r; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317 lookup_r[i] = (tmp/65535)<<sh_r;
2318 }
2319 for (i = 0; i <= mask_g>>sh_g; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324 lookup_g[i] = (tmp/65535)<<sh_g;
2325 }
2326 for (i = 0; i <= mask_b>>sh_b; i++)
2327 {
2328 RUINT32T tmp;
2329 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331 lookup_b[i] = (tmp/65535)<<sh_b;
2332 }
2333
2334 /* apply table to input image (replacing colors by newly calculated ones) */
2335 switch (srcImage->bits_per_pixel)
2336 {
2337 case 15:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0x7c00)>>10] |
2349 lookup_g[(*p & 0x03e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 16:
2357 {
2358 unsigned short *p1, *pf, *p, *pl;
2359 p1 = (unsigned short *) srcImage->data;
2360 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width;
2365 for (; p < pl; p++)
2366 {
2367 *p = lookup_r[(*p & 0xf800)>>11] |
2368 lookup_g[(*p & 0x07e0)>> 5] |
2369 lookup_b[(*p & 0x001f)];
2370 }
2371 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 24:
2376 {
2377 unsigned char *p1, *pf, *p, *pl;
2378 p1 = (unsigned char *) srcImage->data;
2379 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width * 3;
2384 for (; p < pl; p += 3)
2385 {
2386 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388 p[2] = lookup_r[(p[2] & 0x0000ff)];
2389 }
2390 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 32:
2395 {
2396 RUINT32T *p1, *pf, *p, *pl;
2397 p1 = (RUINT32T *) srcImage->data;
2398 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0xff0000)>>16] |
2407 lookup_g[(*p & 0x00ff00)>> 8] |
2408 lookup_b[(*p & 0x0000ff)] |
2409 (*p & ~0xffffff);
2410 }
2411 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 }
2416
2417 free (lookup);
2418}
2419#endif
2420
1708/* 2421/*
1709 * Check our parents are still who we think they are. 2422 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2423 * Do transparency updates if required
1711 */ 2424 */
1712int 2425int
1713rxvt_term::check_our_parents () 2426rxvt_term::check_our_parents ()
1714{ 2427{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2428 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2429 unsigned long nitems, bytes_after;
1717 Atom atype; 2430 Atom atype;
1718 unsigned char *prop = NULL; 2431 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2432 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2433 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2434 XWindowAttributes wattr, wrootattr;
2435 dDisp;
1722 2436
1723 pchanged = 0; 2437 pchanged = 0;
1724 2438
1725 if (! (Options & Opt_transparent)) 2439 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2440 return pchanged; /* Don't try any more */
1727 2441
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2442 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2443 rootdepth = wrootattr.depth;
1730 2444
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2445 XGetWindowAttributes (disp, parent[0], &wattr);
2446
1732 if (rootdepth != wattr.depth) 2447 if (rootdepth != wattr.depth)
1733 { 2448 {
1734 if (am_transparent) 2449 if (am_transparent)
1735 { 2450 {
1736 pchanged = 1; 2451 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2453 am_transparent = am_pixmap_trans = 0;
1740 } 2454 }
2455
1741 return pchanged; /* Don't try any more */ 2456 return pchanged; /* Don't try any more */
1742 } 2457 }
1743 2458
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2459 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2460 XSync (disp, False);
1746 2461
1747 /* 2462 /*
1748 * Make the frame window set by the window manager have 2463 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2464 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2465 * windows for each client, so we have to take care about that.
1751 */ 2466 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2467 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2470 &nitems, &bytes_after, &prop) == Success);
2471
1756 if (!i || prop == NULL) 2472 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success);
2477
2478 if (!i || prop == NULL
2479#if TINTING
2480 || !rs[Rs_color + Color_tint]
2481#endif
2482 )
1757 have_pixmap = 0; 2483 have_pixmap = 0;
1758 else 2484 else
1759 { 2485 {
1760 have_pixmap = 1; 2486 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2487 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2488 XFree (prop);
1763 } 2489 }
2490
1764 if (have_pixmap) 2491 if (have_pixmap)
1765 { 2492 {
1766 /* 2493 /*
1767 * Copy display->root pixmap transparency 2494 * Copy display->root pixmap transparency
1768 */ 2495 */
… …
1771 Window cr; 2498 Window cr;
1772 XImage *image; 2499 XImage *image;
1773 GC gc; 2500 GC gc;
1774 XGCValues gcvalue; 2501 XGCValues gcvalue;
1775 2502
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2503 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2504 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2505 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2506 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2507 nx = ny = 0;
1781 2508
1782 if (sx < 0) 2509 if (sx < 0)
… …
1791 nh += sy; 2518 nh += sy;
1792 ny = -sy; 2519 ny = -sy;
1793 sy = 0; 2520 sy = 0;
1794 } 2521 }
1795 2522
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2523 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2524 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526 XSync (disp, False);
1798 allowedxerror = -1; 2527 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2529
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2531 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2532 allowedxerror = 0;
2533
1804 if (image == NULL) 2534 if (image == NULL)
1805 { 2535 {
1806 if (am_transparent && am_pixmap_trans) 2536 if (am_transparent && am_pixmap_trans)
1807 { 2537 {
1808 pchanged = 1; 2538 pchanged = 1;
1809 if (TermWin.pixmap != None) 2539 if (pixmap != None)
1810 { 2540 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2541 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2542 pixmap = None;
1813 } 2543 }
1814 } 2544 }
2545
1815 am_pixmap_trans = 0; 2546 am_pixmap_trans = 0;
1816 } 2547 }
1817 else 2548 else
1818 { 2549 {
1819 if (TermWin.pixmap != None) 2550 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2551 XFreePixmap (disp, pixmap);
2552
2553#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint))
2555 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561 ShadeXImage (display, image, shade, rm, gm, bm);
2562 }
2563#endif
2564
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2565 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2566 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2568 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2569 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2570 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2571 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2573 XClearWindow (disp, parent[0]);
2574
1833 if (!am_transparent || !am_pixmap_trans) 2575 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2576 pchanged = 1;
2577
1835 am_transparent = am_pixmap_trans = 1; 2578 am_transparent = am_pixmap_trans = 1;
1836 } 2579 }
1837 } 2580 }
1838 2581
1839 if (!am_pixmap_trans) 2582 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584 else
1840 { 2585 {
1841 unsigned int n; 2586 unsigned int n;
1842 /* 2587 /*
1843 * InheritPixmap transparency 2588 * InheritPixmap transparency
1844 */ 2589 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2591 {
1849 oldp = TermWin.parent[i]; 2592 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2593 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2594 &parent[i], &list, &n);
1852 XFree (list); 2595 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2596
1854 if (TermWin.parent[i] == display->root) 2597 if (parent[i] == display->root)
1855 { 2598 {
1856 if (oldp != None) 2599 if (oldp != None)
1857 pchanged = 1; 2600 pchanged = 1;
2601
1858 break; 2602 break;
1859 } 2603 }
2604
1860 if (oldp != TermWin.parent[i]) 2605 if (oldp != parent[i])
1861 pchanged = 1; 2606 pchanged = 1;
1862 } 2607 }
1863 2608
1864 n = 0; 2609 n = 0;
1865 2610
1866 if (pchanged) 2611 if (pchanged)
1867 { 2612 {
1868 for (; n < (unsigned int)i; n++) 2613 for (; n < (unsigned int)i; n++)
1869 { 2614 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2615 XGetWindowAttributes (disp, parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2617 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2619 break;
1876 } 2620 }
1877 } 2621 }
1878 } 2622 }
1879 2623
1880 if (n > (int) (sizeof (TermWin.parent) 2624 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2625 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2628 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2629 /* XXX: also turn off Opt_transparent? */
1890 } 2630 }
1891 else 2631 else
1892 { 2632 {
2633#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2634 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2635 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2636 sleep (1);
1903# endif 2637#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2638 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2639 {
1907 ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2641 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2642 }
2643
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2645 am_transparent = 1;
1911 } 2646 }
1912 2647
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2649 parent[i] = None;
2650 }
2651
2652 if (scrollBar.win)
1915 } 2653 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle ();
2656 scrollbar_show (0);
2657 }
2658
2659 if (am_transparent)
2660 {
2661 want_refresh = want_full_refresh = 1;
2662 if (am_pixmap_trans)
2663 flush ();
2664 }
2665
1916 return pchanged; 2666 return pchanged;
1917} 2667}
1918#endif 2668#endif
1919 2669
1920/*}}} */ 2670/*}}} */
1921 2671
1922bool 2672bool
1923rxvt_term::cmd_parse () 2673rxvt_term::cmd_parse ()
1924{ 2674{
1925 bool flag = false; 2675 bool flag = false;
1926 unicode_t ch = NOCHAR; 2676 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2677 char *seq_begin; // remember start of esc-sequence here
1928 2678
1929 for (;;) 2679 for (;;)
1930 { 2680 {
1931 if (ch == NOCHAR) 2681 if (ch == NOCHAR)
1932 { 2682 {
1933 seq_begin = cmdbuf_ptr; 2683 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2684 ch = next_char ();
1935 }
1936 2685
1937 if (ch == NOCHAR) // TODO: improve 2686 if (ch == NOCHAR)
1938 break; 2687 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2688 }
2689
2690 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2691 {
2692 if (!seen_input)
2693 {
2694 seen_input = 1;
2695 // many badly-written programs (e.g. jed) contain a race condition:
2696 // they first read the screensize and then install a SIGWINCH handler.
2697 // some window managers resize the window early, and these programs
2698 // then sometimes get the size wrong.
2699 // unfortunately other programs are even more buggy and dislike
2700 // being sent SIGWINCH, so only do it when we were in fact being
2701 // resized.
2702 if (seen_resize && cmd_pid)
2703 kill (-cmd_pid, SIGWINCH);
2704 }
2705
1942 /* Read a text string from the input buffer */ 2706 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2707 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2708 bool refreshnow = false;
1945 int nlines = 0; 2709 int nlines = 0;
1946 unicode_t *str = buf; 2710 wchar_t *str = buf;
1947 2711 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2712
1950 for (;;) 2713 for (;;)
1951 { 2714 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2715 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2716 break;
1957 2717
1958 *str++ = ch; 2718 *str++ = ch;
1959 2719
1960 if (ch == '\n') 2720 if (ch == C0_LF || str >= eol)
1961 { 2721 {
2722 if (ch == C0_LF)
1962 nlines++; 2723 nlines++;
2724
1963 refresh_count++; 2725 refresh_count++;
1964 2726
1965 if (! (Options & Opt_jumpScroll) 2727 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2728 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2729 {
1968 refreshnow = true; 2730 refreshnow = true;
1969 flag = true; 2731 refresh_count = 0;
1970 ch = NOCHAR; 2732 ch = NOCHAR;
1971 break; 2733 break;
1972 } 2734 }
1973 2735
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2736 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2737 if (nlines >= nrow - 1)
1976 { 2738 {
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1977 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2742
1978 nlines = 0; 2743 nlines = 0;
1979 str = buf; 2744 str = buf;
2745 eol = str + min (ncol, UBUFSIZ);
1980 } 2746 }
2747
2748 if (str >= eol)
2749 {
2750 if (eol >= buf + UBUFSIZ)
2751 {
2752 ch = NOCHAR;
2753 break;
2754 }
2755 else
2756 eol = min (eol + ncol, buf + UBUFSIZ);
2757 }
2758
1981 } 2759 }
1982 2760
1983 if (str >= buf + UBUFSIZ) 2761 seq_begin = cmdbuf_ptr;
1984 { 2762 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2763 }
1989 2764
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
1991 2768
1992 /* 2769 /*
1993 * If there have been a lot of new lines, then update the screen 2770 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2771 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2772 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2773 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2774 */
2001 if (refreshnow) 2775 if (refreshnow)
2002 { 2776 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2778 refresh_limit++;
2005 2779 else
2780 {
2781 flag = true;
2006 scr_refresh (refresh_type); 2782 scr_refresh ();
2783 want_refresh = 1;
2784 }
2007 } 2785 }
2008 2786
2009 } 2787 }
2010 else 2788 else
2011 { 2789 {
… …
2026 2804
2027 return flag; 2805 return flag;
2028} 2806}
2029 2807
2030// read the next character 2808// read the next character
2031unicode_t 2809wchar_t
2032rxvt_term::next_char () 2810rxvt_term::next_char () NOTHROW
2033{ 2811{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2813 {
2036 // assume 7-bit to be ascii ALWAYS 2814 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2816 return *cmdbuf_ptr++;
2039 2817
2040 wchar_t wc; 2818 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2819 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2820
2043 if (len == (size_t)-2) 2821 if (len == (size_t)-2)
2044 { 2822 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2823 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2824 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2825 break;
2048 } 2826 }
2049 2827
2050 if (len == (size_t)-1) 2828 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2829 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2830
2053 // assume wchar == unicode 2831 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2832 cmdbuf_ptr += len;
2055 return wc; 2833 return wc & UNICODE_MASK;
2056 } 2834 }
2057 2835
2058 return NOCHAR; 2836 return NOCHAR;
2059} 2837}
2838
2839// read the next octet
2840uint32_t
2841rxvt_term::next_octet () NOTHROW
2842{
2843 return cmdbuf_ptr < cmdbuf_endp
2844 ? (unsigned char)*cmdbuf_ptr++
2845 : NOCHAR;
2846}
2847
2848static class out_of_input out_of_input;
2060 2849
2061/* rxvt_cmd_getc () - Return next input character */ 2850/* rxvt_cmd_getc () - Return next input character */
2062/* 2851/*
2063 * Return the next input character after first passing any keyboard input 2852 * Return the next input character after first passing any keyboard input
2064 * to the command. 2853 * to the command.
2065 */ 2854 */
2066unicode_t 2855wchar_t
2067rxvt_term::cmd_getc () 2856rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2857{
2069 unicode_t c = next_char (); 2858 wchar_t c = next_char ();
2859
2860 if (c == NOCHAR)
2861 throw out_of_input;
2862
2863 return c;
2864}
2865
2866uint32_t
2867rxvt_term::cmd_get8 () THROW ((class out_of_input))
2868{
2869 uint32_t c = next_octet ();
2070 2870
2071 if (c == NOCHAR) 2871 if (c == NOCHAR)
2072 throw out_of_input; 2872 throw out_of_input;
2073 2873
2074 return c; 2874 return c;
… …
2156/*}}} */ 2956/*}}} */
2157 2957
2158/* *INDENT-OFF* */ 2958/* *INDENT-OFF* */
2159enum { 2959enum {
2160 C1_40 = 0x40, 2960 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2961 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2962 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2963 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2964 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2965};
2166/* *INDENT-ON* */ 2966/* *INDENT-ON* */
2167 2967
2168/*{{{ process non-printing single characters */ 2968/*{{{ process non-printing single characters */
2169void 2969void
… …
2174 case C0_ESC: 2974 case C0_ESC:
2175 process_escape_seq (); 2975 process_escape_seq ();
2176 break; 2976 break;
2177 case C0_ENQ: /* terminal Status */ 2977 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2978 if (rs[Rs_answerbackstring])
2179 tt_write ( 2979 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2980 else
2183 tt_write ((unsigned char *)VT100_ANS, 2981 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2982 break;
2186 case C0_BEL: /* bell */ 2983 case C0_BEL: /* bell */
2187 scr_bell (); 2984 scr_bell ();
2188 break; 2985 break;
2189 case C0_BS: /* backspace */ 2986 case C0_BS: /* backspace */
… …
2205 break; 3002 break;
2206 case C0_SI: /* shift in - acs */ 3003 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3004 scr_charset_choose (0);
2208 break; 3005 break;
2209 3006
3007#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3008 // 8-bit controls
2211 case 0x90: /* DCS */ 3009 case 0x90: /* DCS */
2212 process_dcs_seq (); 3010 process_dcs_seq ();
2213 break; 3011 break;
2214 case 0x9b: /* CSI */ 3012 case 0x9b: /* CSI */
2215 process_csi_seq (); 3013 process_csi_seq ();
2216 break; 3014 break;
2217 case 0x9d: /* CSI */ 3015 case 0x9d: /* CSI */
2218 process_osc_seq (); 3016 process_osc_seq ();
2219 break; 3017 break;
3018#endif
2220 } 3019 }
2221} 3020}
2222/*}}} */ 3021/*}}} */
2223 3022
2224 3023
… …
2286void 3085void
2287rxvt_term::process_escape_seq () 3086rxvt_term::process_escape_seq ()
2288{ 3087{
2289 unicode_t ch = cmd_getc (); 3088 unicode_t ch = cmd_getc ();
2290 3089
2291 if (PrivateModes & PrivMode_vt52) 3090 if (priv_modes & PrivMode_vt52)
2292 { 3091 {
2293 process_escape_vt52 (ch); 3092 process_escape_vt52 (ch);
2294 return; 3093 return;
2295 } 3094 }
2296 3095
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3110 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3111 break;
2313 case '+': 3112 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3113 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3114 break;
2316#ifndef NO_FRILLS 3115#if ENABLE_FRILLS
2317 case '6': 3116 case '6':
2318 scr_backindex (); 3117 scr_backindex ();
2319 break; 3118 break;
2320#endif 3119#endif
2321 case '7': 3120 case '7':
2322 scr_cursor (SAVE); 3121 scr_cursor (SAVE);
2323 break; 3122 break;
2324 case '8': 3123 case '8':
2325 scr_cursor (RESTORE); 3124 scr_cursor (RESTORE);
2326 break; 3125 break;
2327#ifndef NO_FRILLS 3126#if ENABLE_FRILLS
2328 case '9': 3127 case '9':
2329 scr_forwardindex (); 3128 scr_forwardindex ();
2330 break; 3129 break;
2331#endif 3130#endif
2332 case '=': 3131 case '=':
… …
2342 break; 3141 break;
2343 3142
2344 /* 8.3.87: NEXT LINE */ 3143 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3144 case C1_NEL: /* ESC E */
2346 { 3145 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3146 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3147 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3148 }
2350 break; 3149 break;
2351 3150
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3151 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3152 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3162 case C1_RI: /* ESC M */
2364 scr_index (DN); 3163 scr_index (DN);
2365 break; 3164 break;
2366 3165
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3166 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3167 /*case C1_SS2: scr_single_shift (2); break; */
2369 3168
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3169 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3170 /*case C1_SS3: scr_single_shift (3); break; */
2372 3171
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3172 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3173 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3174 process_dcs_seq ();
2376 break; 3175 break;
2377 3176
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3177 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3178 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3179 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3180 break; /* steal obsolete ESC [ c */
2383 3181
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3182 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3183 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3184 process_csi_seq ();
… …
2391 process_osc_seq (); 3189 process_osc_seq ();
2392 break; 3190 break;
2393 3191
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3192 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3193 case 'c':
3194 mbstate.reset ();
2396 scr_poweron (); 3195 scr_poweron ();
2397 scrollbar_show (1); 3196 scrollbar_show (1);
2398 break; 3197 break;
2399 3198
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3199 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3211
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3212/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3213/* *INDENT-OFF* */
2415enum { 3214enum {
2416 CSI_ICH = 0x40, 3215 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3216 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3217 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3218 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3219 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3220 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3221 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3236 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3237 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3238 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3239 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3240 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3241 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3242 };
2444/* *INDENT-ON* */ 3243/* *INDENT-ON* */
2445 3244
2446void 3245void
2447rxvt_term::process_csi_seq () 3246rxvt_term::process_csi_seq ()
… …
2510 { 3309 {
2511 switch (priv) 3310 switch (priv)
2512 { 3311 {
2513 case '>': 3312 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3313 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3315 break;
2517 case '?': 3316 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3318 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3319 break;
… …
2625 3424
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3425 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3426 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3427 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3428 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3429 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3430 break;
2632 3431
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3432 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3433 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3434 break;
2637 3435
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3436 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3437 process_sgr_mode (nargs, arg);
2640 break; 3438 break;
… …
2646 tt_printf ("\033[0n"); 3444 tt_printf ("\033[0n");
2647 break; 3445 break;
2648 case 6: /* CPR requested */ 3446 case 6: /* CPR requested */
2649 scr_report_position (); 3447 scr_report_position ();
2650 break; 3448 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3449 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3451 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3452 break;
2655#endif
2656 case 8: /* unofficial extension */ 3453 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3455 break;
2659 } 3456 }
2660 break; 3457 break;
2661 3458
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3459 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3492 break;
2696 3493
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3494 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3495 if (arg[0] == 4)
2699 scr_insert_mode (0); 3496 scr_insert_mode (0);
3497 else if (arg[0] == 20)
3498 priv_modes &= ~PrivMode_LFNL;
2700 break; 3499 break;
2701 3500
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3501 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3502 if (arg[0] == 4)
2704 scr_insert_mode (1); 3503 scr_insert_mode (1);
3504 else if (arg[0] == 20)
3505 priv_modes |= PrivMode_LFNL;
2705 break; 3506 break;
2706 3507
2707 /* 3508 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3509 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3510 */
… …
2721 break; 3522 break;
2722 case CSI_75: 3523 case CSI_75:
2723 scr_cursor (RESTORE); 3524 scr_cursor (RESTORE);
2724 break; 3525 break;
2725 3526
2726#ifndef NO_FRILLS 3527#if ENABLE_FRILLS
2727 case CSI_74: 3528 case CSI_74:
2728 process_window_ops (arg, nargs); 3529 process_window_ops (arg, nargs);
2729 break; 3530 break;
2730#endif 3531#endif
2731 3532
… …
2738 break; 3539 break;
2739 } 3540 }
2740} 3541}
2741/*}}} */ 3542/*}}} */
2742 3543
2743#ifndef NO_FRILLS 3544#if ENABLE_FRILLS
2744/* ARGSUSED */ 3545/* ARGSUSED */
2745void 3546void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3547rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3548{
2748 int x, y; 3549 int x, y;
2749 XWindowAttributes wattr; 3550 XWindowAttributes wattr;
2750 Window wdummy; 3551 Window wdummy;
3552 dDisp;
2751 3553
2752 if (nargs == 0) 3554 if (nargs == 0)
2753 return; 3555 return;
2754 3556
2755 switch (args[0]) 3557 switch (args[0])
2756 { 3558 {
2757 /* 3559 /*
2758 * commands 3560 * commands
2759 */ 3561 */
2760 case 1: /* deiconify window */ 3562 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3563 XMapWindow (disp, parent[0]);
2762 break; 3564 break;
2763 case 2: /* iconify window */ 3565 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3566 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3567 break;
2767 case 3: /* set position (pixels) */ 3568 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3569 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3570 break;
2770 case 4: /* set size (pixels) */ 3571 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3573 break;
2773 case 5: /* raise window */ 3574 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3575 XRaiseWindow (disp, parent[0]);
2775 break; 3576 break;
2776 case 6: /* lower window */ 3577 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3578 XLowerWindow (disp, parent[0]);
2778 break; 3579 break;
2779 case 7: /* refresh window */ 3580 case 7: /* refresh window */
2780 scr_touch (true); 3581 scr_touch (true);
2781 break; 3582 break;
2782 case 8: /* set size (chars) */ 3583 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3584 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
2785 break; 3586 break;
2786 3587
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3588 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3589 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3590 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3591 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3592 (unsigned int) (args[1] * fheight));
2792 break; 3593 break;
2793 3594
2794 3595
2795 /* 3596 /*
2796 * reports - some output format copied from XTerm 3597 * reports - some output format copied from XTerm
2797 */ 3598 */
2798 case 11: /* report window state */ 3599 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3602 break;
2802 case 13: /* report window position */ 3603 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3605 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3606 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3607 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3608 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3609 break;
2809 case 14: /* report window size (pixels) */ 3610 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3611 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3613 break;
2813 case 18: /* report text area size (chars) */ 3614 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3615 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3616 break;
2816 case 19: /* report window size (chars) */ 3617 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3618 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3619 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3620 case 20: /* report icon label */
3621 {
3622 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3623 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s);
3626 }
2823 break; 3627 break;
2824 case 21: /* report window title */ 3628 case 21: /* report window title */
3629 {
3630 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3631 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s);
3634 }
2827 break; 3635 break;
2828#endif
2829 } 3636 }
2830} 3637}
2831#endif 3638#endif
2832 3639
2833/*----------------------------------------------------------------------*/ 3640/*----------------------------------------------------------------------*/
2834/* 3641/*
2835 * get input up until STRING TERMINATOR (or BEL) 3642 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3643 * ends_how is terminator used. returned input must be free()'d
2837 */ 3644 */
2838unsigned char * 3645char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3646rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3647{
2841 int seen_esc = 0; /* seen escape? */ 3648 unicode_t ch;
3649 bool seen_esc = false;
2842 unsigned int n = 0; 3650 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3651 wchar_t string[STRING_MAX];
2846 3652
2847 while ((ch = cmd_getc ())) 3653 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3654 {
2849 if (ch == C0_BEL 3655 if (seen_esc)
2850 || ch == CHAR_ST 3656 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3657 if (ch == 0x5c) /* 7bit ST */
2852 break; 3658 break;
2853 3659 else
3660 return NULL;
3661 }
2854 if (ch == C0_ESC) 3662 else if (ch == C0_ESC)
2855 { 3663 {
2856 seen_esc = 1; 3664 seen_esc = true;
2857 continue; 3665 continue;
2858 } 3666 }
2859 else if (ch == '\t') 3667 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3668 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3669 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3670 return NULL; /* other control character - exit */
2863 3671
2864 if (n < sizeof (string) - 1) 3672 seen_esc = false;
3673
3674 if (n >= STRING_MAX - 1)
3675 // stop at some sane length
3676 return NULL;
3677
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
2865 string[n++] = ch; 3681 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3682 }
2869 3683
2870 string[n++] = '\0'; 3684 string[n++] = '\0';
2871 3685
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3686 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3687
2877 return s; 3688 return rxvt_wcstombs (string);
2878} 3689}
2879 3690
2880/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
2881/* 3692/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3693 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3694 */
2884void 3695void
2885rxvt_term::process_dcs_seq () 3696rxvt_term::process_dcs_seq ()
2886{ 3697{
2887 unsigned char *s; 3698 char *s;
2888 unicode_t eh; 3699 unicode_t eh;
2889 3700
2890 /* 3701 /*
2891 * Not handled yet 3702 * Not handled yet
2892 */ 3703 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3722 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3723 arg = arg * 10 + (ch - '0');
2913 3724
2914 if (ch == ';') 3725 if (ch == ';')
2915 { 3726 {
2916 unsigned char *s = get_to_st (eh); 3727 char *s = get_to_st (eh);
2917 3728
2918 if (s) 3729 if (s)
2919 { 3730 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3731 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3732 free (s);
2934 } 3733 }
2935 } 3734 }
2936} 3735}
3736
3737void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{
3740 if (str[0] == '?' && !str[1])
3741 {
3742 unsigned short r, g, b;
3743 pix_colors_focused[color].get (display, r, g, b);
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3745 }
3746 else
3747 set_window_color (color, str);
3748}
3749
2937/* 3750/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3752 */
2960void 3753void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3754rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3755{
2963 int changed = 0;
2964 int color; 3756 int color;
2965 char *buf, *name; 3757 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1];
3759 int saveop = op;
3760 dDisp;
2966 3761
2967 assert (str != NULL); 3762 assert (str != NULL);
2968 switch (op) 3763 switch (op)
2969 { 3764 {
2970 case XTerm_name: 3765 case XTerm_name:
… …
2974 set_icon_name (str); 3769 set_icon_name (str);
2975 break; 3770 break;
2976 case XTerm_title: 3771 case XTerm_title:
2977 set_title (str); 3772 set_title (str);
2978 break; 3773 break;
3774 case XTerm_property:
3775 if (str[0] == '?')
3776 {
3777 Atom prop = display->atom (str + 1);
3778 Atom actual_type;
3779 int actual_format;
3780 unsigned long nitems;
3781 unsigned long bytes_after;
3782 unsigned char *value = 0;
3783 const char *str = "";
3784
3785 if (prop
3786 && XGetWindowProperty (disp, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None
3791 && actual_format == 8)
3792 str = (const char *)(value);
3793
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3795
3796 XFree (value);
3797 }
3798 else
3799 {
3800 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3801
3802 if (eq)
3803 {
3804 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1);
3806 }
3807 else
3808 XDeleteProperty (disp, parent[0],
3809 display->atom (str));
3810 }
3811 break;
3812
2979 case XTerm_Color: 3813 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3814 for (buf = (char *)str; buf && *buf;)
2981 { 3815 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3816 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3817 break;
2984 3818
2985 *name++ = '\0'; 3819 *name++ = '\0';
2986 color = atoi (buf); 3820 color = atoi (buf) + minCOLOR;
2987 3821
2988 if (color < 0 || color >= TOTAL_COLORS) 3822 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3823 break;
2990 3824
2991 if ((buf = STRCHR (name, ';')) != NULL) 3825 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3826 *buf++ = '\0';
2993 3827
3828 if (name[0] == '?' && !name[1])
3829 {
3830 unsigned short r, g, b;
3831 pix_colors_focused[color].get (display, r, g, b);
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833 }
3834 else
2994 set_window_color (color + minCOLOR, name); 3835 set_window_color (color, name);
2995 } 3836 }
3837 break;
3838 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3840 break;
3841 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp);
2996 break; 3843 break;
2997#ifndef NO_CURSORCOLOR 3844#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3845 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3847 break;
3001#endif 3848#endif
3002 case XTerm_Color_pointer: 3849 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3851 break;
3852 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3854 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3855#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str);
3008 break;
3009 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str);
3011 break;
3012 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3858 break;
3859 case Rxvt_Color_BD:
3860 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp);
3862 break;
3863 case Rxvt_Color_UL:
3864 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp);
3866 break;
3867 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3869 break;
3015#endif 3870#endif
3871#if TRANSPARENT && TINTING
3872 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3874 check_our_parents ();
3875 if (am_transparent)
3876 want_full_refresh = want_refresh = 1;
3877 break;
3878#endif
3016 3879
3017 case XTerm_Menu: 3880 case Rxvt_Pixmap:
3018 /* 3881 {
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap:
3024 if (*str != ';') 3882 if (*str != ';')
3025 { 3883 {
3026#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3885 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3886 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3887 scr_touch (true);
3888#endif
3031 } 3889 }
3890
3891 int changed = 0;
3892
3032 while ((str = STRCHR (str, ';')) != NULL) 3893 while ((str = strchr (str, ';')) != NULL)
3033 { 3894 {
3034 str++; 3895 str++;
3035#if XPM_BACKGROUND 3896#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3897 changed += scale_pixmap (str);
3037#endif 3898#endif
3038
3039 } 3899 }
3900
3040 if (changed) 3901 if (changed)
3041 { 3902 {
3042#ifdef XPM_BACKGROUND 3903#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3904 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3905 scr_touch (true);
3906#endif
3046 } 3907 }
3908 }
3047 break; 3909 break;
3048 3910
3049 case XTerm_restoreFG: 3911 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3912 set_window_color (Color_fg, str);
3051 break; 3913 break;
3052 case XTerm_restoreBG: 3914 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3915 set_window_color (Color_bg, str);
3054 break; 3916 break;
3917
3055 case XTerm_logfile: 3918 case XTerm_logfile:
3056 // TODO, when secure mode? 3919 // TODO, when secure mode?
3057 break; 3920 break;
3058 case XTerm_font: 3921
3059 change_font (str);
3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
3080#if 0 3922#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3923 case Rxvt_dumpscreen: /* no error notices */
3082 { 3924 {
3083 int fd; 3925 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3926 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3927 {
3086 scr_dump (fd); 3928 scr_dump (fd);
3087 close (fd); 3929 close (fd);
3088 } 3930 }
3089 } 3931 }
3932 break;
3933#endif
3934 case XTerm_font:
3935 op = URxvt_font;
3936 case URxvt_font:
3937#if ENABLE_STYLES
3938 case URxvt_boldFont:
3939 case URxvt_italicFont:
3940 case URxvt_boldItalicFont:
3941#endif
3942 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp);
3947 else
3948 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)];
3950
3951 res = strdup (str);
3952 allocated.push_back ((void *)res);
3953 set_fonts ();
3954 }
3955 break;
3956
3957#if ENABLE_FRILLS
3958 case URxvt_locale:
3959 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3961 else
3962 {
3963 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale ();
3966 }
3967 break;
3968
3969 case URxvt_view_up:
3970 case URxvt_view_down:
3971 {
3972 int lines = atoi (str);
3973
3974 if (lines)
3975 scr_page (op == URxvt_view_up ? UP : DN, lines);
3976 else
3977 scr_erase_savelines ();
3978 }
3979
3980 break;
3981#endif
3982
3983#if ENABLE_PERL
3984 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3986 ; // no responses yet
3090 break; 3987 break;
3091#endif 3988#endif
3092 } 3989 }
3093} 3990}
3094/*----------------------------------------------------------------------*/ 3991/*----------------------------------------------------------------------*/
… …
3108{ 4005{
3109 int state; 4006 int state;
3110 4007
3111 if (mode == 's') 4008 if (mode == 's')
3112 { 4009 {
3113 SavedModes |= (PrivateModes & bit); 4010 SavedModes |= (priv_modes & bit);
3114 return -1; 4011 return -1;
3115 } 4012 }
3116 else 4013 else
3117 { 4014 {
3118 if (mode == 'r') 4015 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4017 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4018 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4019 PrivMode (state, bit);
3123 } 4020 }
3124 4021
3125 return state; 4022 return state;
3126} 4023}
3127 4024
3128/* we're not using priv _yet_ */ 4025/* we're not using priv _yet_ */
3129void 4026void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4027rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 4028{
3132 unsigned int i, j; 4029 unsigned int i, j;
3133 int state; 4030 int state;
3134 4031
3135 static const struct 4032 static const struct
… …
3144 { 3, PrivMode_132 }, 4041 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4042 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4043 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4044 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4045 { 7, PrivMode_Autowrap },
4046 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4047 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4048 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 4049 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 4050#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4051 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4052#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4053 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4054 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4055 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4056 // 45 margin bell NYI
3163 // 46 start logging 4057 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4069 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4070 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4071 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4072 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4073 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4074 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4075 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4076 };
3183 4077
3184 if (nargs == 0) 4078 if (nargs == 0)
3185 return; 4079 return;
… …
3203 } 4097 }
3204 4098
3205 /* extra handling for values with state unkept */ 4099 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4100 switch (arg[i])
3207 { 4101 {
4102#if ENABLE_STYLES
4103 case 1021:
4104 set_option (Opt_intensityStyles, mode);
4105
4106 scr_touch (true);
4107 break;
4108#endif
3208 case 1048: /* alternative cursor save */ 4109 case 1048: /* alternative cursor save */
3209 case 1049: 4110 case 1049:
4111 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4112 if (mode == 0)
3211 scr_cursor (RESTORE); 4113 scr_cursor (RESTORE);
3212 else if (mode == 1) 4114 else if (mode == 1)
3213 scr_cursor (SAVE); 4115 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4116 break;
3215 } 4117 }
3216 4118
3217 if (state >= 0) 4119 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4120 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4121 switch (arg[i])
… …
3225 * within VT52 mode 4127 * within VT52 mode
3226 */ 4128 */
3227 PrivMode (1, PrivMode_vt52); 4129 PrivMode (1, PrivMode_vt52);
3228 break; 4130 break;
3229 case 3: /* 80/132 */ 4131 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4132 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4133 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4134 break;
3233 case 4: /* smooth scrolling */ 4135 case 4: /* smooth scrolling */
3234 if (state) 4136 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 4137 break;
3239 case 5: /* reverse video */ 4138 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4139 scr_rvideo_mode (state);
3241 break; 4140 break;
3242 case 6: /* relative/absolute origins */ 4141 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4142 scr_relative_origin (state);
3244 break; 4143 break;
3245 case 7: /* autowrap */ 4144 case 7: /* autowrap */
3246 scr_autowrap (state); 4145 scr_autowrap (state);
3247 break; 4146 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4147 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4148 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4149 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4150 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4151 break;
3253#ifdef menuBar_esc
3254 case menuBar_esc:
3255#ifdef MENUBAR
3256 map_menuBar (state);
3257#endif
3258 break;
3259#endif
3260#ifdef scrollBar_esc 4152#ifdef scrollBar_esc
3261 case scrollBar_esc: 4153 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 4154 if (scrollbar_mapping (state))
3263 { 4155 {
3264 resize_all_windows (0, 0, 0); 4156 resize_all_windows (0, 0, 0);
… …
3267 break; 4159 break;
3268#endif 4160#endif
3269 case 25: /* visible/invisible cursor */ 4161 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4162 scr_cursor_visible (state);
3271 break; 4163 break;
3272 /* case 35: - shift keys */ 4164 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4165 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4166 case 47: /* secondary screen */
3275 scr_change_screen (state); 4167 scr_change_screen (state);
3276 break; 4168 break;
3277 /* case 66: - application key pad */ 4169 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4170 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4171 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4173 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4174 break;
3283#if 0 4175#if 0
3284 case 1001: 4176 case 1001:
3285 break; /* X11 mouse highlighting */ 4177 break; /* X11 mouse highlighting */
3286#endif 4178#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4179 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 4180 set_option (Opt_scrollTtyOutput, !state);
3292 break; 4181 break;
3293 case 1011: /* scroll to bottom on key press */ 4182 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4183 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 4184 break;
3299 case 1047: /* secondary screen w/ clearing */ 4185 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4186 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4187 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4188 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4189 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4190 break;
4191 case 1049: /* secondary screen w/ clearing first */
4192 scr_change_screen (state);
4193 if (OPTION (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY)
4195 scr_erase_screen (2);
4196 break;
3306 default: 4197 default:
3307 break; 4198 break;
3308 } 4199 }
3309 } 4200 }
3310} 4201}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4224 rendset = 0, rendstyle = ~RS_None;
3334 break; 4225 break;
3335 case 1: 4226 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4227 rendset = 1, rendstyle = RS_Bold;
3337 break; 4228 break;
4229 //case 2: // low intensity
4230 case 3:
4231 rendset = 1, rendstyle = RS_Italic;
4232 break;
3338 case 4: 4233 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4234 rendset = 1, rendstyle = RS_Uline;
3340 break; 4235 break;
3341 case 5: 4236 case 5: // slowly blinking
4237 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4238 rendset = 1, rendstyle = RS_Blink;
3343 break; 4239 break;
4240 //case 6: // scoansi light background
3344 case 7: 4241 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4242 rendset = 1, rendstyle = RS_RVid;
3346 break; 4243 break;
3347 case 8: 4244 case 8:
3348 // invisible. NYI 4245 // invisible. NYI
3349 break; 4246 break;
3350 case 22: 4247 //case 9: // crossed out
4248 //case 10: // scoansi acs off, primary font
4249 //case 11: // scoansi acs on, first alt font
4250 //case 12: // scoansi acs on, |0x80, second alt font
4251 //...
4252 //case 19: // ninth alt font
4253 //case 20: // gothic
4254 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4255 rendset = 0, rendstyle = RS_Bold;
4256 break;
4257 case 22: // normal intensity
4258 rendset = 0, rendstyle = RS_Bold;
4259 break;
4260 case 23: // disable italic
4261 rendset = 0, rendstyle = RS_Italic;
3352 break; 4262 break;
3353 case 24: 4263 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4264 rendset = 0, rendstyle = RS_Uline;
3355 break; 4265 break;
3356 case 25: 4266 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4267 rendset = 0, rendstyle = RS_Blink;
3358 break; 4268 break;
4269 case 26: // variable spacing (iso 8613)
4270 rendset = 0, rendstyle = RS_Blink;
4271 break;
3359 case 27: 4272 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4273 rendset = 0, rendstyle = RS_RVid;
3361 break; 4274 break;
3362 case 28:
3363 // visible. NYI 4275 //case 28: // visible. NYI
3364 break; 4276 //case 29: // not crossed-out
3365 } 4277 }
3366 4278
3367 if (rendset != -1) 4279 if (rendset != -1)
3368 { 4280 {
3369 scr_rendition (rendset, rendstyle); 4281 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4292 case 35:
3381 case 36: 4293 case 36:
3382 case 37: 4294 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4295 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4296 break;
3385#ifdef TTY_256COLOR 4297 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4298 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4299 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4300 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4301 i += 2;
3391 } 4302 }
3392 break; 4303 break;
3393#endif
3394 case 39: /* default fg */ 4304 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4305 scr_color (Color_fg, Color_fg);
3396 break; 4306 break;
3397 4307
3398 case 40: 4308 case 40:
… …
3403 case 45: 4313 case 45:
3404 case 46: 4314 case 46:
3405 case 47: 4315 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4316 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4317 break;
3408#ifdef TTY_256COLOR 4318 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4319 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4320 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4321 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4322 i += 2;
3414 } 4323 }
3415 break; 4324 break;
3416#endif
3417 case 49: /* default bg */ 4325 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4326 scr_color (Color_bg, Color_bg);
3419 break; 4327 break;
3420 4328
3421#ifndef NO_BRIGHTCOLOR 4329 //case 50: // not variable spacing
4330
4331#if ENABLE_FRILLS
3422 case 90: 4332 case 90:
3423 case 91: /* set bright fg color */ 4333 case 91: /* set bright fg color */
3424 case 92: 4334 case 92:
3425 case 93: 4335 case 93:
3426 case 94: 4336 case 94:
3427 case 95: 4337 case 95:
3428 case 96: 4338 case 96:
3429 case 97: 4339 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4340 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4341 break;
3433 case 100: 4342 case 100:
3434 case 101: /* set bright bg color */ 4343 case 101: /* set bright bg color */
3435 case 102: 4344 case 102:
3436 case 103: 4345 case 103:
3437 case 104: 4346 case 104:
3438 case 105: 4347 case 105:
3439 case 106: 4348 case 106:
3440 case 107: 4349 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4351 break;
3444#endif 4352#endif
3445
3446 } 4353 }
3447 } 4354 }
3448} 4355}
3449/*}}} */ 4356/*}}} */
3450 4357
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4358/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4359void
3453rxvt_term::process_graphics () 4360rxvt_term::process_graphics ()
3454{ 4361{
3455 unicode_t ch, cmd = cmd_getc (); 4362 unicode_t ch, cmd = cmd_getc ();
3456 4363
3457 if (cmd == 'Q') 4364 if (cmd == 'Q')
3458 { /* query graphics */ 4365 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4366 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4367 return;
3461 } 4368 }
3462 /* swallow other graphics sequences until terminating ':' */ 4369 /* swallow other graphics sequences until terminating ':' */
3463 do 4370 do
3464 ch = cmd_getc (); 4371 ch = cmd_getc ();
… …
3474 */ 4381 */
3475void 4382void
3476rxvt_term::tt_printf (const char *fmt,...) 4383rxvt_term::tt_printf (const char *fmt,...)
3477{ 4384{
3478 va_list arg_ptr; 4385 va_list arg_ptr;
3479 unsigned char buf[256]; 4386 char buf[256];
3480 4387
3481 va_start (arg_ptr, fmt); 4388 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4389 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4390 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4391 tt_write (buf, strlen (buf));
3485} 4392}
3486 4393
3487/* ---------------------------------------------------------------------- */ 4394/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4395/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4396 * or generated by us in response to a query ESC sequence.
3490 */ 4397 */
4398const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4399
3491void 4400void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4401rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4402{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4403 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4404 return;
3495 4405
3496 if (len) 4406 if (pty->pty < 0)
4407 return;
4408
4409 if (v_buflen == 0)
4410 {
4411 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4412
4413 if ((unsigned int)written == len)
4414 return;
4415
4416 data += written;
4417 len -= written;
3497 { 4418 }
4419
4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4421
4422 memcpy (v_buffer + v_buflen, data, len);
4423 v_buflen += len;
4424
4425 pty_ev.set (EVENT_READ | EVENT_WRITE);
4426}
4427
4428void rxvt_term::pty_write ()
4429{
4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4431
4432 if (written > 0)
4433 {
4434 v_buflen -= written;
4435
3498 if (v_buflen == 0) 4436 if (v_buflen == 0)
3499 { 4437 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4438 free (v_buffer);
3527 v_buffer = 0; 4439 v_buffer = 0;
3528 v_buflen = 0; 4440 v_buflen = 0;
3529 4441
3530 pty_ev.set (EVENT_READ); 4442 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4443 return;
3543 } 4444 }
4445
4446 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4447 }
4448 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4449 pty_ev.set (EVENT_READ);
3545} 4450}
3546 4451
3547/*----------------------- end-of-file (C source) -----------------------*/ 4452/*----------------------- end-of-file (C source) -----------------------*/
3548 4453

Diff Legend

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