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

Diff Legend

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