ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.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;
… …
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 ();
… …
666 } 958 }
667#endif 959#endif
668 960
669 if (want_refresh) 961 if (want_refresh)
670 { 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
671 scr_refresh (refresh_type); 1001 scr_refresh ();
672 scrollbar_show (1); 1002 scrollbar_show (1);
673#ifdef USE_XIM 1003#ifdef USE_XIM
674 IMSendSpot (); 1004 IMSendSpot ();
675#endif 1005#endif
676 } 1006 }
677 1007
678 display->flush (); 1008 display->flush ();
679
680 flush_ev.stop ();
681} 1009}
682 1010
683void 1011void
684rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
685{ 1013{
686 SET_R (this); 1014 make_current ();
687 SET_LOCALE (locale);
688 1015
689 display->flush (); 1016 display->flush ();
690 1017
691 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1020}
694 1021
695void 1022void
696rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
697{ 1024{
698 SET_R (this); 1025 make_current ();
699 SET_LOCALE (locale);
700 1026
701 refresh_limit = 1; 1027 refresh_limit = 1;
702 refresh_count = 0; 1028 refresh_count = 0;
703 flush (); 1029 flush ();
704} 1030}
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1035{
710 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1037 want_refresh = 1;
712 1038
713 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1040}
715#endif 1041#endif
716 1042
717#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
718void 1044void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1059{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1062 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1063 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1065 }
741} 1066}
742#endif 1067#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1072{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1074 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1076 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1078 }
755} 1079}
756#endif 1080#endif
… …
761{ 1085{
762 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
763 || 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)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1089 {
766 refresh_type |= SMOOTH_REFRESH; 1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
767 want_refresh = 1; 1093 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1095 }
770} 1096}
771#endif 1097#endif
772 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
773bool 1124bool
774rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
775{ 1126{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1128
778 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
779 { 1130 {
780 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");
781 n = 0; 1132 n = 0;
782 } 1133 }
783 1134
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
787 1138
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1140
790 if (n > 0) 1141 if (r > 0)
791 { 1142 {
792 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
793 return true; 1144 return true;
794 } 1145 }
795 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))
796 destroy (); 1158 destroy ();
1159 }
797 1160
798 return false; 1161 return false;
799} 1162}
800 1163
801void 1164void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1166{
804 SET_R (this); 1167 make_current ();
805 SET_LOCALE (locale);
806 1168
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1171 while (pty_fill ())
812 if (cmd_parse ()) 1172 if (cmd_parse ())
813 break; 1173 break;
1174
1175 if (revents & EVENT_WRITE)
1176 pty_write ();
814} 1177}
815 1178
816void 1179void
817rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
818{ 1181{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1183 recolour_cursor ();
821 1184
822#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1186 hidden_pointer = 0;
824 1187
825 if (Options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1190#endif
828} 1191}
829 1192
830#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
831void 1194void
832rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
833{ 1196{
834 if (! (Options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
835 return; 1198 return;
836 1199
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1201 XFlush (dpy);
839 1202
840 hidden_pointer = 1; 1203 hidden_pointer = 1;
841} 1204}
842 1205
843void 1206void
844rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
845{ 1208{
846 SET_R (this); 1209 make_current ();
847 SET_LOCALE (locale);
848 1210
849 pointer_blank (); 1211 pointer_blank ();
850} 1212}
851#endif 1213#endif
852 1214
… …
859 x = ev.x; 1221 x = ev.x;
860 y = ev.y; 1222 y = ev.y;
861 pixel_position (&x, &y); 1223 pixel_position (&x, &y);
862 1224
863 if (MEvent.button == AnyButton) 1225 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1226 button_number = 3;
866 }
867 else 1227 else
868 { 1228 {
869 button_number = MEvent.button - Button1; 1229 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1230 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1231 if (button_number >= 3)
872 button_number += (64 - 3); 1232 button_number += (64 - 3);
873 } 1233 }
874 1234
875 if (PrivateModes & PrivMode_MouseX10) 1235 if (priv_modes & PrivMode_MouseX10)
876 { 1236 {
877 /* 1237 /*
878 * do not report ButtonRelease 1238 * do not report ButtonRelease
879 * no state info allowed 1239 * no state info allowed
880 */ 1240 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1255 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1256 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1257#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1258 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1259#endif
900
901 } 1260 }
902 1261
903#ifdef DEBUG_MOUSEREPORT 1262#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1263 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1264 if (key_state & 16)
906 fputc ('C', stderr); 1265 fputc ('C', stderr);
907 if (key_state & 4) 1266 if (key_state & 4)
908 fputc ('S', stderr); 1267 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1271 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1272 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1273 button_number,
915 x + 1, 1274 x + 1,
916 y + 1); 1275 y + 1);
917#else 1276#endif
1277
918 tt_printf ("\033[M%c%c%c", 1278 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
920 (32 + x + 1), 1280 (32 + x + 1),
921 (32 + y + 1)); 1281 (32 + y + 1));
922#endif
923} 1282}
924
925#ifdef USING_W11LIB
926void
927rxvt_W11_process_x_event (XEvent *ev)
928{
929 rxvt_t *r = rxvt_get_r ();
930
931 x_cb (*ev);
932}
933#endif
934 1283
935/*{{{ process an X event */ 1284/*{{{ process an X event */
936void 1285void
937rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
938{ 1287{
939 SET_R (this); 1288 make_current ();
940 SET_LOCALE (locale);
941 1289
942#if defined(CURSOR_BLINK) 1290 dLocal (Display *, dpy);
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950 1291
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1292 if (ev.xany.window == vt
952 } 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return; 1295 return;
972#endif
973 1296
1297 // for XQueryPointer
974 Window unused_root, unused_child; 1298 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1299 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1300 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1025#endif
1026 1301
1027 switch (ev.type) 1302 switch (ev.type)
1028 { 1303 {
1029 case KeyPress: 1304 case KeyPress:
1305#if ISO_14755
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1030 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)))
1031 break; 1376 break;
1032 1377
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1380 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1045 } 1383#endif
1046 break; 1384 break;
1047 } 1385 }
1048#endif
1049 1386
1050 case ButtonPress: 1387 case ButtonPress:
1051 button_press (ev.xbutton); 1388 button_press (ev.xbutton);
1052 break; 1389 break;
1053 1390
… …
1055 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1056 break; 1393 break;
1057 1394
1058 case ClientMessage: 1395 case ClientMessage:
1059 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1397 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1061 destroy ();
1062#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink))
1068 { 1398 {
1069 /* Get Dnd data */ 1399 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1400 {
1071 int ActualFormat; 1401 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1402 {
1073 unsigned long Size, RemainingBytes; 1403 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1404 {
1075 XGetWindowProperty (display->display, display->root, 1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1406 destroy ();
1077 0L, 1000000L, 1407 }
1078 False, AnyPropertyType, 1408#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1412 &ev);
1082 XChangeProperty (display->display, display->root, 1413#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1414 }
1084 8, PropModeReplace, 1415 }
1085 data, STRLEN (data)); 1416#if ENABLE_XEMBED
1086 XFree (data); 1417 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 {
1088 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
1089 } 1425 }
1090#endif /* OFFIX_DND */
1091 break; 1426 break;
1092 1427
1093 case MappingNotify: 1428 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping); 1429 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1430 break;
… …
1118 break; 1453 break;
1119 } 1454 }
1120 break; 1455 break;
1121 1456
1122 case FocusIn: 1457 case FocusIn:
1123 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])
1124 { 1467 {
1125 TermWin.focus = 1; 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1469 ;
1127#ifdef USE_XIM 1470
1128 if (Input_Context != NULL) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1472 {
1138 PixColors = PixColorsFocused; 1473 seen_resize = 1;
1139 set_colorfgbg (); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1475 }
1143#endif
1144 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
1145 } 1483 }
1146 break; 1484 break;
1147 1485
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1486 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1488 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1489 && ev.xproperty.state == PropertyNewValue)
1490 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1491
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1492 break;
1201 1493
1202 case SelectionClear: 1494 case SelectionClear:
1203 selection_clear (); 1495 selection_clear ();
1204 break; 1496 break;
1205 1497
1206 case SelectionNotify: 1498 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1499 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1500 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1501 break;
1211 1502
1212 case SelectionRequest: 1503 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1504 selection_send (ev.xselectionrequest);
1214 break; 1505 break;
1215 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
1216 case UnmapNotify: 1515 case UnmapNotify:
1217 TermWin.mapped = 0; 1516 mapped = 0;
1218#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1220#endif 1519#endif
1221 break; 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1222
1223 case MapNotify:
1224 TermWin.mapped = 1;
1225#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif
1228 break; 1521 break;
1229 1522
1230#ifdef TRANSPARENT 1523#ifdef TRANSPARENT
1231 case ReparentNotify: 1524 case ReparentNotify:
1232 rootwin_cb (ev); 1525 rootwin_cb (ev);
1233 break; 1526 break;
1234#endif /* TRANSPARENT */ 1527#endif /* TRANSPARENT */
1235 1528
1236 case GraphicsExpose: 1529 case GraphicsExpose:
1237 case Expose: 1530 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1531 if (ev.xany.window == vt)
1239 { 1532 {
1240 do 1533 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1537
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1539
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1250 1543
1251 scr_refresh (refresh_type); 1544 want_refresh = 1;
1252 } 1545 }
1253 else 1546 else
1254 { 1547 {
1255 XEvent unused_event; 1548 XEvent unused_event;
1256 1549
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1551 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1553 ;
1261 1554
1262 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1263 { 1556 {
1264 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1265 scrollbar_show (0); 1558 scrollbar_show (0);
1266 } 1559 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1560
1272#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1275#endif 1564#endif
1276 } 1565 }
1277 break; 1566 break;
1278 1567
1279 case MotionNotify: 1568 case MotionNotify:
1280#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1570 if (hidden_pointer)
1282 pointer_unblank (); 1571 pointer_unblank ();
1283#endif 1572#endif
1284#if MENUBAR 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1574 break;
1575
1576 if (ev.xany.window == vt)
1286 { 1577 {
1287 menubar_control (ev.xbutton); 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1580 ; // nop
1290#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break;
1293
1294 if (ev.xany.window == TermWin.vt)
1295 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1582 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1584 ;
1300 1585
1301 XQueryPointer (display->display, TermWin.vt, 1586 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1589 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1590 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1592 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1593 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1594 {
1310#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
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1606
1313#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1610 {
1317 int dist; 1611 int dist;
1318 1612
1319 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1618
1325 /* save the event params so we can highlight 1619 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1620 * the selection in the pending-scroll loop
1327 */ 1621 */
1328 selection_save_x=ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1625
1333 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1335 { 1628 {
1336 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1338 } 1631 }
1339 else 1632 else
1340 { 1633 {
1341 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1635 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1636 }
1637
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1638 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1640 + 1;
1347 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1349 } 1643 }
1350 else 1644 else
1351 { 1645 {
1352 /* we are within the text window, so we 1646 /* we are within the text window, so we
1353 * shouldn't be scrolling 1647 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1649 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1650 sel_scroll_ev.stop();
1357 } 1651 }
1358#endif 1652#endif
1359#ifdef MOUSE_THRESHOLD 1653#ifdef MOUSE_THRESHOLD
1360
1361 } 1654 }
1362#endif 1655#endif
1363
1364 } 1656 }
1365 } 1657 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1659 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1661 MotionNotify, &ev))
1662 ;
1663
1370 XQueryPointer (display->display, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1667 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1668 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1670 scrollbar_size ());
1377 scr_refresh (refresh_type); 1671 want_refresh = 1;
1378 refresh_limit = 0; 1672 refresh_limit = 0;
1379 scrollbar_show (1); 1673 scrollbar_show (1);
1380 } 1674 }
1381 break; 1675 break;
1382 } 1676 }
1383}
1384 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
1385void 1778void
1386rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1780{
1388 SET_R (this); 1781 make_current ();
1389 SET_LOCALE (locale);
1390 1782
1391 switch (ev.type) 1783 switch (ev.type)
1392 { 1784 {
1393 case PropertyNotify: 1785 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1786 /*
1404 * 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,
1405 * 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.
1406 */ 1789 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1792 return;
1412 }
1413 1793
1414 /* FALLTHROUGH */ 1794 /* FALLTHROUGH */
1415 case ReparentNotify: 1795 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1797 want_refresh = want_full_refresh = 1;
1418 break; 1798 break;
1419#endif
1420 } 1799 }
1421} 1800}
1801#endif
1422 1802
1423void 1803void
1424rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
1425{ 1805{
1426 int reportmode = 0, clickintime; 1806 int reportmode = 0, clickintime;
1427 1807
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1808 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1809
1429 if (!bypass_keystate) 1810 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1811 reportmode = !! (priv_modes & PrivMode_mouse_report);
1812
1431 /* 1813 /*
1432 * VT window processing of button press 1814 * VT window processing of button press
1433 */ 1815 */
1434 if (ev.window == TermWin.vt) 1816 if (ev.window == vt)
1435 { 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
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1830 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1831
1437 if (reportmode) 1832 if (reportmode)
1438 { 1833 {
1439 /* mouse report from vt window */ 1834 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1835 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1836 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1444 { 1839 {
1445 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1446 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1447 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1448 { 1844 {
1449 /* only report double clicks */ 1845 /* only report double clicks */
1450 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1451 mouse_report (ev); 1847 mouse_report (ev);
… …
1470 } 1866 }
1471 else 1867 else
1472 { 1868 {
1473 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1870 MEvent.clicks = 0;
1871
1475 switch (ev.button) 1872 switch (ev.button)
1476 { 1873 {
1477 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
1478 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1885 {
1481 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1483 else 1888 else
1484 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1904 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1905 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1906 selection_rotate (ev.x, ev.y);
1502 else 1907 else
1503 selection_extend (ev.x, ev.y, 1); 1908 selection_extend (ev.x, ev.y, 1);
1909
1504 MEvent.button = Button3; 1910 MEvent.button = Button3;
1505 break; 1911 break;
1506 } 1912 }
1507 } 1913 }
1914
1508 MEvent.time = ev.time; 1915 MEvent.time = ev.time;
1509 return; 1916 return;
1510 } 1917 }
1511 1918
1512 /* 1919 /*
… …
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 }
1648 2055
1649 break; 2056 break;
1650 } 2057 }
1651 } 2058 }
2059
1652 return; 2060 return;
1653 } 2061 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2062}
1662 2063
1663void 2064void
1664rxvt_term::button_release (XButtonEvent &ev) 2065rxvt_term::button_release (XButtonEvent &ev)
1665{ 2066{
1666 int reportmode = 0; 2067 int reportmode = 0;
1667 2068
1668 csrO = 0; /* reset csr Offset */ 2069 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2070 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2071 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2072
1672 if (scrollbar_isUpDn ()) 2073 if (scrollbar_isUpDn ())
1673 { 2074 {
1674 scrollBar.setIdle (); 2075 scrollBar.setIdle ();
1675 scrollbar_show (0); 2076 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2077 }
2078
1681#ifdef SELECTION_SCROLLING 2079#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2080 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
1684#endif 2082#endif
2083
1685 if (ev.window == TermWin.vt) 2084 if (ev.window == vt)
1686 { 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
1687 if (reportmode) 2095 if (reportmode)
1688 { 2096 {
1689 /* mouse report from vt window */ 2097 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2113 MEvent.button = AnyButton;
1706 mouse_report (ev); 2114 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2115#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2116 return;
1709 } 2117 }
2118
1710 /* 2119 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2120 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2121 * when overriding mouse reporting
1713 */ 2122 */
1714 if (PrivateModes & PrivMode_mouse_report 2123 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2124 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2125 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2126 selection_extend (ev.x, ev.y, 0);
1718 2127
1719 switch (ev.button) 2128 switch (ev.button)
1720 { 2129 {
1721 case Button1: 2130 case Button1:
1722 case Button3: 2131 case Button3:
1723 selection_make (ev.time); 2132 selection_make (ev.time);
1724 break; 2133 break;
2134
1725 case Button2: 2135 case Button2:
1726 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);
1727 break; 2138 break;
2139
1728#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
1729 case Button4: 2141 case Button4:
1730 case Button5: 2142 case Button5:
1731 { 2143 {
1732 int i; 2144 int i;
… …
1734 2146
1735 v = ev.button == Button4 ? UP : DN; 2147 v = ev.button == Button4 ? UP : DN;
1736 2148
1737 if (ev.state & ShiftMask) 2149 if (ev.state & ShiftMask)
1738 i = 1; 2150 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2151 else if (OPTION (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2152 i = nrow - 1;
1741 else 2153 else
1742 i = 5; 2154 i = 5;
1743 2155
1744# ifdef MOUSE_SLIP_WHEELING 2156# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2157 if (ev.state & ControlMask)
1746 { 2158 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2159 mouse_slip_wheel_speed += v ? -1 : 1;
1748 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;
1749 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;
1750 2162
1751 if (slip_wheel_ev.at < NOW) 2163 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2164 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2165
1754 slip_wheel_ev.start (); 2166 slip_wheel_ev.start ();
1755 } 2167 }
1756 else 2168 else
1757 { 2169 {
1758# endif 2170# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2171 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2172 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING 2173# ifdef MOUSE_SLIP_WHEELING
1772 } 2174 }
1773#endif 2175# endif
1774 } 2176 }
1775 break; 2177 break;
1776#endif 2178#endif
1777 } 2179 }
1778 } 2180 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2181}
1784 2182
1785#ifdef TRANSPARENT 2183#ifdef TRANSPARENT
1786#if TINTING 2184#if TINTING
1787/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
1788 2186
1789typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
1790 2188
1791void 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)
1792{ 2190{
1793 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2196 int i;
1799 2197
1800 Visual* visual = display->visual; 2198 Visual *visual = term->visual;
1801 2199
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2201
1804 /* for convenience */ 2202 /* for convenience */
1805 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2031 2429
2032 pchanged = 0; 2430 pchanged = 0;
2033 2431
2034 if (!(Options & Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2036 2434
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2039 2437
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2041 2439
2042 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2043 { 2441 {
2044 if (am_transparent) 2442 if (am_transparent)
2045 { 2443 {
2046 pchanged = 1; 2444 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2049 } 2447 }
2050 2448
2051 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2052 } 2450 }
2053 2451
2054 /* 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. */
2055 XSync (display->display, False); 2453 XSync (dpy, False);
2056 2454
2057 /* 2455 /*
2058 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2060 * 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.
2061 */ 2459 */
2062 i = (xa[XA_XROOTPMAPID] 2460 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2066 2464
2067 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2072 2470
2073 if (!i || prop == NULL 2471 if (!i || prop == NULL
2074#if TINTING 2472#if TINTING
2075 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2076#endif 2474#endif
2077 ) 2475 )
2078 have_pixmap = 0; 2476 have_pixmap = 0;
2079 else 2477 else
2080 { 2478 {
… …
2093 Window cr; 2491 Window cr;
2094 XImage *image; 2492 XImage *image;
2095 GC gc; 2493 GC gc;
2096 XGCValues gcvalue; 2494 XGCValues gcvalue;
2097 2495
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2500 nx = ny = 0;
2103 2501
… …
2113 nh += sy; 2511 nh += sy;
2114 ny = -sy; 2512 ny = -sy;
2115 sy = 0; 2513 sy = 0;
2116 } 2514 }
2117 2515
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (dpy, False);
2120 allowedxerror = -1; 2520 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2522
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2525 allowedxerror = 0;
2126 2526
2127 if (image == NULL) 2527 if (image == NULL)
2128 { 2528 {
2129 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2130 { 2530 {
2131 pchanged = 1; 2531 pchanged = 1;
2132 if (TermWin.pixmap != None) 2532 if (pixmap != None)
2133 { 2533 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2534 XFreePixmap (dpy, pixmap);
2135 TermWin.pixmap = None; 2535 pixmap = None;
2136 } 2536 }
2137 } 2537 }
2138 2538
2139 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2140 } 2540 }
2141 else 2541 else
2142 { 2542 {
2143 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2544 XFreePixmap (dpy, pixmap);
2145 2545
2146#if TINTING 2546#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2548 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2550
2551 rgba c;
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2153 2553
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2155 } 2555 }
2156#endif 2556#endif
2157 2557
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2562 XFreeGC (dpy, gc);
2164 XDestroyImage (image); 2563 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2565 XClearWindow (dpy, parent[0]);
2167 2566
2168 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2568 pchanged = 1;
2170 2569
2171 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2172 } 2571 }
2173 } 2572 }
2174 2573
2175 if (!am_pixmap_trans) 2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2576 else
2176 { 2577 {
2177 unsigned int n; 2578 unsigned int n;
2178 /* 2579 /*
2179 * InheritPixmap transparency 2580 * InheritPixmap transparency
2180 */ 2581 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2583 {
2184 oldp = TermWin.parent[i]; 2584 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2586 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2587
2190 if (TermWin.parent[i] == display->root) 2588 if (parent[i] == display->root)
2191 { 2589 {
2192 if (oldp != None) 2590 if (oldp != None)
2193 pchanged = 1; 2591 pchanged = 1;
2194 2592
2195 break; 2593 break;
2196 } 2594 }
2197 2595
2198 if (oldp != TermWin.parent[i]) 2596 if (oldp != parent[i])
2199 pchanged = 1; 2597 pchanged = 1;
2200 } 2598 }
2201 2599
2202 n = 0; 2600 n = 0;
2203 2601
2204 if (pchanged) 2602 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2207 { 2604 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2606
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2608 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2610 break;
2214 } 2611 }
2215 } 2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2216 } 2615 {
2217
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2618 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2225 } 2620 }
2226 else 2621 else
2227 { 2622 {
2228#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1);
2232#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2235 { 2624 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2626 XClearWindow (dpy, parent[n]);
2238 } 2627 }
2239 2628
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2241 am_transparent = 1; 2630 am_transparent = 1;
2242 } 2631 }
2243 2632
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2634 parent[i] = None;
2246 } 2635 }
2247 2636
2248 // this is experimental
2249 if (scrollBar.win) 2637 if (scrollBar.win)
2250 { 2638 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2254 scrollbar_show (0); 2641 scrollbar_show (0);
2255 } 2642 }
2256 2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2257 return pchanged; 2651 return pchanged;
2258} 2652}
2259#endif 2653#endif
2260 2654
2261/*}}} */ 2655/*}}} */
2262 2656
2263bool 2657bool
2264rxvt_term::cmd_parse () 2658rxvt_term::cmd_parse ()
2265{ 2659{
2266 bool flag = false; 2660 bool flag = false;
2267 unicode_t ch = NOCHAR; 2661 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2662 char *seq_begin; // remember start of esc-sequence here
2269 2663
2270 for (;;) 2664 for (;;)
2271 { 2665 {
2272 if (ch == NOCHAR) 2666 if (ch == NOCHAR)
2273 { 2667 {
2274 seq_begin = cmdbuf_ptr; 2668 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2669 ch = next_char ();
2276 }
2277 2670
2278 if (ch == NOCHAR) // TODO: improve 2671 if (ch == NOCHAR)
2279 break; 2672 break;
2673 }
2280 2674
2281 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)
2282 { 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
2283 /* Read a text string from the input buffer */ 2691 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2692 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2693 bool refreshnow = false;
2286 int nlines = 0; 2694 int nlines = 0;
2287 unicode_t *str = buf; 2695 wchar_t *str = buf;
2696 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2697
2289 for (;;) 2698 for (;;)
2290 { 2699 {
2291 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))
2292 break; 2701 break;
2293 2702
2294 *str++ = ch; 2703 *str++ = ch;
2295 2704
2296 if (ch == C0_LF) 2705 if (ch == C0_LF || str >= eol)
2297 { 2706 {
2707 if (ch == C0_LF)
2298 nlines++; 2708 nlines++;
2709
2299 refresh_count++; 2710 refresh_count++;
2300 2711
2301 if (!(Options & Opt_jumpScroll) 2712 if (!OPTION (Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2714 {
2304 refreshnow = true; 2715 refreshnow = true;
2716 refresh_count = 0;
2305 ch = NOCHAR; 2717 ch = NOCHAR;
2306 break; 2718 break;
2307 } 2719 }
2308 2720
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2721 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2722 if (nlines >= nrow - 1)
2311 { 2723 {
2724 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2725 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2726 scr_add_lines (buf, str - buf, nlines);
2727
2313 nlines = 0; 2728 nlines = 0;
2314 str = buf; 2729 str = buf;
2730 eol = str + min (ncol, UBUFSIZ);
2315 } 2731 }
2316 }
2317 2732
2318 if (str >= buf + UBUFSIZ) 2733 if (str >= eol)
2319 { 2734 {
2735 if (eol >= buf + UBUFSIZ)
2736 {
2320 ch = NOCHAR; 2737 ch = NOCHAR;
2321 break; 2738 break;
2739 }
2740 else
2741 eol = min (eol + ncol, buf + UBUFSIZ);
2742 }
2743
2322 } 2744 }
2323 2745
2324 seq_begin = cmdbuf_ptr; 2746 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2747 ch = next_char ();
2326 } 2748 }
2327 2749
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2329 2753
2330 /* 2754 /*
2331 * 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
2332 * 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.
2333 * the number of pages between refreshes is refresh_limit, which 2757 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2758 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2759 */
2336 if (refreshnow) 2760 if (refreshnow)
2337 { 2761 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2763 refresh_limit++;
2340 else 2764 else
2341 { 2765 {
2342 flag = true; 2766 flag = true;
2343 scr_refresh (refresh_type); 2767 scr_refresh ();
2768 want_refresh = 1;
2344 } 2769 }
2345 } 2770 }
2346 2771
2347 } 2772 }
2348 else 2773 else
… …
2363 } 2788 }
2364 2789
2365 return flag; 2790 return flag;
2366} 2791}
2367 2792
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character 2793// read the next character
2378unicode_t 2794wchar_t
2379rxvt_term::next_char () 2795rxvt_term::next_char () NOTHROW
2380{ 2796{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2797 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2798 {
2383 // assume 7-bit to be ascii ALWAYS 2799 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2800 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2801 return *cmdbuf_ptr++;
2386 2802
2387 wchar_t wc; 2803 wchar_t wc;
2388 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);
2389 2805
2390 if (len == (size_t)-2) 2806 if (len == (size_t)-2)
2391 { 2807 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2808 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2809 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2810 break;
2395 } 2811 }
2396 2812
2397 if (len == (size_t)-1) 2813 if (len == (size_t)-1)
2398 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
2399 2815
2400 // assume wchar == unicode 2816 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2817 cmdbuf_ptr += len;
2402 return wc; 2818 return wc & UNICODE_MASK;
2403 } 2819 }
2404 2820
2405 return NOCHAR; 2821 return NOCHAR;
2406} 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;
2407 2834
2408/* rxvt_cmd_getc () - Return next input character */ 2835/* rxvt_cmd_getc () - Return next input character */
2409/* 2836/*
2410 * Return the next input character after first passing any keyboard input 2837 * Return the next input character after first passing any keyboard input
2411 * to the command. 2838 * to the command.
2412 */ 2839 */
2413unicode_t 2840wchar_t
2414rxvt_term::cmd_getc () 2841rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2842{
2416 unicode_t c = next_char (); 2843 wchar_t c = next_char ();
2417 2844
2418 if (c == NOCHAR) 2845 if (c == NOCHAR)
2419 throw out_of_input; 2846 throw out_of_input;
2420 2847
2421 return c; 2848 return c;
2422} 2849}
2423 2850
2424unicode_t 2851uint32_t
2425rxvt_term::cmd_get8 () 2852rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2853{
2427 unicode_t c = next_octet (); 2854 uint32_t c = next_octet ();
2428 2855
2429 if (c == NOCHAR) 2856 if (c == NOCHAR)
2430 throw out_of_input; 2857 throw out_of_input;
2431 2858
2432 return c; 2859 return c;
… …
2532 case C0_ESC: 2959 case C0_ESC:
2533 process_escape_seq (); 2960 process_escape_seq ();
2534 break; 2961 break;
2535 case C0_ENQ: /* terminal Status */ 2962 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2963 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2964 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2965 else
2540 tt_write ((unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2967 break;
2543 case C0_BEL: /* bell */ 2968 case C0_BEL: /* bell */
2544 scr_bell (); 2969 scr_bell ();
2545 break; 2970 break;
2546 case C0_BS: /* backspace */ 2971 case C0_BS: /* backspace */
… …
2645void 3070void
2646rxvt_term::process_escape_seq () 3071rxvt_term::process_escape_seq ()
2647{ 3072{
2648 unicode_t ch = cmd_getc (); 3073 unicode_t ch = cmd_getc ();
2649 3074
2650 if (PrivateModes & PrivMode_vt52) 3075 if (priv_modes & PrivMode_vt52)
2651 { 3076 {
2652 process_escape_vt52 (ch); 3077 process_escape_vt52 (ch);
2653 return; 3078 return;
2654 } 3079 }
2655 3080
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3096 break;
2672 case '+': 3097 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3099 break;
2675#ifndef NO_FRILLS 3100#if !ENABLE_MINIMAL
2676 case '6': 3101 case '6':
2677 scr_backindex (); 3102 scr_backindex ();
2678 break; 3103 break;
2679#endif 3104#endif
2680 case '7': 3105 case '7':
2681 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
2682 break; 3107 break;
2683 case '8': 3108 case '8':
2684 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
2685 break; 3110 break;
2686#ifndef NO_FRILLS 3111#if !ENABLE_MINIMAL
2687 case '9': 3112 case '9':
2688 scr_forwardindex (); 3113 scr_forwardindex ();
2689 break; 3114 break;
2690#endif 3115#endif
2691 case '=': 3116 case '=':
… …
2701 break; 3126 break;
2702 3127
2703 /* 8.3.87: NEXT LINE */ 3128 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 3129 case C1_NEL: /* ESC E */
2705 { 3130 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 3131 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 3132 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 3133 }
2709 break; 3134 break;
2710 3135
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 3136 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 3137 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 3159 process_dcs_seq ();
2735 break; 3160 break;
2736 3161
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3162 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 3163 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 3164 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 3165 break; /* steal obsolete ESC [ c */
2742 3166
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3167 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 3168 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 3169 process_csi_seq ();
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 3280 if (arg[p] == -1)
2857 arg[p] = ndef; 3281 arg[p] = ndef;
2858 3282
2859#ifdef DEBUG_CMD
2860 fprintf (stderr, "CSI ");
2861 for (p = 0; p < nargs; p++)
2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2863 fprintf (stderr, "%c\n", ch);
2864#endif
2865
2866 /* 3283 /*
2867 * private mode handling 3284 * private mode handling
2868 */ 3285 */
2869 if (priv) 3286 if (priv)
2870 { 3287 {
2871 switch (priv) 3288 switch (priv)
2872 { 3289 {
2873 case '>': 3290 case '>':
2874 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 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3300 tt_printf ("\033[>%d;94;0c", 'U');
3301 }
2876 break; 3302 break;
2877 case '?': 3303 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3306 break;
… …
2985 3411
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3412 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3413 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3414 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3415 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3416 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3417 break;
2992 3418
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3419 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3420 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3421 break;
2997 3422
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3423 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3424 process_sgr_mode (nargs, arg);
3000 break; 3425 break;
… …
3007 break; 3432 break;
3008 case 6: /* CPR requested */ 3433 case 6: /* CPR requested */
3009 scr_report_position (); 3434 scr_report_position ();
3010 break; 3435 break;
3011 case 7: /* unofficial extension */ 3436 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3437 if (OPTION (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3438 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3439 break;
3015 case 8: /* unofficial extension */ 3440 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3442 break;
3018 } 3443 }
… …
3054 break; 3479 break;
3055 3480
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3481 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3482 if (arg[0] == 4)
3058 scr_insert_mode (0); 3483 scr_insert_mode (0);
3484 else if (arg[0] == 20)
3485 priv_modes &= ~PrivMode_LFNL;
3059 break; 3486 break;
3060 3487
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3488 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3489 if (arg[0] == 4)
3063 scr_insert_mode (1); 3490 scr_insert_mode (1);
3491 else if (arg[0] == 20)
3492 priv_modes |= PrivMode_LFNL;
3064 break; 3493 break;
3065 3494
3066 /* 3495 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3496 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3497 */
… …
3080 break; 3509 break;
3081 case CSI_75: 3510 case CSI_75:
3082 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3083 break; 3512 break;
3084 3513
3085#ifndef NO_FRILLS 3514#if !ENABLE_MINIMAL
3086 case CSI_74: 3515 case CSI_74:
3087 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3088 break; 3517 break;
3089#endif 3518#endif
3090 3519
… …
3097 break; 3526 break;
3098 } 3527 }
3099} 3528}
3100/*}}} */ 3529/*}}} */
3101 3530
3102#ifndef NO_FRILLS 3531#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3532/* ARGSUSED */
3104void 3533void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3535{
3107 int x, y; 3536 int x, y;
3108 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3109 Window wdummy; 3538 Window wdummy;
3539
3540 dLocal (Display *, dpy);
3110 3541
3111 if (nargs == 0) 3542 if (nargs == 0)
3112 return; 3543 return;
3113 3544
3114 switch (args[0]) 3545 switch (args[0])
3115 { 3546 {
3116 /* 3547 /*
3117 * commands 3548 * commands
3118 */ 3549 */
3119 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3551 XMapWindow (dpy, parent[0]);
3121 break; 3552 break;
3122 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3554 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3555 break;
3126 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3558 break;
3129 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3561 break;
3132 case 5: /* raise window */ 3562 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3134 break; 3564 break;
3135 case 6: /* lower window */ 3565 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3137 break; 3567 break;
3138 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3139 scr_touch (true); 3569 scr_touch (true);
3140 break; 3570 break;
3141 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3572 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3573 (unsigned int) (args[1] * fheight));
3144 break; 3574 break;
3145 3575
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3576 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3577 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3579 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3151 break; 3581 break;
3152
3153 3582
3154 /* 3583 /*
3155 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3156 */ 3585 */
3157 case 11: /* report window state */ 3586 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3589 break;
3161 case 13: /* report window position */ 3590 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3596 break;
3168 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3600 break;
3172 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3603 break;
3175 case 19: /* report window size (chars) */ 3604 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3606 break;
3178 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3608 {
3181 char *s; 3609 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3183 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);
3184 } 3613 }
3185 break; 3614 break;
3186 case 21: /* report window title */ 3615 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3616 {
3189 char *s; 3617 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3191 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);
3192 } 3621 }
3193 break; 3622 break;
3194 } 3623 }
3195} 3624}
3196#endif 3625#endif
3197 3626
3198/*----------------------------------------------------------------------*/ 3627/*----------------------------------------------------------------------*/
3199/* 3628/*
3200 * get input up until STRING TERMINATOR (or BEL) 3629 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3630 * ends_how is terminator used. returned input must be free()'d
3202 */ 3631 */
3203unsigned char * 3632char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3633rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3634{
3206 unicode_t prev = 0, ch; 3635 unicode_t ch;
3636 bool seen_esc = false;
3207 unsigned int n = 0; 3637 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3638 wchar_t string[STRING_MAX];
3210 3639
3211 while ((ch = cmd_getc ()) != NOCHAR) 3640 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3641 {
3213 if (prev == C0_ESC) 3642 if (seen_esc)
3214 { 3643 {
3215 if (ch == 0x5c) /* 7bit ST */ 3644 if (ch == 0x5c) /* 7bit ST */
3216 break; 3645 break;
3217 else 3646 else
3218 return NULL; 3647 return NULL;
3219 } 3648 }
3649 else if (ch == C0_ESC)
3650 {
3651 seen_esc = true;
3652 continue;
3653 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3654 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3655 break;
3222 else if (ch < 0x20) 3656 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3657 return NULL; /* other control character - exit */
3224 3658
3225 if (n >= sizeof (string) - 1) 3659 seen_esc = false;
3660
3661 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3662 // stop at some sane length
3227 return NULL; 3663 return NULL;
3228 3664
3229 if (ch == C0_SYN) 3665 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3666 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3667 else
3235 string[n++] = prev = ch; 3668 string[n++] = ch;
3236 } 3669 }
3237 3670
3238 string[n++] = '\0'; 3671 string[n++] = '\0';
3239 3672
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3673 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3674
3245 return s; 3675 return rxvt_wcstombs (string);
3246} 3676}
3247 3677
3248/*----------------------------------------------------------------------*/ 3678/*----------------------------------------------------------------------*/
3249/* 3679/*
3250 * 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)'
3251 */ 3681 */
3252void 3682void
3253rxvt_term::process_dcs_seq () 3683rxvt_term::process_dcs_seq ()
3254{ 3684{
3255 unsigned char *s; 3685 char *s;
3256 unicode_t eh; 3686 unicode_t eh;
3257 3687
3258 /* 3688 /*
3259 * Not handled yet 3689 * Not handled yet
3260 */ 3690 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3709 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3710 arg = arg * 10 + (ch - '0');
3281 3711
3282 if (ch == ';') 3712 if (ch == ';')
3283 { 3713 {
3284 unsigned char *s = get_to_st (eh); 3714 char *s = get_to_st (eh);
3285 3715
3286 if (s) 3716 if (s)
3287 { 3717 {
3288 process_xterm_seq (arg, (char *)s, eh); 3718 process_xterm_seq (arg, s, eh);
3289 free (s); 3719 free (s);
3290 } 3720 }
3291 } 3721 }
3292} 3722}
3293 3723
3294void 3724void
3295rxvt_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)
3296{ 3726{
3297 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3298 { 3728 {
3299 if (Options & Opt_insecure) 3729 rgba c;
3300 { 3730 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3731
3302 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
3303 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);
3304 }
3305 } 3738 }
3306 else 3739 else
3307 set_window_color (color, str); 3740 set_window_color (color, str);
3308} 3741}
3309 3742
3310/* 3743/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3745 */
3335void 3746void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3748{
3338 int changed = 0;
3339 int color; 3749 int color;
3340 char *buf, *name; 3750 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753
3754 dLocal (Display *, dpy);
3342 3755
3343 assert (str != NULL); 3756 assert (str != NULL);
3344 switch (op) 3757 switch (op)
3345 { 3758 {
3346 case XTerm_name: 3759 case XTerm_name:
… …
3353 set_title (str); 3766 set_title (str);
3354 break; 3767 break;
3355 case XTerm_property: 3768 case XTerm_property:
3356 if (str[0] == '?') 3769 if (str[0] == '?')
3357 { 3770 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3771 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3772 Atom actual_type;
3360 int actual_format; 3773 int actual_format;
3361 unsigned long nitems; 3774 unsigned long nitems;
3362 unsigned long bytes_after; 3775 unsigned long bytes_after;
3363 unsigned char *value = 0; 3776 unsigned char *value = 0;
3364 const char *str = ""; 3777 const char *str = "";
3365 3778
3366 if (prop 3779 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3784 && actual_type != None
3372 && actual_format == 8) 3785 && actual_format == 8)
3373 str = (const char *)(value); 3786 str = (const char *)(value);
3374 3787
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3789
3377 XFree (value); 3790 XFree (value);
3378 } 3791 }
3379 else 3792 else
3380 { 3793 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3795
3383 if (eq) 3796 if (eq)
3384 { 3797 {
3385 *eq = 0; 3798 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3799 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3800 }
3391 else 3801 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3802 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3803 display->atom (str));
3394 } 3804 }
3395 break; 3805 break;
3396 3806
3397 case XTerm_Color: 3807 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
3399 { 3809 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3811 break;
3402 3812
3403 *name++ = '\0'; 3813 *name++ = '\0';
3404 color = atoi (buf); 3814 color = atoi (buf) + minCOLOR;
3405 3815
3406 if (color < 0 || color >= TOTAL_COLORS) 3816 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3817 break;
3408 3818
3409 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3820 *buf++ = '\0';
3411 3821
3412 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3422 set_window_color (color + minCOLOR, name);
3423 } 3823 }
3424 break; 3824 break;
3425 case XTerm_Color00: 3825 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3427 break; 3827 break;
3428 case XTerm_Color01: 3828 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3430 break; 3830 break;
3431#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3834 break;
3435#endif 3835#endif
3436 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3838 break;
3439 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3841 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break;
3446 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break;
3449 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3451 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;
3452#endif 3857#endif
3858#if TRANSPARENT && TINTING
3859 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp);
3453 3861
3862 check_our_parents ();
3863
3864 if (am_transparent)
3865 want_full_refresh = want_refresh = 1;
3866
3867 break;
3868#endif
3869
3454 case XTerm_Pixmap: 3870 case Rxvt_Pixmap:
3871 {
3455 if (*str != ';') 3872 if (*str != ';')
3456 { 3873 {
3457#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3877 scr_touch (true);
3878#endif
3462 } 3879 }
3880
3881 int changed = 0;
3882
3463 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3464 { 3884 {
3465 str++; 3885 str++;
3466#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3468#endif 3888#endif
3469
3470 } 3889 }
3890
3471 if (changed) 3891 if (changed)
3472 { 3892 {
3473#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3894 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3895 scr_touch (true);
3896#endif
3477 } 3897 }
3898 }
3478 break; 3899 break;
3479 3900
3480 case XTerm_restoreFG: 3901 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3902 set_window_color (Color_fg, str);
3482 break; 3903 break;
3483 case XTerm_restoreBG: 3904 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3905 set_window_color (Color_bg, str);
3485 break; 3906 break;
3486 3907
3487 case XTerm_logfile: 3908 case XTerm_logfile:
3488 // TODO, when secure mode? 3909 // TODO, when secure mode?
3489 break; 3910 break;
3490 3911
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break;
3536#endif
3537#if 0 3912#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3913 case Rxvt_dumpscreen: /* no error notices */
3539 { 3914 {
3540 int fd; 3915 int fd;
3541 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)
3542 { 3917 {
3543 scr_dump (fd); 3918 scr_dump (fd);
3544 close (fd); 3919 close (fd);
3545 } 3920 }
3546 } 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
3547 break; 3985 break;
3548#endif 3986#endif
3549 } 3987 }
3550} 3988}
3551/*----------------------------------------------------------------------*/ 3989/*----------------------------------------------------------------------*/
… …
3565{ 4003{
3566 int state; 4004 int state;
3567 4005
3568 if (mode == 's') 4006 if (mode == 's')
3569 { 4007 {
3570 SavedModes |= (PrivateModes & bit); 4008 SavedModes |= (priv_modes & bit);
3571 return -1; 4009 return -1;
3572 } 4010 }
3573 else 4011 else
3574 { 4012 {
3575 if (mode == 'r') 4013 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4014 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 4015 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4016 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 4017 PrivMode (state, bit);
3580 } 4018 }
3581 4019
3582 return state; 4020 return state;
3583} 4021}
3584 4022
3585/* we're not using priv _yet_ */ 4023/* we're not using priv _yet_ */
3586void 4024void
3587rxvt_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)
3588{ 4026{
3589 unsigned int i, j; 4027 unsigned int i, j;
3590 int state; 4028 int state;
3591 4029
3592 static const struct 4030 static const struct
… …
3601 { 3, PrivMode_132 }, 4039 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4040 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4041 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4042 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4043 { 7, PrivMode_Autowrap },
4044 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4045 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4046 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4047 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4050#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4051 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4052 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4053 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4054 // 45 margin bell NYI
3620 // 46 start logging 4055 // 46 start logging
… …
3660 } 4095 }
3661 4096
3662 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4098 switch (arg[i])
3664 { 4099 {
4100#if ENABLE_STYLES
4101 case 1021:
4102 set_option (Opt_intensityStyles, mode);
4103
4104 scr_touch (true);
4105 break;
4106#endif
3665 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4108 case 1049:
3666 if (Options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
3667 if (mode == 0) 4110 if (mode == 0)
3668 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3669 else if (mode == 1) 4112 else if (mode == 1)
3670 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3671 break; 4114 break;
… …
3682 * within VT52 mode 4125 * within VT52 mode
3683 */ 4126 */
3684 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
3685 break; 4128 break;
3686 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4132 break;
3690 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
3691 if (state) 4134 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4135 break;
3696 case 5: /* reverse video */ 4136 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4137 scr_rvideo_mode (state);
3698 break; 4138 break;
3699 case 6: /* relative/absolute origins */ 4139 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4143 scr_autowrap (state);
3704 break; 4144 break;
3705 /* 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 */
3706 case 9: /* X10 mouse reporting */ 4146 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4147 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4148 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4149 break;
3710#ifdef menuBar_esc
3711 case menuBar_esc:
3712#ifdef MENUBAR
3713 map_menuBar (state);
3714#endif
3715 break;
3716#endif
3717#ifdef scrollBar_esc 4150#ifdef scrollBar_esc
3718 case scrollBar_esc: 4151 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4152 if (scrollbar_mapping (state))
3720 { 4153 {
3721 resize_all_windows (0, 0, 0); 4154 resize_all_windows (0, 0, 0);
… …
3733 break; 4166 break;
3734 /* case 66: - application key pad */ 4167 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4168 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4169 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4170 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4171 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4172 break;
3740#if 0 4173#if 0
3741 case 1001: 4174 case 1001:
3742 break; /* X11 mouse highlighting */ 4175 break; /* X11 mouse highlighting */
3743#endif 4176#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4177 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4178 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4179 break;
3750 case 1011: /* scroll to bottom on key press */ 4180 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4181 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4182 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4183 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4184 if (OPTION (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4185 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4186 scr_erase_screen (2);
3760 scr_change_screen (state); 4187 scr_change_screen (state);
3761 break; 4188 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4189 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4190 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4191 if (OPTION (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4192 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4193 scr_erase_screen (2);
3767 break; 4194 break;
3768 default: 4195 default:
3769 break; 4196 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4222 rendset = 0, rendstyle = ~RS_None;
3796 break; 4223 break;
3797 case 1: 4224 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4225 rendset = 1, rendstyle = RS_Bold;
3799 break; 4226 break;
3800 //case 2: // faint or second colour 4227 //case 2: // low intensity
4228 case 3:
4229 rendset = 1, rendstyle = RS_Italic;
4230 break;
3801 case 4: 4231 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4232 rendset = 1, rendstyle = RS_Uline;
3803 break; 4233 break;
3804 case 5: // slowly blinking 4234 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4235 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4247 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4248 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4249 //...
3820 //case 19: // ninth alt font 4250 //case 19: // ninth alt font
3821 //case 20: // gothic 4251 //case 20: // gothic
3822 case 21: // disable bold, faint 4252 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4253 rendset = 0, rendstyle = RS_Bold;
3824 break; 4254 break;
3825 case 22: 4255 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4256 rendset = 0, rendstyle = RS_Bold;
3827 break; 4257 break;
3828 //case 23: disable italic 4258 case 23: // disable italic
4259 rendset = 0, rendstyle = RS_Italic;
4260 break;
3829 case 24: 4261 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4262 rendset = 0, rendstyle = RS_Uline;
3831 break; 4263 break;
3832 case 25: 4264 case 25:
4265 rendset = 0, rendstyle = RS_Blink;
4266 break;
4267 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4268 rendset = 0, rendstyle = RS_Blink;
3834 break; 4269 break;
3835 case 27: 4270 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4271 rendset = 0, rendstyle = RS_RVid;
3837 break; 4272 break;
… …
3855 case 35: 4290 case 35:
3856 case 36: 4291 case 36:
3857 case 37: 4292 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4293 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4294 break;
3860#ifdef TTY_256COLOR 4295 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4296 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4297 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4298 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4299 i += 2;
3866 } 4300 }
3867 break; 4301 break;
3868#endif
3869 case 39: /* default fg */ 4302 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4303 scr_color (Color_fg, Color_fg);
3871 break; 4304 break;
3872 4305
3873 case 40: 4306 case 40:
… …
3878 case 45: 4311 case 45:
3879 case 46: 4312 case 46:
3880 case 47: 4313 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4314 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4315 break;
3883#ifdef TTY_256COLOR 4316 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4317 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4318 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4319 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4320 i += 2;
3889 } 4321 }
3890 break; 4322 break;
3891#endif
3892 case 49: /* default bg */ 4323 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
3894 break; 4325 break;
3895 4326
3896#ifndef NO_BRIGHTCOLOR 4327 //case 50: // not variable spacing
4328
4329#if !ENABLE_MINIMAL
3897 case 90: 4330 case 90:
3898 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
3899 case 92: 4332 case 92:
3900 case 93: 4333 case 93:
3901 case 94: 4334 case 94:
3902 case 95: 4335 case 95:
3903 case 96: 4336 case 96:
3904 case 97: 4337 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4338 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4339 break;
3908 case 100: 4340 case 100:
3909 case 101: /* set bright bg color */ 4341 case 101: /* set bright bg color */
3910 case 102: 4342 case 102:
3911 case 103: 4343 case 103:
3912 case 104: 4344 case 104:
3913 case 105: 4345 case 105:
3914 case 106: 4346 case 106:
3915 case 107: 4347 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4349 break;
3919#endif 4350#endif
3920
3921 } 4351 }
3922 } 4352 }
3923} 4353}
3924/*}}} */ 4354/*}}} */
3925 4355
… …
3929{ 4359{
3930 unicode_t ch, cmd = cmd_getc (); 4360 unicode_t ch, cmd = cmd_getc ();
3931 4361
3932 if (cmd == 'Q') 4362 if (cmd == 'Q')
3933 { /* query graphics */ 4363 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4364 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4365 return;
3936 } 4366 }
3937 /* swallow other graphics sequences until terminating ':' */ 4367 /* swallow other graphics sequences until terminating ':' */
3938 do 4368 do
3939 ch = cmd_getc (); 4369 ch = cmd_getc ();
… …
3949 */ 4379 */
3950void 4380void
3951rxvt_term::tt_printf (const char *fmt,...) 4381rxvt_term::tt_printf (const char *fmt,...)
3952{ 4382{
3953 va_list arg_ptr; 4383 va_list arg_ptr;
3954 unsigned char buf[256]; 4384 char buf[256];
3955 4385
3956 va_start (arg_ptr, fmt); 4386 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4387 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4388 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4389 tt_write (buf, strlen (buf));
3960} 4390}
3961 4391
3962/* ---------------------------------------------------------------------- */ 4392/* ---------------------------------------------------------------------- */
3963/* 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,
3964 * or generated by us in response to a query ESC sequence. 4394 * or generated by us in response to a query ESC sequence.
3965 */ 4395 */
4396const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4397
3966void 4398void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4399rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4400{
3969 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;
3970 4403
3971 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;
3972 { 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
3973 if (v_buflen == 0) 4434 if (v_buflen == 0)
3974 { 4435 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4436 free (v_buffer);
4002 v_buffer = 0; 4437 v_buffer = 0;
4003 v_buflen = 0; 4438 v_buflen = 0;
4004 4439
4005 pty_ev.set (EVENT_READ); 4440 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4441 return;
4018 } 4442 }
4443
4444 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4445 }
4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4447 pty_ev.set (EVENT_READ);
4020} 4448}
4021 4449
4022/*----------------------- end-of-file (C source) -----------------------*/ 4450/*----------------------- end-of-file (C source) -----------------------*/
4023 4451

Diff Legend

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