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

Diff Legend

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