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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC

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

Diff Legend

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