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

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

Diff Legend

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