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.310 by root, Thu Feb 23 19:26:56 2006 UTC

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

Diff Legend

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