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.322 by ayin, Wed May 2 23:06:32 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
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1466 focus_in ();
1467 break;
1468
1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1473 focus_out ();
1474 break;
1475
1476 case ConfigureNotify:
1477 if (ev.xconfigure.window == parent[0])
1124 { 1478 {
1125 TermWin.focus = 1; 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1480 ;
1127#ifdef USE_XIM 1481
1128 if (Input_Context != NULL) 1482 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 { 1483 {
1138 PixColors = PixColorsFocused; 1484 seen_resize = 1;
1139 set_colorfgbg (); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1486 }
1143#endif
1144 1487
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1491 if (option (Opt_transparent))
1492 check_our_parents ();
1493#endif
1145 } 1494 }
1146 break; 1495 break;
1147 1496
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: 1497 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1502
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; 1503 break;
1201 1504
1202 case SelectionClear: 1505 case SelectionClear:
1203 selection_clear (); 1506 selection_clear ();
1204 break; 1507 break;
1205 1508
1206 case SelectionNotify: 1509 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1512 break;
1211 1513
1212 case SelectionRequest: 1514 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1214 break; 1516 break;
1215 1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break;
1525
1216 case UnmapNotify: 1526 case UnmapNotify:
1217 TermWin.mapped = 0; 1527 mapped = 0;
1218#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1220#endif 1530#endif
1221 break; 1531 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; 1532 break;
1229 1533
1230#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1231 case ReparentNotify: 1535 case ReparentNotify:
1232 rootwin_cb (ev); 1536 rootwin_cb (ev);
1233 break; 1537 break;
1234#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1235 1539
1236 case GraphicsExpose: 1540 case GraphicsExpose:
1237 case Expose: 1541 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1239 { 1543 {
1240 do 1544 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1548
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1550
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1250 1554
1251 scr_refresh (refresh_type); 1555 want_refresh = 1;
1252 } 1556 }
1253 else 1557 else
1254 { 1558 {
1255 XEvent unused_event; 1559 XEvent unused_event;
1256 1560
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1562 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1564 ;
1261 1565
1262 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1263 { 1567 {
1264 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1265 scrollbar_show (0); 1569 scrollbar_show (0);
1266 } 1570 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1571
1272#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1275#endif 1575#endif
1276 } 1576 }
1277 break; 1577 break;
1278 1578
1279 case MotionNotify: 1579 case MotionNotify:
1280#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1581 if (hidden_pointer)
1282 pointer_unblank (); 1582 pointer_unblank ();
1283#endif 1583#endif
1284#if MENUBAR 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1585 break;
1586
1587 if (ev.xany.window == vt)
1286 { 1588 {
1287 menubar_control (ev.xbutton); 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1591 ; // 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))) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1593 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1595 ;
1300 1596
1301 XQueryPointer (display->display, TermWin.vt, 1597 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1600 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1601 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1603 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1604 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1605 {
1310#endif 1606#endif
1607#if ISO_14755
1608 // 5.4
1609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1610 {
1611 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1612 break;
1613 }
1614#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1615 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1616 ev.xbutton.state & Button3Mask ? 2 : 0);
1617
1313#ifdef SELECTION_SCROLLING 1618#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1619 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1620 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1621 {
1317 int dist; 1622 int dist;
1318 1623
1319 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1629
1325 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1327 */ 1632 */
1328 selection_save_x=ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1634 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1635 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1636
1333 /* calc number of lines to scroll */ 1637 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1638 if (ev.xbutton.y < int_bwidth)
1335 { 1639 {
1336 scroll_selection_dir = UP; 1640 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1641 dist = int_bwidth - ev.xbutton.y;
1338 } 1642 }
1339 else 1643 else
1340 { 1644 {
1341 scroll_selection_dir = DN; 1645 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1646 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1647 }
1648
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1649 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1650 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1;
1347 MIN_IT (scroll_selection_lines, 1652 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1653 SELECTION_SCROLL_MAX_LINES);
1349 } 1654 }
1350 else 1655 else
1351 { 1656 {
1352 /* we are within the text window, so we 1657 /* we are within the text window, so we
1353 * shouldn't be scrolling 1658 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1660 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1661 sel_scroll_ev.stop();
1357 } 1662 }
1358#endif 1663#endif
1359#ifdef MOUSE_THRESHOLD 1664#ifdef MOUSE_THRESHOLD
1360
1361 } 1665 }
1362#endif 1666#endif
1363
1364 } 1667 }
1365 } 1668 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1670 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1672 MotionNotify, &ev))
1673 ;
1674
1370 XQueryPointer (display->display, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1678 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1679 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1681 scrollbar_size ());
1377 scr_refresh (refresh_type); 1682 want_refresh = 1;
1378 refresh_limit = 0; 1683 refresh_limit = 0;
1379 scrollbar_show (1); 1684 scrollbar_show (1);
1380 } 1685 }
1381 break; 1686 break;
1382 } 1687 }
1383}
1384 1688
1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1715}
1716
1717void
1718rxvt_term::focus_in ()
1719{
1720 if (!focus)
1721 {
1722 focus = 1;
1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM
1728 if (Input_Context != NULL)
1729 {
1730 IMSetPosition ();
1731 XSetICFocus (Input_Context);
1732 }
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_focused;
1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1758 }
1759}
1760
1761void
1762rxvt_term::focus_out ()
1763{
1764 if (focus)
1765 {
1766 focus = 0;
1767 want_refresh = 1;
1768
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1770
1771#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf)
1773 {
1774 iso14755buf = 0;
1775# if ENABLE_OVERLAY
1776 scr_overlay_off ();
1777# endif
1778 }
1779#endif
1780#if USE_XIM
1781 if (Input_Context != NULL)
1782 XUnsetICFocus (Input_Context);
1783#endif
1784#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop ();
1787 hidden_cursor = 0;
1788#endif
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 pix_colors = pix_colors_unfocused;
1793 scr_recolour ();
1794 }
1795#endif
1796 }
1797}
1798
1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1385void 1813void
1386rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1815{
1388 SET_R (this); 1816 make_current ();
1389 SET_LOCALE (locale);
1390 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1391 switch (ev.type) 1823 switch (ev.type)
1392 { 1824 {
1393 case PropertyNotify: 1825 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 /* 1826 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1827 * 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. 1828 * use the property to determine the pixmap. We use it later on.
1406 */ 1829 */
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]) 1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1832 return;
1412 }
1413 1833
1414 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1415 case ReparentNotify: 1835 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1418 break; 1838 break;
1839 }
1419#endif 1840# endif
1420 }
1421} 1841}
1842#endif
1422 1843
1423void 1844void
1424rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1425{ 1846{
1426 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1427 1848
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1429 if (!bypass_keystate) 1851 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1853
1431 /* 1854 /*
1432 * VT window processing of button press 1855 * VT window processing of button press
1433 */ 1856 */
1434 if (ev.window == TermWin.vt) 1857 if (ev.window == vt)
1435 { 1858 {
1859 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 return;
1861
1862#if ISO_14755
1863 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 {
1866 iso14755_54 (ev.x, ev.y);
1867 return;
1868 }
1869#endif
1870
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1871 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1872
1437 if (reportmode) 1873 if (reportmode)
1438 { 1874 {
1439 /* mouse report from vt window */ 1875 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1876 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1877 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1444 { 1880 {
1445 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1446 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1447 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1448 { 1885 {
1449 /* only report double clicks */ 1886 /* only report double clicks */
1450 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1451 mouse_report (ev); 1888 mouse_report (ev);
… …
1470 } 1907 }
1471 else 1908 else
1472 { 1909 {
1473 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1912
1475 switch (ev.button) 1913 switch (ev.button)
1476 { 1914 {
1477 case Button1: 1915 case Button1:
1916 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */
1918#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask);
1920#else
1921 selection.rect = false;
1922#endif
1923
1478 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1926 {
1481 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1483 else 1929 else
1484 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1945 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1502 else 1948 else
1503 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1950
1504 MEvent.button = Button3; 1951 MEvent.button = Button3;
1505 break; 1952 break;
1506 } 1953 }
1507 } 1954 }
1955
1508 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1509 return; 1957 return;
1510 } 1958 }
1511 1959
1512 /* 1960 /*
… …
1623 case Button3: 2071 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1625 { 2073 {
1626 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1629# else 2077# else
1630 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1631# endif 2079# endif
1632 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1635# else 2083# else
1636 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1637# endif 2085# endif
1638 else 2086 else
1639 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1640 } 2088 }
1641 else 2089 else
1642 { 2090 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2092 (nrow
1645 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2094 / scrollbar_size ()));
1647 } 2095 }
1648 2096
1649 break; 2097 break;
1650 } 2098 }
1651 } 2099 }
2100
1652 return; 2101 return;
1653 } 2102 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2103}
1662 2104
1663void 2105void
1664rxvt_term::button_release (XButtonEvent &ev) 2106rxvt_term::button_release (XButtonEvent &ev)
1665{ 2107{
1666 int reportmode = 0; 2108 int reportmode = 0;
1667 2109
1668 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2111 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2113
1672 if (scrollbar_isUpDn ()) 2114 if (scrollbar_isUpDn ())
1673 { 2115 {
1674 scrollBar.setIdle (); 2116 scrollBar.setIdle ();
1675 scrollbar_show (0); 2117 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2118 }
2119
1681#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2121 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2122 sel_scroll_ev.stop();
1684#endif 2123#endif
2124
1685 if (ev.window == TermWin.vt) 2125 if (ev.window == vt)
1686 { 2126 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2130#if ISO_14755
2131 // 5.4
2132 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2133 return;
2134#endif
2135
1687 if (reportmode) 2136 if (reportmode)
1688 { 2137 {
1689 /* mouse report from vt window */ 2138 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2139 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2140 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
1706 mouse_report (ev); 2155 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2156#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2157 return;
1709 } 2158 }
2159
1710 /* 2160 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2161 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2162 * when overriding mouse reporting
1713 */ 2163 */
1714 if (PrivateModes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2165 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
1718 2168
1719 switch (ev.button) 2169 switch (ev.button)
1720 { 2170 {
1721 case Button1: 2171 case Button1:
1722 case Button3: 2172 case Button3:
1723 selection_make (ev.time); 2173 selection_make (ev.time);
1724 break; 2174 break;
2175
1725 case Button2: 2176 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2179 break;
2180
1728#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
1729 case Button4: 2182 case Button4:
1730 case Button5: 2183 case Button5:
1731 { 2184 {
1732 int i; 2185 int i;
… …
1734 2187
1735 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
1736 2189
1737 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
1738 i = 1; 2191 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2192 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2193 i = nrow - 1;
1741 else 2194 else
1742 i = 5; 2195 i = 5;
1743 2196
1744# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2198 if (ev.state & ControlMask)
1746 { 2199 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2200 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2201 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; 2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2203
1751 if (slip_wheel_ev.at < NOW) 2204 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2206
1754 slip_wheel_ev.start (); 2207 slip_wheel_ev.start ();
1755 } 2208 }
1756 else 2209 else
1757 { 2210 {
1758# endif 2211# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2212 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2213 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 2214# ifdef MOUSE_SLIP_WHEELING
1772 } 2215 }
1773#endif 2216# endif
1774 } 2217 }
1775 break; 2218 break;
1776#endif 2219#endif
1777 } 2220 }
1778 } 2221 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2222}
1784 2223
1785#ifdef TRANSPARENT 2224#ifdef TRANSPARENT
1786#if TINTING 2225#if TINTING
1787/* taken from aterm-0.4.2 */ 2226/* taken from aterm-0.4.2 */
1788 2227
1789typedef uint32_t RUINT32T; 2228typedef uint32_t RUINT32T;
1790 2229
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{ 2231{
1793 int sh_r, sh_g, sh_b; 2232 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2233 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2237 int i;
1799 2238
1800 Visual* visual = display->visual; 2239 Visual *visual = term->visual;
1801 2240
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2242
1804 /* for convenience */ 2243 /* for convenience */
1805 mask_r = visual->red_mask; 2244 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2031 2470
2032 pchanged = 0; 2471 pchanged = 0;
2033 2472
2034 if (!(Options & Opt_transparent)) 2473 if (!option (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2036 2475
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2039 2478
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2041 2480
2042 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2043 { 2482 {
2044 if (am_transparent) 2483 if (am_transparent)
2045 { 2484 {
2046 pchanged = 1; 2485 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2049 } 2488 }
2050 2489
2051 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2052 } 2491 }
2053 2492
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2494 XSync (dpy, False);
2056 2495
2057 /* 2496 /*
2058 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2061 */ 2500 */
2062 i = (xa[XA_XROOTPMAPID] 2501 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2066 2505
2067 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2072 2511
2073 if (!i || prop == NULL 2512 if (!i || prop == NULL
2074#if TINTING 2513#if TINTING
2075 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2076#endif 2515#endif
2077 ) 2516 )
2078 have_pixmap = 0; 2517 have_pixmap = 0;
2079 else 2518 else
2080 { 2519 {
… …
2093 Window cr; 2532 Window cr;
2094 XImage *image; 2533 XImage *image;
2095 GC gc; 2534 GC gc;
2096 XGCValues gcvalue; 2535 XGCValues gcvalue;
2097 2536
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2541 nx = ny = 0;
2103 2542
… …
2113 nh += sy; 2552 nh += sy;
2114 ny = -sy; 2553 ny = -sy;
2115 sy = 0; 2554 sy = 0;
2116 } 2555 }
2117 2556
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2559
2560 XSync (dpy, False);
2120 allowedxerror = -1; 2561 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2563
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2566 allowedxerror = 0;
2126 2567
2127 if (image == NULL) 2568 if (image == NULL)
2128 { 2569 {
2129 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2130 { 2571 {
2131 pchanged = 1; 2572 pchanged = 1;
2132 if (TermWin.pixmap != None) 2573 if (pixmap != None)
2133 { 2574 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2575 XFreePixmap (dpy, pixmap);
2135 TermWin.pixmap = None; 2576 pixmap = None;
2136 } 2577 }
2137 } 2578 }
2138 2579
2139 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2140 } 2581 }
2141 else 2582 else
2142 { 2583 {
2143 if (TermWin.pixmap != None) 2584 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2585 XFreePixmap (dpy, pixmap);
2145 2586
2146#if TINTING 2587#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2589 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2591
2592 rgba c;
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2593 pix_colors_focused [Color_tint].get (c);
2153 2594
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2155 } 2596 }
2156#endif 2597#endif
2157 2598
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2599 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); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2603 XFreeGC (dpy, gc);
2164 XDestroyImage (image); 2604 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2606 XClearWindow (dpy, parent[0]);
2167 2607
2168 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2609 pchanged = 1;
2170 2610
2171 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2172 } 2612 }
2173 } 2613 }
2174 2614
2175 if (!am_pixmap_trans) 2615 if (am_pixmap_trans)
2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2617 else
2176 { 2618 {
2177 unsigned int n; 2619 unsigned int n;
2178 /* 2620 /*
2179 * InheritPixmap transparency 2621 * InheritPixmap transparency
2180 */ 2622 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2624 {
2184 oldp = TermWin.parent[i]; 2625 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2627 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2628
2190 if (TermWin.parent[i] == display->root) 2629 if (parent[i] == display->root)
2191 { 2630 {
2192 if (oldp != None) 2631 if (oldp != None)
2193 pchanged = 1; 2632 pchanged = 1;
2194 2633
2195 break; 2634 break;
2196 } 2635 }
2197 2636
2198 if (oldp != TermWin.parent[i]) 2637 if (oldp != parent[i])
2199 pchanged = 1; 2638 pchanged = 1;
2200 } 2639 }
2201 2640
2202 n = 0; 2641 n = 0;
2203 2642
2204 if (pchanged) 2643 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2207 { 2645 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2647
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2649 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2651 break;
2214 } 2652 }
2215 } 2653 }
2654
2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2216 } 2656 {
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]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2659 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2225 } 2661 }
2226 else 2662 else
2227 { 2663 {
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++) 2664 for (n = 0; n < (unsigned int)i; n++)
2235 { 2665 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2667 XClearWindow (dpy, parent[n]);
2238 } 2668 }
2239 2669
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2241 am_transparent = 1; 2671 am_transparent = 1;
2242 } 2672 }
2243 2673
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2675 parent[i] = None;
2246 } 2676 }
2247 2677
2248 // this is experimental
2249 if (scrollBar.win) 2678 if (scrollBar.win)
2250 { 2679 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2254 scrollbar_show (0); 2682 scrollbar_show (0);
2255 } 2683 }
2256 2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2257 return pchanged; 2692 return pchanged;
2258} 2693}
2259#endif 2694#endif
2260 2695
2261/*}}} */ 2696/*}}} */
2262 2697
2263bool 2698bool
2264rxvt_term::cmd_parse () 2699rxvt_term::cmd_parse ()
2265{ 2700{
2266 bool flag = false; 2701 bool flag = false;
2267 unicode_t ch = NOCHAR; 2702 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2703 char *seq_begin; // remember start of esc-sequence here
2269 2704
2270 for (;;) 2705 for (;;)
2271 { 2706 {
2272 if (ch == NOCHAR) 2707 if (ch == NOCHAR)
2273 { 2708 {
2274 seq_begin = cmdbuf_ptr; 2709 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2710 ch = next_char ();
2276 }
2277 2711
2278 if (ch == NOCHAR) // TODO: improve 2712 if (ch == NOCHAR)
2279 break; 2713 break;
2714 }
2280 2715
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2717 {
2718 if (!seen_input)
2719 {
2720 seen_input = 1;
2721 // many badly-written programs (e.g. jed) contain a race condition:
2722 // they first read the screensize and then install a SIGWINCH handler.
2723 // some window managers resize the window early, and these programs
2724 // then sometimes get the size wrong.
2725 // unfortunately other programs are even more buggy and dislike
2726 // being sent SIGWINCH, so only do it when we were in fact being
2727 // resized.
2728 if (seen_resize && cmd_pid)
2729 kill (-cmd_pid, SIGWINCH);
2730 }
2731
2283 /* Read a text string from the input buffer */ 2732 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2733 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2734 bool refreshnow = false;
2286 int nlines = 0; 2735 int nlines = 0;
2287 unicode_t *str = buf; 2736 wchar_t *str = buf;
2737 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2738
2289 for (;;) 2739 for (;;)
2290 { 2740 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2742 break;
2293 2743
2294 *str++ = ch; 2744 *str++ = ch;
2295 2745
2296 if (ch == C0_LF) 2746 if (ch == C0_LF || str >= eol)
2297 { 2747 {
2748 if (ch == C0_LF)
2298 nlines++; 2749 nlines++;
2750
2299 refresh_count++; 2751 refresh_count++;
2300 2752
2301 if (!(Options & Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2755 {
2304 refreshnow = true; 2756 refreshnow = true;
2757 refresh_count = 0;
2305 ch = NOCHAR; 2758 ch = NOCHAR;
2306 break; 2759 break;
2307 } 2760 }
2308 2761
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2763 if (nlines >= nrow - 1)
2311 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2768
2313 nlines = 0; 2769 nlines = 0;
2314 str = buf; 2770 str = buf;
2771 eol = str + min (ncol, UBUFSIZ);
2315 } 2772 }
2316 }
2317 2773
2318 if (str >= buf + UBUFSIZ) 2774 if (str >= eol)
2319 { 2775 {
2776 if (eol >= buf + UBUFSIZ)
2777 {
2320 ch = NOCHAR; 2778 ch = NOCHAR;
2321 break; 2779 break;
2780 }
2781 else
2782 eol = min (eol + ncol, buf + UBUFSIZ);
2783 }
2784
2322 } 2785 }
2323 2786
2324 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2788 ch = next_char ();
2326 } 2789 }
2327 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2329 2794
2330 /* 2795 /*
2331 * If there have been a lot of new lines, then update the screen 2796 * 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. 2797 * 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 2798 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2800 */
2336 if (refreshnow) 2801 if (refreshnow)
2337 { 2802 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2804 refresh_limit++;
2340 else 2805 else
2341 { 2806 {
2342 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2343 scr_refresh (refresh_type); 2809 scr_refresh ();
2810 want_refresh = 1;
2344 } 2811 }
2345 } 2812 }
2346 2813
2347 } 2814 }
2348 else 2815 else
… …
2363 } 2830 }
2364 2831
2365 return flag; 2832 return flag;
2366} 2833}
2367 2834
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 2835// read the next character
2378unicode_t 2836wchar_t
2379rxvt_term::next_char () 2837rxvt_term::next_char () NOTHROW
2380{ 2838{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2839 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2840 {
2383 // assume 7-bit to be ascii ALWAYS 2841 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2843 return *cmdbuf_ptr++;
2386 2844
2387 wchar_t wc; 2845 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2846 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2847
2390 if (len == (size_t)-2) 2848 if (len == (size_t)-2)
2391 { 2849 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2850 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2851 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2852 break;
2395 } 2853 }
2396 2854
2397 if (len == (size_t)-1) 2855 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2856 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2857
2400 // assume wchar == unicode 2858 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2859 cmdbuf_ptr += len;
2402 return wc; 2860 return wc & UNICODE_MASK;
2403 } 2861 }
2404 2862
2405 return NOCHAR; 2863 return NOCHAR;
2406} 2864}
2865
2866// read the next octet
2867uint32_t
2868rxvt_term::next_octet () NOTHROW
2869{
2870 return cmdbuf_ptr < cmdbuf_endp
2871 ? (unsigned char)*cmdbuf_ptr++
2872 : NOCHAR;
2873}
2874
2875static class out_of_input out_of_input;
2407 2876
2408/* rxvt_cmd_getc () - Return next input character */ 2877/* rxvt_cmd_getc () - Return next input character */
2409/* 2878/*
2410 * Return the next input character after first passing any keyboard input 2879 * Return the next input character after first passing any keyboard input
2411 * to the command. 2880 * to the command.
2412 */ 2881 */
2413unicode_t 2882wchar_t
2414rxvt_term::cmd_getc () 2883rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2884{
2416 unicode_t c = next_char (); 2885 wchar_t c = next_char ();
2417 2886
2418 if (c == NOCHAR) 2887 if (c == NOCHAR)
2419 throw out_of_input; 2888 throw out_of_input;
2420 2889
2421 return c; 2890 return c;
2422} 2891}
2423 2892
2424unicode_t 2893uint32_t
2425rxvt_term::cmd_get8 () 2894rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2895{
2427 unicode_t c = next_octet (); 2896 uint32_t c = next_octet ();
2428 2897
2429 if (c == NOCHAR) 2898 if (c == NOCHAR)
2430 throw out_of_input; 2899 throw out_of_input;
2431 2900
2432 return c; 2901 return c;
… …
2532 case C0_ESC: 3001 case C0_ESC:
2533 process_escape_seq (); 3002 process_escape_seq ();
2534 break; 3003 break;
2535 case C0_ENQ: /* terminal Status */ 3004 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 3005 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3006 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 3007 else
2540 tt_write ((unsigned char *)VT100_ANS, 3008 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 3009 break;
2543 case C0_BEL: /* bell */ 3010 case C0_BEL: /* bell */
2544 scr_bell (); 3011 scr_bell ();
2545 break; 3012 break;
2546 case C0_BS: /* backspace */ 3013 case C0_BS: /* backspace */
… …
2645void 3112void
2646rxvt_term::process_escape_seq () 3113rxvt_term::process_escape_seq ()
2647{ 3114{
2648 unicode_t ch = cmd_getc (); 3115 unicode_t ch = cmd_getc ();
2649 3116
2650 if (PrivateModes & PrivMode_vt52) 3117 if (priv_modes & PrivMode_vt52)
2651 { 3118 {
2652 process_escape_vt52 (ch); 3119 process_escape_vt52 (ch);
2653 return; 3120 return;
2654 } 3121 }
2655 3122
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3137 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3138 break;
2672 case '+': 3139 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3140 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3141 break;
2675#ifndef NO_FRILLS 3142#if !ENABLE_MINIMAL
2676 case '6': 3143 case '6':
2677 scr_backindex (); 3144 scr_backindex ();
2678 break; 3145 break;
2679#endif 3146#endif
2680 case '7': 3147 case '7':
2681 scr_cursor (SAVE); 3148 scr_cursor (SAVE);
2682 break; 3149 break;
2683 case '8': 3150 case '8':
2684 scr_cursor (RESTORE); 3151 scr_cursor (RESTORE);
2685 break; 3152 break;
2686#ifndef NO_FRILLS 3153#if !ENABLE_MINIMAL
2687 case '9': 3154 case '9':
2688 scr_forwardindex (); 3155 scr_forwardindex ();
2689 break; 3156 break;
2690#endif 3157#endif
2691 case '=': 3158 case '=':
… …
2701 break; 3168 break;
2702 3169
2703 /* 8.3.87: NEXT LINE */ 3170 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 3171 case C1_NEL: /* ESC E */
2705 { 3172 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 3173 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 3174 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 3175 }
2709 break; 3176 break;
2710 3177
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 3178 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 3179 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 3201 process_dcs_seq ();
2735 break; 3202 break;
2736 3203
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3204 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 3205 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 3206 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 3207 break; /* steal obsolete ESC [ c */
2742 3208
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3209 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 3210 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 3211 process_csi_seq ();
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 3320 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 3321 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 3322 if (arg[p] == -1)
2857 arg[p] = ndef; 3323 arg[p] = ndef;
2858 3324
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 /* 3325 /*
2867 * private mode handling 3326 * private mode handling
2868 */ 3327 */
2869 if (priv) 3328 if (priv)
2870 { 3329 {
2871 switch (priv) 3330 switch (priv)
2872 { 3331 {
2873 case '>': 3332 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3333 if (ch == CSI_DA) /* secondary device attributes */
3334 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3340 // that we do not support xterm mouse reporting (should be 95 when we do).
3341 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3342 tt_printf ("\033[>%d;94;0c", 'U');
3343 }
2876 break; 3344 break;
2877 case '?': 3345 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3347 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3348 break;
… …
2985 3453
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3454 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3455 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3456 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3457 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3458 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3459 break;
2992 3460
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3461 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3462 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3463 break;
2997 3464
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3465 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3466 process_sgr_mode (nargs, arg);
3000 break; 3467 break;
… …
3007 break; 3474 break;
3008 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3009 scr_report_position (); 3476 scr_report_position ();
3010 break; 3477 break;
3011 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3479 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3481 break;
3015 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3484 break;
3018 } 3485 }
… …
3054 break; 3521 break;
3055 3522
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3523 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3524 if (arg[0] == 4)
3058 scr_insert_mode (0); 3525 scr_insert_mode (0);
3526 else if (arg[0] == 20)
3527 priv_modes &= ~PrivMode_LFNL;
3059 break; 3528 break;
3060 3529
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3530 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3531 if (arg[0] == 4)
3063 scr_insert_mode (1); 3532 scr_insert_mode (1);
3533 else if (arg[0] == 20)
3534 priv_modes |= PrivMode_LFNL;
3064 break; 3535 break;
3065 3536
3066 /* 3537 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3538 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3539 */
… …
3080 break; 3551 break;
3081 case CSI_75: 3552 case CSI_75:
3082 scr_cursor (RESTORE); 3553 scr_cursor (RESTORE);
3083 break; 3554 break;
3084 3555
3085#ifndef NO_FRILLS 3556#if !ENABLE_MINIMAL
3086 case CSI_74: 3557 case CSI_74:
3087 process_window_ops (arg, nargs); 3558 process_window_ops (arg, nargs);
3088 break; 3559 break;
3089#endif 3560#endif
3090 3561
… …
3097 break; 3568 break;
3098 } 3569 }
3099} 3570}
3100/*}}} */ 3571/*}}} */
3101 3572
3102#ifndef NO_FRILLS 3573#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3574/* ARGSUSED */
3104void 3575void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3576rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3577{
3107 int x, y; 3578 int x, y;
3108 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3109 Window wdummy; 3580 Window wdummy;
3581
3582 dLocal (Display *, dpy);
3110 3583
3111 if (nargs == 0) 3584 if (nargs == 0)
3112 return; 3585 return;
3113 3586
3114 switch (args[0]) 3587 switch (args[0])
3115 { 3588 {
3116 /* 3589 /*
3117 * commands 3590 * commands
3118 */ 3591 */
3119 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3593 XMapWindow (dpy, parent[0]);
3121 break; 3594 break;
3122 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3596 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3597 break;
3126 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3600 break;
3129 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3603 break;
3132 case 5: /* raise window */ 3604 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3134 break; 3606 break;
3135 case 6: /* lower window */ 3607 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3137 break; 3609 break;
3138 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3139 scr_touch (true); 3611 scr_touch (true);
3140 break; 3612 break;
3141 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3614 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3615 (unsigned int) (args[1] * fheight));
3144 break; 3616 break;
3145 3617
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3618 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3619 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3621 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3622 (unsigned int) (args[1] * fheight));
3151 break; 3623 break;
3152
3153 3624
3154 /* 3625 /*
3155 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3156 */ 3627 */
3157 case 11: /* report window state */ 3628 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3631 break;
3161 case 13: /* report window position */ 3632 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3638 break;
3168 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3642 break;
3172 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3645 break;
3175 case 19: /* report window size (chars) */ 3646 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3648 break;
3178 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3650 {
3181 char *s; 3651 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3654 XFree (s);
3184 } 3655 }
3185 break; 3656 break;
3186 case 21: /* report window title */ 3657 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3658 {
3189 char *s; 3659 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3662 XFree (s);
3192 } 3663 }
3193 break; 3664 break;
3194 } 3665 }
3195} 3666}
3196#endif 3667#endif
3197 3668
3198/*----------------------------------------------------------------------*/ 3669/*----------------------------------------------------------------------*/
3199/* 3670/*
3200 * get input up until STRING TERMINATOR (or BEL) 3671 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3672 * ends_how is terminator used. returned input must be free()'d
3202 */ 3673 */
3203unsigned char * 3674char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3675rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3676{
3206 unicode_t prev = 0, ch; 3677 unicode_t ch;
3678 bool seen_esc = false;
3207 unsigned int n = 0; 3679 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3680 wchar_t string[STRING_MAX];
3210 3681
3211 while ((ch = cmd_getc ()) != NOCHAR) 3682 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3683 {
3213 if (prev == C0_ESC) 3684 if (seen_esc)
3214 { 3685 {
3215 if (ch == 0x5c) /* 7bit ST */ 3686 if (ch == 0x5c) /* 7bit ST */
3216 break; 3687 break;
3217 else 3688 else
3218 return NULL; 3689 return NULL;
3219 } 3690 }
3691 else if (ch == C0_ESC)
3692 {
3693 seen_esc = true;
3694 continue;
3695 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3700 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3224 3702
3225 if (n >= sizeof (string) - 1) 3703 seen_esc = false;
3704
3705 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3706 // stop at some sane length
3227 return NULL; 3707 return NULL;
3228 3708
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3709 string[n++] = ch;
3236 } 3710 }
3237 3711
3238 string[n++] = '\0'; 3712 string[n++] = '\0';
3239 3713
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3715
3245 return s; 3716 return rxvt_wcstombs (string);
3246} 3717}
3247 3718
3248/*----------------------------------------------------------------------*/ 3719/*----------------------------------------------------------------------*/
3249/* 3720/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3721 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3722 */
3252void 3723void
3253rxvt_term::process_dcs_seq () 3724rxvt_term::process_dcs_seq ()
3254{ 3725{
3255 unsigned char *s; 3726 char *s;
3256 unicode_t eh; 3727 unicode_t eh;
3257 3728
3258 /* 3729 /*
3259 * Not handled yet 3730 * Not handled yet
3260 */ 3731 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3750 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3751 arg = arg * 10 + (ch - '0');
3281 3752
3282 if (ch == ';') 3753 if (ch == ';')
3283 { 3754 {
3284 unsigned char *s = get_to_st (eh); 3755 char *s = get_to_st (eh);
3285 3756
3286 if (s) 3757 if (s)
3287 { 3758 {
3288 process_xterm_seq (arg, (char *)s, eh); 3759 process_xterm_seq (arg, s, eh);
3289 free (s); 3760 free (s);
3290 } 3761 }
3291 } 3762 }
3292} 3763}
3293 3764
3294void 3765void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3767{
3297 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3298 { 3769 {
3299 if (Options & Opt_insecure) 3770 rgba c;
3300 { 3771 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3772
3302 PixColorsFocused[color].get (display, r, g, b); 3773#if XFT
3774 if (c.a != rgba::MAX_CC)
3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3776 else
3777#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3779 }
3306 else 3780 else
3307 set_window_color (color, str); 3781 set_window_color (color, str);
3308} 3782}
3309 3783
3310/* 3784/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * 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 */ 3786 */
3335void 3787void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3789{
3338 int changed = 0;
3339 int color; 3790 int color;
3340 char *buf, *name; 3791 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3793 int saveop = op;
3794
3795 dLocal (Display *, dpy);
3342 3796
3343 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3344 switch (op) 3802 switch (op)
3345 { 3803 {
3346 case XTerm_name: 3804 case XTerm_name:
3347 set_title (str); 3805 set_title (str);
3348 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3353 set_title (str); 3811 set_title (str);
3354 break; 3812 break;
3355 case XTerm_property: 3813 case XTerm_property:
3356 if (str[0] == '?') 3814 if (str[0] == '?')
3357 { 3815 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3816 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3817 Atom actual_type;
3360 int actual_format; 3818 int actual_format;
3361 unsigned long nitems; 3819 unsigned long nitems;
3362 unsigned long bytes_after; 3820 unsigned long bytes_after;
3363 unsigned char *value = 0; 3821 unsigned char *value = 0;
3364 const char *str = ""; 3822 const char *str = "";
3365 3823
3366 if (prop 3824 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3829 && actual_type != None
3372 && actual_format == 8) 3830 && actual_format == 8)
3373 str = (const char *)(value); 3831 str = (const char *)(value);
3374 3832
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3833 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3834
3377 XFree (value); 3835 XFree (value);
3378 } 3836 }
3379 else 3837 else
3380 { 3838 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3839 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3840
3383 if (eq) 3841 if (eq)
3384 { 3842 {
3385 *eq = 0; 3843 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3844 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 } 3845 }
3391 else 3846 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3847 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3848 display->atom (str));
3394 } 3849 }
3395 break; 3850 break;
3396 3851
3397 case XTerm_Color: 3852 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3853 for (buf = (char *)str; buf && *buf;)
3399 { 3854 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3855 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3856 break;
3402 3857
3403 *name++ = '\0'; 3858 *name++ = '\0';
3404 color = atoi (buf); 3859 color = atoi (buf) + minCOLOR;
3405 3860
3406 if (color < 0 || color >= TOTAL_COLORS) 3861 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3862 break;
3408 3863
3409 if ((buf = STRCHR (name, ';')) != NULL) 3864 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3865 *buf++ = '\0';
3411 3866
3412 if (name[0] == '?' && !name[1]) 3867 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 } 3868 }
3424 break; 3869 break;
3425 case XTerm_Color00: 3870 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3871 process_color_seq (op, Color_fg, str, resp);
3427 break; 3872 break;
3428 case XTerm_Color01: 3873 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3874 process_color_seq (op, Color_bg, str, resp);
3430 break; 3875 break;
3431#ifndef NO_CURSORCOLOR 3876#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3877 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3878 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3879 break;
3435#endif 3880#endif
3436 case XTerm_Color_pointer_fg: 3881 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3882 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3883 break;
3439 case XTerm_Color_pointer_bg: 3884 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3885 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3886 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3887#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: 3888 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3889 process_color_seq (op, Color_RV, str, resp);
3451 break; 3890 break;
3891 case Rxvt_Color_BD:
3892 case URxvt_Color_BD:
3893 process_color_seq (op, Color_BD, str, resp);
3894 break;
3895 case Rxvt_Color_UL:
3896 case URxvt_Color_UL:
3897 process_color_seq (op, Color_UL, str, resp);
3898 break;
3899 case URxvt_Color_IT:
3900 process_color_seq (op, Color_IT, str, resp);
3901 break;
3452#endif 3902#endif
3903#if TRANSPARENT && TINTING
3904 case URxvt_Color_tint:
3905 process_color_seq (op, Color_tint, str, resp);
3453 3906
3907 check_our_parents ();
3908
3909 if (am_transparent)
3910 want_full_refresh = want_refresh = 1;
3911
3912 break;
3913#endif
3914
3454 case XTerm_Pixmap: 3915 case Rxvt_Pixmap:
3916 {
3455 if (*str != ';') 3917 if (*str != ';')
3456 { 3918 {
3457#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3920 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3921 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3922 scr_touch (true);
3923#endif
3462 } 3924 }
3925
3926 int changed = 0;
3927
3463 while ((str = STRCHR (str, ';')) != NULL) 3928 while ((str = strchr (str, ';')) != NULL)
3464 { 3929 {
3465 str++; 3930 str++;
3466#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3932 changed += scale_pixmap (str);
3468#endif 3933#endif
3469
3470 } 3934 }
3935
3471 if (changed) 3936 if (changed)
3472 { 3937 {
3473#ifdef XPM_BACKGROUND 3938#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3939 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3940 scr_touch (true);
3941#endif
3477 } 3942 }
3943 }
3478 break; 3944 break;
3479 3945
3480 case XTerm_restoreFG: 3946 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3947 set_window_color (Color_fg, str);
3482 break; 3948 break;
3483 case XTerm_restoreBG: 3949 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3950 set_window_color (Color_bg, str);
3485 break; 3951 break;
3486 3952
3487 case XTerm_logfile: 3953 case XTerm_logfile:
3488 // TODO, when secure mode? 3954 // TODO, when secure mode?
3489 break; 3955 break;
3490 3956
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 3957#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3958 case Rxvt_dumpscreen: /* no error notices */
3539 { 3959 {
3540 int fd; 3960 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3961 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3962 {
3543 scr_dump (fd); 3963 scr_dump (fd);
3544 close (fd); 3964 close (fd);
3545 } 3965 }
3546 } 3966 }
3967 break;
3968#endif
3969 case XTerm_font:
3970 op = URxvt_font;
3971 case URxvt_font:
3972#if ENABLE_STYLES
3973 case URxvt_boldFont:
3974 case URxvt_italicFont:
3975 case URxvt_boldItalicFont:
3976#endif
3977 if (query)
3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3980 ? fontset[op - URxvt_font]->fontdesc : "",
3981 resp);
3982 else
3983 {
3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
3985
3986 res = strdup (str);
3987 allocated.push_back ((void *)res);
3988 set_fonts ();
3989 }
3990 break;
3991
3992 case URxvt_version:
3993 if (query)
3994 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3995 op,
3996 rs[Rs_name], VERSION[0], VERSION[2],
3997 resp);
3998 break;
3999
4000#if !ENABLE_MINIMAL
4001 case URxvt_locale:
4002 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4004 else
4005 {
4006 set_locale (str);
4007 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale ();
4009 }
4010 break;
4011
4012 case URxvt_view_up:
4013 case URxvt_view_down:
4014 {
4015 int lines = atoi (str);
4016
4017 if (lines)
4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
4019 else
4020 scr_erase_savelines ();
4021 }
4022
4023 break;
4024#endif
4025
4026#if ENABLE_PERL
4027 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4029 ; // no responses yet
3547 break; 4030 break;
3548#endif 4031#endif
3549 } 4032 }
3550} 4033}
3551/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
3565{ 4048{
3566 int state; 4049 int state;
3567 4050
3568 if (mode == 's') 4051 if (mode == 's')
3569 { 4052 {
3570 SavedModes |= (PrivateModes & bit); 4053 SavedModes |= (priv_modes & bit);
3571 return -1; 4054 return -1;
3572 } 4055 }
3573 else 4056 else
3574 { 4057 {
3575 if (mode == 'r') 4058 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4059 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 4060 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4061 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 4062 PrivMode (state, bit);
3580 } 4063 }
3581 4064
3582 return state; 4065 return state;
3583} 4066}
3584 4067
3585/* we're not using priv _yet_ */ 4068/* we're not using priv _yet_ */
3586void 4069void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4070rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 4071{
3589 unsigned int i, j; 4072 unsigned int i, j;
3590 int state; 4073 int state;
3591 4074
3592 static const struct 4075 static const struct
… …
3601 { 3, PrivMode_132 }, 4084 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4085 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4086 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4087 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4088 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4090 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4091 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4092 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4093#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4094 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4095#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4096 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4097 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4098 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4099 // 45 margin bell NYI
3620 // 46 start logging 4100 // 46 start logging
… …
3660 } 4140 }
3661 4141
3662 /* extra handling for values with state unkept */ 4142 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4143 switch (arg[i])
3664 { 4144 {
4145#if ENABLE_STYLES
4146 case 1021:
4147 set_option (Opt_intensityStyles, mode);
4148
4149 scr_touch (true);
4150 break;
4151#endif
3665 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4153 case 1049:
3666 if (Options & Opt_secondaryScreen) 4154 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 4155 if (mode == 0)
3668 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
3669 else if (mode == 1) 4157 else if (mode == 1)
3670 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
3671 break; 4159 break;
… …
3682 * within VT52 mode 4170 * within VT52 mode
3683 */ 4171 */
3684 PrivMode (1, PrivMode_vt52); 4172 PrivMode (1, PrivMode_vt52);
3685 break; 4173 break;
3686 case 3: /* 80/132 */ 4174 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4175 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4176 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4177 break;
3690 case 4: /* smooth scrolling */ 4178 case 4: /* smooth scrolling */
3691 if (state) 4179 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4180 break;
3696 case 5: /* reverse video */ 4181 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
3698 break; 4183 break;
3699 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4188 scr_autowrap (state);
3704 break; 4189 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4194 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 4195#ifdef scrollBar_esc
3718 case scrollBar_esc: 4196 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4197 if (scrollbar_mapping (state))
3720 { 4198 {
3721 resize_all_windows (0, 0, 0); 4199 resize_all_windows (0, 0, 0);
… …
3733 break; 4211 break;
3734 /* case 66: - application key pad */ 4212 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4213 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4214 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4215 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4216 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4217 break;
3740#if 0 4218#if 0
3741 case 1001: 4219 case 1001:
3742 break; /* X11 mouse highlighting */ 4220 break; /* X11 mouse highlighting */
3743#endif 4221#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4222 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4223 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4224 break;
3750 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4226 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4227 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4229 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4231 scr_erase_screen (2);
3760 scr_change_screen (state); 4232 scr_change_screen (state);
3761 break; 4233 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4235 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4236 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4238 scr_erase_screen (2);
3767 break; 4239 break;
3768 default: 4240 default:
3769 break; 4241 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4267 rendset = 0, rendstyle = ~RS_None;
3796 break; 4268 break;
3797 case 1: 4269 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4270 rendset = 1, rendstyle = RS_Bold;
3799 break; 4271 break;
3800 //case 2: // faint or second colour 4272 //case 2: // low intensity
4273 case 3:
4274 rendset = 1, rendstyle = RS_Italic;
4275 break;
3801 case 4: 4276 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4277 rendset = 1, rendstyle = RS_Uline;
3803 break; 4278 break;
3804 case 5: // slowly blinking 4279 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4280 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4292 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4293 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4294 //...
3820 //case 19: // ninth alt font 4295 //case 19: // ninth alt font
3821 //case 20: // gothic 4296 //case 20: // gothic
3822 case 21: // disable bold, faint 4297 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4298 rendset = 0, rendstyle = RS_Bold;
3824 break; 4299 break;
3825 case 22: 4300 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4301 rendset = 0, rendstyle = RS_Bold;
3827 break; 4302 break;
3828 //case 23: disable italic 4303 case 23: // disable italic
4304 rendset = 0, rendstyle = RS_Italic;
4305 break;
3829 case 24: 4306 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4307 rendset = 0, rendstyle = RS_Uline;
3831 break; 4308 break;
3832 case 25: 4309 case 25:
4310 rendset = 0, rendstyle = RS_Blink;
4311 break;
4312 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4313 rendset = 0, rendstyle = RS_Blink;
3834 break; 4314 break;
3835 case 27: 4315 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4316 rendset = 0, rendstyle = RS_RVid;
3837 break; 4317 break;
… …
3855 case 35: 4335 case 35:
3856 case 36: 4336 case 36:
3857 case 37: 4337 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4338 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4339 break;
3860#ifdef TTY_256COLOR 4340 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4341 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4342 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4343 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4344 i += 2;
3866 } 4345 }
3867 break; 4346 break;
3868#endif
3869 case 39: /* default fg */ 4347 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4348 scr_color (Color_fg, Color_fg);
3871 break; 4349 break;
3872 4350
3873 case 40: 4351 case 40:
… …
3878 case 45: 4356 case 45:
3879 case 46: 4357 case 46:
3880 case 47: 4358 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4359 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4360 break;
3883#ifdef TTY_256COLOR 4361 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4362 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4363 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4364 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4365 i += 2;
3889 } 4366 }
3890 break; 4367 break;
3891#endif
3892 case 49: /* default bg */ 4368 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4369 scr_color (Color_bg, Color_bg);
3894 break; 4370 break;
3895 4371
3896#ifndef NO_BRIGHTCOLOR 4372 //case 50: // not variable spacing
4373
4374#if !ENABLE_MINIMAL
3897 case 90: 4375 case 90:
3898 case 91: /* set bright fg color */ 4376 case 91: /* set bright fg color */
3899 case 92: 4377 case 92:
3900 case 93: 4378 case 93:
3901 case 94: 4379 case 94:
3902 case 95: 4380 case 95:
3903 case 96: 4381 case 96:
3904 case 97: 4382 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4383 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4384 break;
3908 case 100: 4385 case 100:
3909 case 101: /* set bright bg color */ 4386 case 101: /* set bright bg color */
3910 case 102: 4387 case 102:
3911 case 103: 4388 case 103:
3912 case 104: 4389 case 104:
3913 case 105: 4390 case 105:
3914 case 106: 4391 case 106:
3915 case 107: 4392 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4394 break;
3919#endif 4395#endif
3920
3921 } 4396 }
3922 } 4397 }
3923} 4398}
3924/*}}} */ 4399/*}}} */
3925 4400
… …
3929{ 4404{
3930 unicode_t ch, cmd = cmd_getc (); 4405 unicode_t ch, cmd = cmd_getc ();
3931 4406
3932 if (cmd == 'Q') 4407 if (cmd == 'Q')
3933 { /* query graphics */ 4408 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4409 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4410 return;
3936 } 4411 }
3937 /* swallow other graphics sequences until terminating ':' */ 4412 /* swallow other graphics sequences until terminating ':' */
3938 do 4413 do
3939 ch = cmd_getc (); 4414 ch = cmd_getc ();
… …
3949 */ 4424 */
3950void 4425void
3951rxvt_term::tt_printf (const char *fmt,...) 4426rxvt_term::tt_printf (const char *fmt,...)
3952{ 4427{
3953 va_list arg_ptr; 4428 va_list arg_ptr;
3954 unsigned char buf[256]; 4429 char buf[256];
3955 4430
3956 va_start (arg_ptr, fmt); 4431 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4432 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4433 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4434 tt_write (buf, strlen (buf));
3960} 4435}
3961 4436
3962/* ---------------------------------------------------------------------- */ 4437/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4438/* 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. 4439 * or generated by us in response to a query ESC sequence.
3965 */ 4440 */
4441const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4442
3966void 4443void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4444rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4445{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4446 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4447 return;
3970 4448
3971 if (len) 4449 if (pty->pty < 0)
4450 return;
4451
4452 if (v_buflen == 0)
4453 {
4454 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4455
4456 if ((unsigned int)written == len)
4457 return;
4458
4459 data += written;
4460 len -= written;
3972 { 4461 }
4462
4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4464
4465 memcpy (v_buffer + v_buflen, data, len);
4466 v_buflen += len;
4467
4468 pty_ev.set (EVENT_READ | EVENT_WRITE);
4469}
4470
4471void rxvt_term::pty_write ()
4472{
4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4474
4475 if (written > 0)
4476 {
4477 v_buflen -= written;
4478
3973 if (v_buflen == 0) 4479 if (v_buflen == 0)
3974 { 4480 {
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); 4481 free (v_buffer);
4002 v_buffer = 0; 4482 v_buffer = 0;
4003 v_buflen = 0; 4483 v_buflen = 0;
4004 4484
4005 pty_ev.set (EVENT_READ); 4485 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; 4486 return;
4018 } 4487 }
4488
4489 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4490 }
4491 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4492 pty_ev.set (EVENT_READ);
4020} 4493}
4021 4494
4022/*----------------------- end-of-file (C source) -----------------------*/ 4495/*----------------------- end-of-file (C source) -----------------------*/
4023 4496

Diff Legend

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