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

Diff Legend

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