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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.234 by root, Wed Jan 4 04:42:45 2006 UTC

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

Diff Legend

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