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.93 by pcg, Thu Apr 8 20:31:45 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>
… …
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 } 1086 }
… …
680} 1089}
681 1090
682void 1091void
683rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
684{ 1093{
685 SET_R (this); 1094 make_current ();
686 SET_LOCALE (locale);
687 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;
688 flush (); 1109 flush ();
689} 1110}
690 1111
691#ifdef CURSOR_BLINK 1112#ifdef CURSOR_BLINK
692void 1113void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
694{ 1115{
695 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1117 want_refresh = 1;
697 1118
698 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
699} 1120}
700#endif 1121#endif
701 1122
702#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
703void 1124void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1131 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1132 }
712} 1133}
713#endif 1134#endif
714 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
715bool 1204bool
716rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
717{ 1206{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1208
720 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
721 { 1210 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1212 n = 0;
724 } 1213 }
725 1214
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
729 1218
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
731 1220
732 if (n > 0) 1221 if (r > 0)
733 { 1222 {
734 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
735 return true; 1224 return true;
736 } 1225 }
737 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))
738 destroy (); 1238 destroy ();
1239 }
739 1240
740 return false; 1241 return false;
741} 1242}
742 1243
743void 1244void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1246{
746 SET_R (this); 1247 make_current ();
747 SET_LOCALE (locale);
748 1248
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1251 while (pty_fill ())
754 if (cmd_parse ()) 1252 if (cmd_parse ())
755 break; 1253 break;
1254
1255 if (revents & EVENT_WRITE)
1256 pty_write ();
1257}
1258
1259void
1260rxvt_term::pointer_unblank ()
1261{
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
756} 1271}
757 1272
758#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
759void 1274void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
773{ 1276{
774 if (! (Options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
775 return; 1278 return;
776 1279
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
778 XFlush (display->display); 1281 XFlush (dpy);
779 1282
780 hidden_pointer = 1; 1283 hidden_pointer = 1;
781} 1284}
782 1285
783void 1286void
784rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
785{ 1288{
786 SET_R (this); 1289 make_current ();
787 SET_LOCALE (locale);
788 1290
789 pointer_blank (); 1291 pointer_blank ();
790} 1292}
791#endif 1293#endif
792 1294
… …
799 x = ev.x; 1301 x = ev.x;
800 y = ev.y; 1302 y = ev.y;
801 pixel_position (&x, &y); 1303 pixel_position (&x, &y);
802 1304
803 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1306 button_number = 3;
806 }
807 else 1307 else
808 { 1308 {
809 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1311 if (button_number >= 3)
812 button_number += (64 - 3); 1312 button_number += (64 - 3);
813 } 1313 }
814 1314
815 if (PrivateModes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
816 { 1316 {
817 /* 1317 /*
818 * do not report ButtonRelease 1318 * do not report ButtonRelease
819 * no state info allowed 1319 * no state info allowed
820 */ 1320 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1335 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1336 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1337#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1338 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1339#endif
840
841 } 1340 }
842 1341
843#ifdef DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1344 if (key_state & 16)
846 fputc ('C', stderr); 1345 fputc ('C', stderr);
847 if (key_state & 4) 1346 if (key_state & 4)
848 fputc ('S', stderr); 1347 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1351 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1353 button_number,
855 x + 1, 1354 x + 1,
856 y + 1); 1355 y + 1);
857#else 1356#endif
1357
858 tt_printf ("\033[M%c%c%c", 1358 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
860 (32 + x + 1), 1360 (32 + x + 1),
861 (32 + y + 1)); 1361 (32 + y + 1));
862#endif
863} 1362}
864
865#ifdef USING_W11LIB
866void
867rxvt_W11_process_x_event (XEvent *ev)
868{
869 rxvt_t *r = rxvt_get_r ();
870
871 x_cb (*ev);
872}
873#endif
874 1363
875/*{{{ process an X event */ 1364/*{{{ process an X event */
876void 1365void
877rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
878{ 1367{
879 SET_R (this); 1368 make_current ();
880 SET_LOCALE (locale);
881 1369
882#if defined(CURSOR_BLINK) 1370 dLocal (Display *, dpy);
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
884 {
885 if (hidden_cursor)
886 {
887 hidden_cursor = 0;
888 want_refresh = 1;
889 }
890 1371
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1372 if (ev.xany.window == vt
892 } 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
894
895#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 {
898 if (ev.type == MotionNotify
899 || ev.type == ButtonPress
900 || ev.type == ButtonRelease)
901 if (hidden_pointer)
902 pointer_unblank ();
903
904 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank ();
906 }
907#endif
908
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return; 1375 return;
912#endif
913 1376
1377 // for XQueryPointer
914 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1380 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1381
967 switch (ev.type) 1382 switch (ev.type)
968 { 1383 {
969 case KeyPress: 1384 case KeyPress:
970 lookup_key (ev.xkey); 1385 key_press (ev.xkey);
971 break; 1386 break;
972 1387
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease: 1388 case KeyRelease:
975 { 1389 key_release (ev.xkey);
976 if (! (ev.xkey.state & ControlMask))
977 mouse_slip_wheel_speed = 0;
978 else
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1390 break;
987 }
988#endif
989 1391
990 case ButtonPress: 1392 case ButtonPress:
991 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
992 break; 1394 break;
993 1395
… …
995 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
996 break; 1398 break;
997 1399
998 case ClientMessage: 1400 case ClientMessage:
999 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1001 destroy ();
1002#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink))
1008 { 1403 {
1009 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1010 Atom ActualType; 1405 {
1011 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1012 unsigned char *data; 1407 {
1013 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1014 1409 {
1015 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1016 xa[XA_DNDSELECTION], 1411 destroy ();
1017 0L, 1000000L, 1412 }
1018 False, AnyPropertyType, 1413#if ENABLE_EWMH
1019 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1020 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1021 &data); 1417 &ev);
1022 XChangeProperty (display->display, display->root, 1418#endif
1023 XA_CUT_BUFFER0, XA_STRING, 1419 }
1024 8, PropModeReplace, 1420 }
1025 data, STRLEN (data)); 1421#if ENABLE_XEMBED
1026 XFree (data); 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1423 {
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 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
1029 } 1430 }
1030#endif /* OFFIX_DND */
1031 break; 1431 break;
1032 1432
1033 case MappingNotify: 1433 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1435 break;
1036 1436
1037 /* 1437 /*
1038 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1058 break; 1458 break;
1059 } 1459 }
1060 break; 1460 break;
1061 1461
1062 case FocusIn: 1462 case FocusIn:
1063 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])
1064 { 1472 {
1065 TermWin.focus = 1; 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1474 ;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075 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
1076 } 1488 }
1077 break; 1489 break;
1078 1490
1079 case FocusOut:
1080 if (TermWin.focus)
1081 {
1082 TermWin.focus = 0;
1083 want_refresh = 1;
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break;
1096
1097 case ConfigureNotify: 1491 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1099 { 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1100 int height, width; 1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1496
1102 do
1103 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109
1110 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1);
1114 }
1115#ifdef DEBUG_SIZE
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent)
1123 {
1124 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif
1129 }
1130 break; 1497 break;
1131 1498
1132 case SelectionClear: 1499 case SelectionClear:
1133 selection_clear (); 1500 selection_clear ();
1134 break; 1501 break;
1135 1502
1136 case SelectionNotify: 1503 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1504 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1506 break;
1141 1507
1142 case SelectionRequest: 1508 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1144 break; 1510 break;
1145 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
1146 case UnmapNotify: 1520 case UnmapNotify:
1147 TermWin.mapped = 0; 1521 mapped = 0;
1148#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1150#endif 1524#endif
1151 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1152
1153 case MapNotify:
1154 TermWin.mapped = 1;
1155#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif
1158 break; 1526 break;
1159 1527
1160#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1161 case ReparentNotify: 1529 case ReparentNotify:
1162 rootwin_cb (ev); 1530 rootwin_cb (ev);
1163 break; 1531 break;
1164#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1165 1533
1166 case GraphicsExpose: 1534 case GraphicsExpose:
1167 case Expose: 1535 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1169 { 1537 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1538 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1174 // 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))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1548
1178 // ev.xexpose.width, TermWin.height, False);
1179#endif
1180 want_refresh = 1; 1549 want_refresh = 1;
1181 } 1550 }
1182 else 1551 else
1183 { 1552 {
1184 XEvent unused_event; 1553 XEvent unused_event;
1185 1554
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 Expose, 1556 ;
1188 &unused_event)) ; 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1558 ;
1190 GraphicsExpose, 1559
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1193 { 1561 {
1194 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1195 scrollbar_show (0); 1563 scrollbar_show (0);
1196 } 1564 }
1197#ifdef MENUBAR 1565
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1566#ifdef TRANSPARENT
1199 menubar_expose (); 1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1200#endif 1569#endif
1201 } 1570 }
1202 break; 1571 break;
1203 1572
1204 case MotionNotify: 1573 case MotionNotify:
1205#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1575 if (hidden_pointer)
1207 pointer_unblank (); 1576 pointer_unblank ();
1208#endif 1577#endif
1209#if MENUBAR 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1210 if (isMenuBarWindow (ev.xany.window)) 1579 break;
1580
1581 if (ev.xany.window == vt)
1211 { 1582 {
1212 menubar_control (ev.xbutton); 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1585 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1587 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1224 ; 1589 ;
1225 1590
1226 XQueryPointer (display->display, TermWin.vt, 1591 XQueryPointer (dpy, vt,
1227 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1594 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1595 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1597 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1598 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1599 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1611
1238#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1615 {
1242 int dist; 1616 int dist;
1243
1244 pending_scroll_selection=1;
1245 1617
1246 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
1248 */ 1620 */
1249 if (scroll_selection_delay<=0) 1621 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1623
1252 /* save the event params so we can highlight 1624 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1625 * the selection in the pending-scroll loop
1254 */ 1626 */
1255 selection_save_x=ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1630
1260 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1262 { 1633 {
1263 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1265 } 1636 }
1266 else 1637 else
1267 { 1638 {
1268 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1640 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1641 }
1642
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1643 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1;
1274 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1276 } 1648 }
1277 else 1649 else
1278 { 1650 {
1279 /* we are within the text window, so we 1651 /* we are within the text window, so we
1280 * shouldn't be scrolling 1652 * shouldn't be scrolling
1281 */ 1653 */
1282 pending_scroll_selection = 0; 1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop();
1283 } 1656 }
1284#endif 1657#endif
1285#ifdef MOUSE_THRESHOLD 1658#ifdef MOUSE_THRESHOLD
1286
1287 } 1659 }
1288#endif 1660#endif
1289
1290 } 1661 }
1291 } 1662 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1664 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1295 MotionNotify, &ev)) ; 1666 MotionNotify, &ev))
1667 ;
1668
1296 XQueryPointer (display->display, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1297 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1672 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1673 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1675 scrollbar_size ());
1303 scr_refresh (refresh_type); 1676 want_refresh = 1;
1304 refresh_limit = 0; 1677 refresh_limit = 0;
1305 scrollbar_show (1); 1678 scrollbar_show (1);
1306 } 1679 }
1307 break; 1680 break;
1308 } 1681 }
1309}
1310 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
1311void 1781void
1312rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1783{
1314 SET_R (this); 1784 make_current ();
1315 SET_LOCALE (locale);
1316 1785
1317 switch (ev.type) 1786 switch (ev.type)
1318 { 1787 {
1319 case PropertyNotify: 1788 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1789 /*
1330 * 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,
1331 * 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.
1332 */ 1792 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 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])
1337 return; 1795 return;
1338 }
1339 1796
1340 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1341 case ReparentNotify: 1798 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1344 break; 1801 break;
1345#endif
1346 } 1802 }
1347} 1803}
1804#endif
1348 1805
1349void 1806void
1350rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1351{ 1808{
1352 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1353 1810
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1355 if (!bypass_keystate) 1813 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1815
1357 /* 1816 /*
1358 * VT window processing of button press 1817 * VT window processing of button press
1359 */ 1818 */
1360 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1833 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1834
1363 if (reportmode) 1835 if (reportmode)
1364 { 1836 {
1365 /* mouse report from vt window */ 1837 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1838 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1839 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1370 { 1842 {
1371 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1372 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1373 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1374 { 1847 {
1375 /* only report double clicks */ 1848 /* only report double clicks */
1376 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1377 mouse_report (ev); 1850 mouse_report (ev);
… …
1396 } 1869 }
1397 else 1870 else
1398 { 1871 {
1399 if (ev.button != MEvent.button) 1872 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1873 MEvent.clicks = 0;
1874
1401 switch (ev.button) 1875 switch (ev.button)
1402 { 1876 {
1403 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
1404 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1888 {
1407 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1409 else 1891 else
1410 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1907 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1428 else 1910 else
1429 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1912
1430 MEvent.button = Button3; 1913 MEvent.button = Button3;
1431 break; 1914 break;
1432 } 1915 }
1433 } 1916 }
1917
1434 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1435 return; 1919 return;
1436 } 1920 }
1437 1921
1438 /* 1922 /*
… …
1504 upordown = 1; /* down */ 1988 upordown = 1; /* down */
1505 } 1989 }
1506 if (upordown) 1990 if (upordown)
1507 { 1991 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1994#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1995 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1996 {
1513 if (upordown < 0) 1997 if (upordown < 0)
1514 scrollBar.setUp (); 1998 scrollBar.setUp ();
… …
1530 break; 2014 break;
1531 case R_SB_ALIGN_BOTTOM: 2015 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2016 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2017 break;
1534 } 2018 }
2019
1535 if (scrollBar.style == R_SB_XTERM 2020 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2021 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2022 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2024
1540 scrollBar.setMotion (); 2025 scrollBar.setMotion ();
1541 break; 2026 break;
1542 2027
1543 case Button1: 2028 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2029 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2033 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1550 { 2035 {
1551 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1554# else 2039# else
1555 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1556# endif 2041# endif
1557 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1560# else 2045# else
1561 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1562# endif 2047# endif
1563 else 2048 else
1564 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1565 } 2050 }
1566 else 2051 else
1567 { 2052 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2054 (nrow
1570 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2056 / scrollbar_size ()));
1572 } 2057 }
2058
1573 break; 2059 break;
1574 } 2060 }
1575 } 2061 }
2062
1576 return; 2063 return;
1577 } 2064 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2065}
1586 2066
1587void 2067void
1588rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1589{ 2069{
1590 int reportmode = 0; 2070 int reportmode = 0;
1591 2071
1592 csrO = 0; /* reset csr Offset */ 2072 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2073 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2074 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2075
1596 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1597 { 2077 {
1598 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1599 scrollbar_show (0); 2079 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2080 }
2081
1605#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop();
1607#endif 2085#endif
2086
1608 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1609 { 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
1610 if (reportmode) 2098 if (reportmode)
1611 { 2099 {
1612 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
1629 mouse_report (ev); 2117 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2119 return;
1632 } 2120 }
2121
1633 /* 2122 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2124 * when overriding mouse reporting
1636 */ 2125 */
1637 if (PrivateModes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2127 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
1641 2130
1642 switch (ev.button) 2131 switch (ev.button)
1643 { 2132 {
1644 case Button1: 2133 case Button1:
1645 case Button3: 2134 case Button3:
1646 selection_make (ev.time); 2135 selection_make (ev.time);
1647 break; 2136 break;
2137
1648 case Button2: 2138 case Button2:
1649 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);
1650 break; 2141 break;
2142
1651#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
1652 case Button4: 2144 case Button4:
1653 case Button5: 2145 case Button5:
1654 { 2146 {
1655 int i; 2147 int i;
1656 page_dirn v; 2148 page_dirn v;
1657 2149
1658 v = (ev.button == Button4) ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2151
1659 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
1660 i = 1; 2153 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2155 i = nrow - 1;
1663 else 2156 else
1664 i = 5; 2157 i = 5;
2158
1665# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
1667 { 2161 {
1668 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)
1669 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
1670 } 2177 }
1671# endif 2178# endif
1672# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1);
1680 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1);
1682 }
1683# endif
1684
1685 } 2179 }
1686 break; 2180 break;
1687#endif 2181#endif
1688
1689 } 2182 }
1690 } 2183 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695} 2184}
1696 2185
1697#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
1698#if TINTING 2187#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2188/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2189
1702static void 2190typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2191
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2193{
1710 /* No saturation */ 2194 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2195 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 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;
1714 2200
1715 b = ((uint16_t *) ptr)[x]; 2201 Visual *visual = term->visual;
1716 r = (b & 0x7c00) * rm; 2202
1717 g = (b & 0x3e0) * gm; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2204
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2205 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2206 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2207 mask_g = visual->green_mask;
1722 } 2208 mask_b = visual->blue_mask;
1723 ptr += bpl; 2209
1724 } 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;
1725 } else { 2283 } else {
1726 for (y = h; --y >= 0;) { 2284 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2285 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2286
1730 b = ((uint16_t *) ptr)[x]; 2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2288
1732 g = (b & 0x3e0) * gm; 2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2292 }
1736 b |= (!(b >> 5) - 1); 2293
1737 ((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 */
1738 | ((g >> 8) & 0x3e0) 2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2296 {
1740 } 2297 unsigned int tmp;
1741 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++)
1742 } 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);
1743 } 2350 }
1744} 2351 break;
1745 2352 }
1746/* RGB 16 */ 2353 case 16:
1747static void 2354 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2355 unsigned short *p1, *pf, *p, *pl;
1749{ 2356 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2358 while (p1 < pf)
1752 2359 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2360 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2361 pl = p1 + srcImage->width;
1755 /* No saturation */ 2362 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2363 {
1770 } else { 2364 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2365 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2366 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2367 }
1786 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)
1787 } 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);
1788 } 2388 }
1789} 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);
1790 2396
1791/* RGB 24 */ 2397 while (p1 < pf)
1792static void 2398 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2399 p = p1;
1794{ 2400 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2401 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2402 {
1823 } else { 2403 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2404 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2405 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2406 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2407 }
1854 ptr += bpl; 2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2409 }
2410 break;
2411 }
1856 } 2412 }
1857}
1858 2413
1859/* RGB 32 */ 2414 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2415}
1930
1931#endif 2416#endif
1932 2417
1933/* 2418/*
1934 * Check our parents are still who we think they are. 2419 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2420 * Do transparency updates if required
… …
1945 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
1947 2432
1948 pchanged = 0; 2433 pchanged = 0;
1949 2434
1950 if (!(Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1952 2437
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1955 2440
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
1957 2442
1958 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1959 { 2444 {
1960 if (am_transparent) 2445 if (am_transparent)
1961 { 2446 {
1962 pchanged = 1; 2447 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1965 } 2450 }
1966 2451
1967 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1968 } 2453 }
1969 2454
1970 /* 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. */
1971 XSync (display->display, False); 2456 XSync (dpy, False);
1972 2457
1973 /* 2458 /*
1974 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1976 * 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.
1977 */ 2462 */
1978 i = (xa[XA_XROOTPMAPID] 2463 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
1982 2467
1983 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
1988 2473
1989 if (!i || prop == NULL) 2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
1990 have_pixmap = 0; 2479 have_pixmap = 0;
1991 else 2480 else
1992 { 2481 {
1993 have_pixmap = 1; 2482 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2483 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2494 Window cr;
2006 XImage *image; 2495 XImage *image;
2007 GC gc; 2496 GC gc;
2008 XGCValues gcvalue; 2497 XGCValues gcvalue;
2009 2498
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2503 nx = ny = 0;
2015 2504
… …
2025 nh += sy; 2514 nh += sy;
2026 ny = -sy; 2515 ny = -sy;
2027 sy = 0; 2516 sy = 0;
2028 } 2517 }
2029 2518
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2032 allowedxerror = -1; 2523 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2525
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2528 allowedxerror = 0;
2038 2529
2039 if (image == NULL) 2530 if (image == NULL)
2040 { 2531 {
2041 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2042 { 2533 {
2043 pchanged = 1; 2534 pchanged = 1;
2044 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2045 { 2536 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2047 TermWin.pixmap = None; 2538 pixmap = None;
2048 } 2539 }
2049 } 2540 }
2050 2541
2051 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2052 } 2543 }
2053 else 2544 else
2054 { 2545 {
2055 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2057 2548
2058#if TINTING 2549#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2551 {
2061 unsigned short shade, rm, gm, bm; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2553
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2064 2556
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2558 }
2076#endif 2559#endif
2077 2560
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2079 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2565 XFreeGC (dpy, gc);
2084 XDestroyImage (image); 2566 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2086 TermWin.pixmap); 2568 XClearWindow (dpy, parent[0]);
2087 2569
2088 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2571 pchanged = 1;
2090 2572
2091 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2092 } 2574 }
2093 } 2575 }
2094 2576
2095 if (!am_pixmap_trans) 2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2096 { 2580 {
2097 unsigned int n; 2581 unsigned int n;
2098 /* 2582 /*
2099 * InheritPixmap transparency 2583 * InheritPixmap transparency
2100 */ 2584 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2586 {
2104 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2106 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2589 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2590
2110 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2111 { 2592 {
2112 if (oldp != None) 2593 if (oldp != None)
2113 pchanged = 1; 2594 pchanged = 1;
2114 2595
2115 break; 2596 break;
2116 } 2597 }
2117 2598
2118 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2119 pchanged = 1; 2600 pchanged = 1;
2120 } 2601 }
2121 2602
2122 n = 0; 2603 n = 0;
2123 2604
2124 if (pchanged) 2605 if (pchanged)
2125 {
2126 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2127 { 2607 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2609
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2611 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2613 break;
2134 } 2614 }
2135 } 2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2136 } 2618 {
2137
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2621 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2145 } 2623 }
2146 else 2624 else
2147 { 2625 {
2148#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1);
2152#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2156 2631
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2158 am_transparent = 1; 2633 am_transparent = 1;
2159 } 2634 }
2160 2635
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 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 ();
2163 } 2652 }
2164 2653
2165 return pchanged; 2654 return pchanged;
2166} 2655}
2167#endif 2656#endif
… …
2170 2659
2171bool 2660bool
2172rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2173{ 2662{
2174 bool flag = false; 2663 bool flag = false;
2175 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2177 2666
2178 for (;;) 2667 for (;;)
2179 { 2668 {
2180 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2181 { 2670 {
2182 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2672 ch = next_char ();
2184 }
2185 2673
2186 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2187 break; 2675 break;
2676 }
2188 2677
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 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
2191 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2696 bool refreshnow = false;
2194 int nlines = 0; 2697 int nlines = 0;
2195 unicode_t *str = buf; 2698 wchar_t *str = buf;
2196 2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2700
2199 for (;;) 2701 for (;;)
2200 { 2702 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2704 break;
2206 2705
2207 *str++ = ch; 2706 *str++ = ch;
2208 2707
2209 if (ch == C0_LF) 2708 if (ch == C0_LF || str >= eol)
2210 { 2709 {
2710 if (ch == C0_LF)
2211 nlines++; 2711 nlines++;
2712
2212 refresh_count++; 2713 refresh_count++;
2213 2714
2214 if (! (Options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2717 {
2217 refreshnow = true; 2718 refreshnow = true;
2218 flag = true; 2719 refresh_count = 0;
2219 ch = NOCHAR; 2720 ch = NOCHAR;
2220 break; 2721 break;
2221 } 2722 }
2222 2723
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2725 if (nlines >= nrow - 1)
2225 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2226 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2227 nlines = 0; 2731 nlines = 0;
2228 str = buf; 2732 str = buf;
2733 eol = str + min (ncol, UBUFSIZ);
2229 } 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
2230 } 2747 }
2231 2748
2232 if (str >= buf + UBUFSIZ) 2749 seq_begin = cmdbuf_ptr;
2233 { 2750 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2751 }
2238 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2240 2756
2241 /* 2757 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2762 */
2250 if (refreshnow) 2763 if (refreshnow)
2251 { 2764 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2766 refresh_limit++;
2254 else 2767 else
2768 {
2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2255 scr_refresh (refresh_type); 2771 scr_refresh ();
2772 want_refresh = 1;
2773 }
2256 } 2774 }
2257 2775
2258 } 2776 }
2259 else 2777 else
2260 { 2778 {
… …
2275 2793
2276 return flag; 2794 return flag;
2277} 2795}
2278 2796
2279// read the next character 2797// read the next character
2280unicode_t 2798wchar_t
2281rxvt_term::next_char () 2799rxvt_term::next_char () NOTHROW
2282{ 2800{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2801 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2802 {
2285 // assume 7-bit to be ascii ALWAYS 2803 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++; 2805 return *cmdbuf_ptr++;
2288 2806
2289 wchar_t wc; 2807 wchar_t wc;
2290 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);
2291 2809
2292 if (len == (size_t)-2) 2810 if (len == (size_t)-2)
2293 { 2811 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2812 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2813 cmdbuf_ptr = cmdbuf_endp;
2296 break; 2814 break;
2297 } 2815 }
2298 2816
2299 if (len == (size_t)-1) 2817 if (len == (size_t)-1)
2300 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
2301 2819
2302 // assume wchar == unicode 2820 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2821 cmdbuf_ptr += len;
2304 return wc; 2822 return wc & UNICODE_MASK;
2305 } 2823 }
2306 2824
2307 return NOCHAR; 2825 return NOCHAR;
2308} 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;
2309 2838
2310/* rxvt_cmd_getc () - Return next input character */ 2839/* rxvt_cmd_getc () - Return next input character */
2311/* 2840/*
2312 * Return the next input character after first passing any keyboard input 2841 * Return the next input character after first passing any keyboard input
2313 * to the command. 2842 * to the command.
2314 */ 2843 */
2315unicode_t 2844wchar_t
2316rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc () THROW ((class out_of_input))
2317{ 2846{
2318 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 ();
2319 2859
2320 if (c == NOCHAR) 2860 if (c == NOCHAR)
2321 throw out_of_input; 2861 throw out_of_input;
2322 2862
2323 return c; 2863 return c;
… …
2423 case C0_ESC: 2963 case C0_ESC:
2424 process_escape_seq (); 2964 process_escape_seq ();
2425 break; 2965 break;
2426 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 2969 else
2431 tt_write ((unsigned char *)VT100_ANS, 2970 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 2971 break;
2434 case C0_BEL: /* bell */ 2972 case C0_BEL: /* bell */
2435 scr_bell (); 2973 scr_bell ();
2436 break; 2974 break;
2437 case C0_BS: /* backspace */ 2975 case C0_BS: /* backspace */
… …
2453 break; 2991 break;
2454 case C0_SI: /* shift in - acs */ 2992 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2993 scr_charset_choose (0);
2456 break; 2994 break;
2457 2995
2996#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2997 // 8-bit controls
2459 case 0x90: /* DCS */ 2998 case 0x90: /* DCS */
2460 process_dcs_seq (); 2999 process_dcs_seq ();
2461 break; 3000 break;
2462 case 0x9b: /* CSI */ 3001 case 0x9b: /* CSI */
2463 process_csi_seq (); 3002 process_csi_seq ();
2464 break; 3003 break;
2465 case 0x9d: /* CSI */ 3004 case 0x9d: /* CSI */
2466 process_osc_seq (); 3005 process_osc_seq ();
2467 break; 3006 break;
3007#endif
2468 } 3008 }
2469} 3009}
2470/*}}} */ 3010/*}}} */
2471 3011
2472 3012
… …
2534void 3074void
2535rxvt_term::process_escape_seq () 3075rxvt_term::process_escape_seq ()
2536{ 3076{
2537 unicode_t ch = cmd_getc (); 3077 unicode_t ch = cmd_getc ();
2538 3078
2539 if (PrivateModes & PrivMode_vt52) 3079 if (priv_modes & PrivMode_vt52)
2540 { 3080 {
2541 process_escape_vt52 (ch); 3081 process_escape_vt52 (ch);
2542 return; 3082 return;
2543 } 3083 }
2544 3084
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3099 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3100 break;
2561 case '+': 3101 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3102 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3103 break;
2564#ifndef NO_FRILLS 3104#if !ENABLE_MINIMAL
2565 case '6': 3105 case '6':
2566 scr_backindex (); 3106 scr_backindex ();
2567 break; 3107 break;
2568#endif 3108#endif
2569 case '7': 3109 case '7':
2570 scr_cursor (SAVE); 3110 scr_cursor (SAVE);
2571 break; 3111 break;
2572 case '8': 3112 case '8':
2573 scr_cursor (RESTORE); 3113 scr_cursor (RESTORE);
2574 break; 3114 break;
2575#ifndef NO_FRILLS 3115#if !ENABLE_MINIMAL
2576 case '9': 3116 case '9':
2577 scr_forwardindex (); 3117 scr_forwardindex ();
2578 break; 3118 break;
2579#endif 3119#endif
2580 case '=': 3120 case '=':
… …
2590 break; 3130 break;
2591 3131
2592 /* 8.3.87: NEXT LINE */ 3132 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 3133 case C1_NEL: /* ESC E */
2594 { 3134 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 3135 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2597 } 3137 }
2598 break; 3138 break;
2599 3139
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 3140 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 3141 case C1_ESA: /* ESC G */
… …
2623 process_dcs_seq (); 3163 process_dcs_seq ();
2624 break; 3164 break;
2625 3165
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 3167 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 3169 break; /* steal obsolete ESC [ c */
2631 3170
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2633 case C1_CSI: /* ESC [ */ 3172 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 3173 process_csi_seq ();
… …
2661 3200
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3201/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3202/* *INDENT-OFF* */
2664enum { 3203enum {
2665 CSI_ICH = 0x40, 3204 CSI_ICH = 0x40,
2666 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,
2667 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 ,
2668 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,
2669 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,
2670 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,
2671 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,
… …
2743 ndef = get_byte_array_bit (csi_defaults, i); 3282 ndef = get_byte_array_bit (csi_defaults, i);
2744 for (p = 0; p < nargs; p++) 3283 for (p = 0; p < nargs; p++)
2745 if (arg[p] == -1) 3284 if (arg[p] == -1)
2746 arg[p] = ndef; 3285 arg[p] = ndef;
2747 3286
2748#ifdef DEBUG_CMD
2749 fprintf (stderr, "CSI ");
2750 for (p = 0; p < nargs; p++)
2751 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2752 fprintf (stderr, "%c\n", ch);
2753#endif
2754
2755 /* 3287 /*
2756 * private mode handling 3288 * private mode handling
2757 */ 3289 */
2758 if (priv) 3290 if (priv)
2759 { 3291 {
2760 switch (priv) 3292 switch (priv)
2761 { 3293 {
2762 case '>': 3294 case '>':
2763 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 //
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3304 tt_printf ("\033[>%d;94;0c", 'U');
3305 }
2765 break; 3306 break;
2766 case '?': 3307 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3310 break;
… …
2874 3415
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3421 break;
2881 3422
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3425 break;
2886 3426
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3427 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3428 process_sgr_mode (nargs, arg);
2889 break; 3429 break;
… …
2896 break; 3436 break;
2897 case 6: /* CPR requested */ 3437 case 6: /* CPR requested */
2898 scr_report_position (); 3438 scr_report_position ();
2899 break; 3439 break;
2900 case 7: /* unofficial extension */ 3440 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3441 if (OPTION (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3442 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3443 break;
2904 case 8: /* unofficial extension */ 3444 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3446 break;
2907 } 3447 }
… …
2943 break; 3483 break;
2944 3484
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3485 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3486 if (arg[0] == 4)
2947 scr_insert_mode (0); 3487 scr_insert_mode (0);
3488 else if (arg[0] == 20)
3489 priv_modes &= ~PrivMode_LFNL;
2948 break; 3490 break;
2949 3491
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3492 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3493 if (arg[0] == 4)
2952 scr_insert_mode (1); 3494 scr_insert_mode (1);
3495 else if (arg[0] == 20)
3496 priv_modes |= PrivMode_LFNL;
2953 break; 3497 break;
2954 3498
2955 /* 3499 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3500 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3501 */
… …
2969 break; 3513 break;
2970 case CSI_75: 3514 case CSI_75:
2971 scr_cursor (RESTORE); 3515 scr_cursor (RESTORE);
2972 break; 3516 break;
2973 3517
2974#ifndef NO_FRILLS 3518#if !ENABLE_MINIMAL
2975 case CSI_74: 3519 case CSI_74:
2976 process_window_ops (arg, nargs); 3520 process_window_ops (arg, nargs);
2977 break; 3521 break;
2978#endif 3522#endif
2979 3523
… …
2986 break; 3530 break;
2987 } 3531 }
2988} 3532}
2989/*}}} */ 3533/*}}} */
2990 3534
2991#ifndef NO_FRILLS 3535#if !ENABLE_MINIMAL
2992/* ARGSUSED */ 3536/* ARGSUSED */
2993void 3537void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3538rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3539{
2996 int x, y; 3540 int x, y;
2997 XWindowAttributes wattr; 3541 XWindowAttributes wattr;
2998 Window wdummy; 3542 Window wdummy;
3543
3544 dLocal (Display *, dpy);
2999 3545
3000 if (nargs == 0) 3546 if (nargs == 0)
3001 return; 3547 return;
3002 3548
3003 switch (args[0]) 3549 switch (args[0])
3004 { 3550 {
3005 /* 3551 /*
3006 * commands 3552 * commands
3007 */ 3553 */
3008 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (dpy, parent[0]);
3010 break; 3556 break;
3011 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (dpy, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3559 break;
3015 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (dpy, parent[0], args[1], args[2]);
3017 break; 3562 break;
3018 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3565 break;
3021 case 5: /* raise window */ 3566 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (dpy, parent[0]);
3023 break; 3568 break;
3024 case 6: /* lower window */ 3569 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (dpy, parent[0]);
3026 break; 3571 break;
3027 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3028 scr_touch (true); 3573 scr_touch (true);
3029 break; 3574 break;
3030 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3033 break; 3578 break;
3034 3579
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3581 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3040 break; 3585 break;
3041
3042 3586
3043 /* 3587 /*
3044 * reports - some output format copied from XTerm 3588 * reports - some output format copied from XTerm
3045 */ 3589 */
3046 case 11: /* report window state */ 3590 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3593 break;
3050 case 13: /* report window position */ 3594 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (dpy, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3596 XTranslateCoordinates (dpy, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3597 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3598 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3599 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3600 break;
3057 case 14: /* report window size (pixels) */ 3601 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3602 XGetWindowAttributes (dpy, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3604 break;
3061 case 18: /* report text area size (chars) */ 3605 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3606 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3607 break;
3064 case 19: /* report window size (chars) */ 3608 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3609 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3610 break;
3067 case 20: /* report icon label */ 3611 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3612 {
3070 char *s; 3613 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3614 XGetIconName (dpy, parent[0], &s);
3072 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);
3073 } 3617 }
3074 break; 3618 break;
3075 case 21: /* report window title */ 3619 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3620 {
3078 char *s; 3621 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3622 XFetchName (dpy, parent[0], &s);
3080 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);
3081 } 3625 }
3082 break; 3626 break;
3083 } 3627 }
3084} 3628}
3085#endif 3629#endif
3086 3630
3087/*----------------------------------------------------------------------*/ 3631/*----------------------------------------------------------------------*/
3088/* 3632/*
3089 * get input up until STRING TERMINATOR (or BEL) 3633 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3634 * ends_how is terminator used. returned input must be free()'d
3091 */ 3635 */
3092unsigned char * 3636char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3637rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3638{
3095 int seen_esc = 0; /* seen escape? */ 3639 unicode_t ch;
3640 bool seen_esc = false;
3096 unsigned int n = 0; 3641 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3642 wchar_t string[STRING_MAX];
3100 3643
3101 while ((ch = cmd_getc ())) 3644 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3645 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3646 if (seen_esc)
3647 {
3107 if (ch == 0x5c) /* 7bit ST */ 3648 if (ch == 0x5c) /* 7bit ST */
3108 break; 3649 break;
3109 else 3650 else
3110 return NULL; 3651 return NULL;
3111 3652 }
3112 if (ch == C0_ESC) 3653 else if (ch == C0_ESC)
3113 { 3654 {
3114 seen_esc = 1; 3655 seen_esc = true;
3115 continue; 3656 continue;
3116 } 3657 }
3658 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break;
3117 else if (ch == C0_HT) 3660 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3661 return NULL; /* other control character - exit */
3121 3662
3122 if (n >= sizeof (string) - 1) 3663 seen_esc = false;
3664
3665 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3666 // stop at some sane length
3124 return NULL; 3667 return NULL;
3125 3668
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3126 string[n++] = ch; 3672 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3673 }
3129 3674
3130 string[n++] = '\0'; 3675 string[n++] = '\0';
3131 3676
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3677 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3678
3137 return s; 3679 return rxvt_wcstombs (string);
3138} 3680}
3139 3681
3140/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3141/* 3683/*
3142 * 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)'
3143 */ 3685 */
3144void 3686void
3145rxvt_term::process_dcs_seq () 3687rxvt_term::process_dcs_seq ()
3146{ 3688{
3147 unsigned char *s; 3689 char *s;
3148 unicode_t eh; 3690 unicode_t eh;
3149 3691
3150 /* 3692 /*
3151 * Not handled yet 3693 * Not handled yet
3152 */ 3694 */
… …
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3713 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3714 arg = arg * 10 + (ch - '0');
3173 3715
3174 if (ch == ';') 3716 if (ch == ';')
3175 { 3717 {
3176 unsigned char *s = get_to_st (eh); 3718 char *s = get_to_st (eh);
3177 3719
3178 if (s) 3720 if (s)
3179 { 3721 {
3180 process_xterm_seq (arg, (char *)s, eh); 3722 process_xterm_seq (arg, s, eh);
3181 free (s); 3723 free (s);
3182 } 3724 }
3183 } 3725 }
3184} 3726}
3185 3727
3186void 3728void
3187rxvt_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)
3188{ 3730{
3189 if (str[0] == '?' && !str[1]) 3731 if (str[0] == '?' && !str[1])
3190 { 3732 {
3191 if (Options & Opt_insecure) 3733 rgba c;
3192 { 3734 pix_colors_focused[color].get (c);
3193 unsigned short r, g, b; 3735
3194 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
3195 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);
3196 }
3197 } 3742 }
3198 else 3743 else
3199 set_window_color (color, str); 3744 set_window_color (color, str);
3200} 3745}
3201 3746
3202/* 3747/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3749 */
3227void 3750void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3751rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3229{ 3752{
3230 int changed = 0;
3231 int color; 3753 int color;
3232 char *buf, *name; 3754 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3756 int saveop = op;
3757
3758 dLocal (Display *, dpy);
3234 3759
3235 assert (str != NULL); 3760 assert (str != NULL);
3236 switch (op) 3761 switch (op)
3237 { 3762 {
3238 case XTerm_name: 3763 case XTerm_name:
… …
3245 set_title (str); 3770 set_title (str);
3246 break; 3771 break;
3247 case XTerm_property: 3772 case XTerm_property:
3248 if (str[0] == '?') 3773 if (str[0] == '?')
3249 { 3774 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3775 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3776 Atom actual_type;
3252 int actual_format; 3777 int actual_format;
3253 unsigned long nitems; 3778 unsigned long nitems;
3254 unsigned long bytes_after; 3779 unsigned long bytes_after;
3255 unsigned char *value = 0; 3780 unsigned char *value = 0;
3256 const char *str = ""; 3781 const char *str = "";
3257 3782
3258 if (prop 3783 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3784 && XGetWindowProperty (dpy, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3785 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3786 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3787 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3788 && actual_type != None
3264 && actual_format == 8) 3789 && actual_format == 8)
3265 str = (const char *)(value); 3790 str = (const char *)(value);
3266 3791
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3792 tt_printf ("\033]%d;%s%c", op, str, resp);
3268 3793
3269 XFree (value); 3794 XFree (value);
3270 } 3795 }
3271 else 3796 else
3272 { 3797 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3798 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3799
3275 if (eq) 3800 if (eq)
3276 { 3801 {
3277 *eq = 0; 3802 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3803 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3804 }
3283 else 3805 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3806 XDeleteProperty (dpy, parent[0],
3285 display->atom (str)); 3807 display->atom (str));
3286 } 3808 }
3287 break; 3809 break;
3288 3810
3289 case XTerm_Color: 3811 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3812 for (buf = (char *)str; buf && *buf;)
3291 { 3813 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3814 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3815 break;
3294 3816
3295 *name++ = '\0'; 3817 *name++ = '\0';
3296 color = atoi (buf); 3818 color = atoi (buf) + minCOLOR;
3297 3819
3298 if (color < 0 || color >= TOTAL_COLORS) 3820 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 3821 break;
3300 3822
3301 if ((buf = STRCHR (name, ';')) != NULL) 3823 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3824 *buf++ = '\0';
3303 3825
3304 if (name[0] == '?' && !name[1]) 3826 process_color_seq (op, color, name, resp);
3305 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 }
3313 else
3314 set_window_color (color + minCOLOR, name);
3315 } 3827 }
3316 break; 3828 break;
3317 case XTerm_Color00: 3829 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3830 process_color_seq (op, Color_fg, str, resp);
3319 break; 3831 break;
3320 case XTerm_Color01: 3832 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3833 process_color_seq (op, Color_bg, str, resp);
3322 break; 3834 break;
3323#ifndef NO_CURSORCOLOR 3835#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor: 3836 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3837 process_color_seq (op, Color_cursor, str, resp);
3326 break; 3838 break;
3327#endif 3839#endif
3328 case XTerm_Color_pointer_fg: 3840 case XTerm_Color_pointer_fg:
3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3841 process_color_seq (op, Color_pointer_fg, str, resp);
3330 break; 3842 break;
3331 case XTerm_Color_pointer_bg: 3843 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3844 process_color_seq (op, Color_pointer_bg, str, resp);
3333 break; 3845 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3846#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break;
3338 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break;
3341 case XTerm_Color_RV: 3847 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3848 process_color_seq (op, Color_RV, str, resp);
3343 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;
3344#endif 3861#endif
3862#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint:
3864 process_color_seq (op, Color_tint, str, resp);
3345 3865
3866 check_our_parents ();
3867
3868 if (am_transparent)
3869 want_full_refresh = want_refresh = 1;
3870
3871 break;
3872#endif
3873
3346 case XTerm_Pixmap: 3874 case Rxvt_Pixmap:
3875 {
3347 if (*str != ';') 3876 if (*str != ';')
3348 { 3877 {
3349#if XPM_BACKGROUND 3878#if XPM_BACKGROUND
3350 scale_pixmap (""); /* reset to default scaling */ 3879 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3880 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true); 3881 scr_touch (true);
3882#endif
3354 } 3883 }
3884
3885 int changed = 0;
3886
3355 while ((str = STRCHR (str, ';')) != NULL) 3887 while ((str = strchr (str, ';')) != NULL)
3356 { 3888 {
3357 str++; 3889 str++;
3358#if XPM_BACKGROUND 3890#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3891 changed += scale_pixmap (str);
3360#endif 3892#endif
3361
3362 } 3893 }
3894
3363 if (changed) 3895 if (changed)
3364 { 3896 {
3365#ifdef XPM_BACKGROUND 3897#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3898 resize_pixmap ();
3367#endif
3368 scr_touch (true); 3899 scr_touch (true);
3900#endif
3369 } 3901 }
3902 }
3370 break; 3903 break;
3371 3904
3372 case XTerm_restoreFG: 3905 case Rxvt_restoreFG:
3373 set_window_color (Color_fg, str); 3906 set_window_color (Color_fg, str);
3374 break; 3907 break;
3375 case XTerm_restoreBG: 3908 case Rxvt_restoreBG:
3376 set_window_color (Color_bg, str); 3909 set_window_color (Color_bg, str);
3377 break; 3910 break;
3378 3911
3379 case XTerm_logfile: 3912 case XTerm_logfile:
3380 // TODO, when secure mode? 3913 // TODO, when secure mode?
3381 break; 3914 break;
3382 3915
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3429#if 0 3916#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3917 case Rxvt_dumpscreen: /* no error notices */
3431 { 3918 {
3432 int fd; 3919 int fd;
3433 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)
3434 { 3921 {
3435 scr_dump (fd); 3922 scr_dump (fd);
3436 close (fd); 3923 close (fd);
3437 } 3924 }
3438 } 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
3439 break; 3989 break;
3440#endif 3990#endif
3441 } 3991 }
3442} 3992}
3443/*----------------------------------------------------------------------*/ 3993/*----------------------------------------------------------------------*/
… …
3457{ 4007{
3458 int state; 4008 int state;
3459 4009
3460 if (mode == 's') 4010 if (mode == 's')
3461 { 4011 {
3462 SavedModes |= (PrivateModes & bit); 4012 SavedModes |= (priv_modes & bit);
3463 return -1; 4013 return -1;
3464 } 4014 }
3465 else 4015 else
3466 { 4016 {
3467 if (mode == 'r') 4017 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4018 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 4019 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4020 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 4021 PrivMode (state, bit);
3472 } 4022 }
3473 4023
3474 return state; 4024 return state;
3475} 4025}
3476 4026
3477/* we're not using priv _yet_ */ 4027/* we're not using priv _yet_ */
3478void 4028void
3479rxvt_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)
3480{ 4030{
3481 unsigned int i, j; 4031 unsigned int i, j;
3482 int state; 4032 int state;
3483 4033
3484 static const struct 4034 static const struct
… …
3493 { 3, PrivMode_132 }, 4043 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 4044 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4045 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4046 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4047 { 7, PrivMode_Autowrap },
4048 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4049 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4050 // 18, 19 printing-related
3500 { menuBar_esc, PrivMode_menuBar }, 4051 { 25, PrivMode_VisibleCursor },
3501#endif
3502#ifdef scrollBar_esc 4052#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4053 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4054#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4055 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4056 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4057 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4058 // 45 margin bell NYI
3512 // 46 start logging 4059 // 46 start logging
… …
3552 } 4099 }
3553 4100
3554 /* extra handling for values with state unkept */ 4101 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4102 switch (arg[i])
3556 { 4103 {
4104#if ENABLE_STYLES
4105 case 1021:
4106 set_option (Opt_intensityStyles, mode);
4107
4108 scr_touch (true);
4109 break;
4110#endif
3557 case 1048: /* alternative cursor save */ 4111 case 1048: /* alternative cursor save */
4112 case 1049:
3558 if (Options & Opt_secondaryScreen) 4113 if (OPTION (Opt_secondaryScreen))
3559 if (mode == 0) 4114 if (mode == 0)
3560 scr_cursor (RESTORE); 4115 scr_cursor (RESTORE);
3561 else if (mode == 1) 4116 else if (mode == 1)
3562 scr_cursor (SAVE); 4117 scr_cursor (SAVE);
3563 break; 4118 break;
… …
3574 * within VT52 mode 4129 * within VT52 mode
3575 */ 4130 */
3576 PrivMode (1, PrivMode_vt52); 4131 PrivMode (1, PrivMode_vt52);
3577 break; 4132 break;
3578 case 3: /* 80/132 */ 4133 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4134 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4135 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4136 break;
3582 case 4: /* smooth scrolling */ 4137 case 4: /* smooth scrolling */
3583 if (state) 4138 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 4139 break;
3588 case 5: /* reverse video */ 4140 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4141 scr_rvideo_mode (state);
3590 break; 4142 break;
3591 case 6: /* relative/absolute origins */ 4143 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4147 scr_autowrap (state);
3596 break; 4148 break;
3597 /* 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 */
3598 case 9: /* X10 mouse reporting */ 4150 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4151 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4152 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4153 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 4154#ifdef scrollBar_esc
3610 case scrollBar_esc: 4155 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 4156 if (scrollbar_mapping (state))
3612 { 4157 {
3613 resize_all_windows (0, 0, 0); 4158 resize_all_windows (0, 0, 0);
… …
3625 break; 4170 break;
3626 /* case 66: - application key pad */ 4171 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4172 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4173 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4175 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4176 break;
3632#if 0 4177#if 0
3633 case 1001: 4178 case 1001:
3634 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
3635#endif 4180#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 4182 set_option (Opt_scrollTtyOutput, !state);
3641 break; 4183 break;
3642 case 1011: /* scroll to bottom on key press */ 4184 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4185 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 4186 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4187 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4188 if (OPTION (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4189 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4190 scr_erase_screen (2);
3652 scr_change_screen (state); 4191 scr_change_screen (state);
3653 break; 4192 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4193 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4194 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4195 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4196 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4197 scr_erase_screen (2);
3659 break; 4198 break;
3660 default: 4199 default:
3661 break; 4200 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4226 rendset = 0, rendstyle = ~RS_None;
3688 break; 4227 break;
3689 case 1: 4228 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4229 rendset = 1, rendstyle = RS_Bold;
3691 break; 4230 break;
4231 //case 2: // low intensity
4232 case 3:
4233 rendset = 1, rendstyle = RS_Italic;
4234 break;
3692 case 4: 4235 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4236 rendset = 1, rendstyle = RS_Uline;
3694 break; 4237 break;
3695 case 5: 4238 case 5: // slowly blinking
4239 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4240 rendset = 1, rendstyle = RS_Blink;
3697 break; 4241 break;
3698 //case 6: // scoansi light background 4242 //case 6: // scoansi light background
3699 case 7: 4243 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4244 rendset = 1, rendstyle = RS_RVid;
3701 break; 4245 break;
3702 case 8: 4246 case 8:
3703 // invisible. NYI 4247 // invisible. NYI
3704 break; 4248 break;
4249 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4250 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4251 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4252 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4253 //...
4254 //case 19: // ninth alt font
4255 //case 20: // gothic
4256 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4257 rendset = 0, rendstyle = RS_Bold;
3710 break; 4258 break;
3711 case 22: 4259 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 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
… …
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