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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC

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

Diff Legend

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