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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.318 by root, Sat Jan 13 15:26:56 2007 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
… …
717rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
718{ 1139{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
721 { 1142 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1143 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
725 } 1145 }
726} 1146}
727#endif 1147#endif
… …
731rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
732{ 1152{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1154 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1156 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
739 } 1158 }
740} 1159}
741#endif 1160#endif
… …
746{ 1165{
747 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1169 {
751 refresh_type |= SMOOTH_REFRESH; 1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
752 want_refresh = 1; 1173 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1175 }
755} 1176}
756#endif 1177#endif
757 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
758bool 1204bool
759rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
760{ 1206{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1208
763 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
764 { 1210 {
765 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");
766 n = 0; 1212 n = 0;
767 } 1213 }
768 1214
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
772 1218
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
774 1220
775 if (n > 0) 1221 if (r > 0)
776 { 1222 {
777 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
778 return true; 1224 return true;
779 } 1225 }
780 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))
781 destroy (); 1238 destroy ();
1239 }
782 1240
783 return false; 1241 return false;
784} 1242}
785 1243
786void 1244void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1246{
789 SET_R (this); 1247 make_current ();
790 SET_LOCALE (locale);
791 1248
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1251 while (pty_fill ())
797 if (cmd_parse ()) 1252 if (cmd_parse ())
798 break; 1253 break;
1254
1255 if (revents & EVENT_WRITE)
1256 pty_write ();
799} 1257}
800 1258
801void 1259void
802rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
803{ 1261{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
805 recolour_cursor (); 1263 recolour_cursor ();
806 1264
807#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1266 hidden_pointer = 0;
809 1267
810 if (Options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1270#endif
813} 1271}
814 1272
815#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
816void 1274void
817rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
818{ 1276{
819 if (! (Options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
820 return; 1278 return;
821 1279
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
823 XFlush (display->display); 1281 XFlush (dpy);
824 1282
825 hidden_pointer = 1; 1283 hidden_pointer = 1;
826} 1284}
827 1285
828void 1286void
829rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
830{ 1288{
831 SET_R (this); 1289 make_current ();
832 SET_LOCALE (locale);
833 1290
834 pointer_blank (); 1291 pointer_blank ();
835} 1292}
836#endif 1293#endif
837 1294
… …
844 x = ev.x; 1301 x = ev.x;
845 y = ev.y; 1302 y = ev.y;
846 pixel_position (&x, &y); 1303 pixel_position (&x, &y);
847 1304
848 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1306 button_number = 3;
851 }
852 else 1307 else
853 { 1308 {
854 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1311 if (button_number >= 3)
857 button_number += (64 - 3); 1312 button_number += (64 - 3);
858 } 1313 }
859 1314
860 if (PrivateModes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
861 { 1316 {
862 /* 1317 /*
863 * do not report ButtonRelease 1318 * do not report ButtonRelease
864 * no state info allowed 1319 * no state info allowed
865 */ 1320 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1335 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1336 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1337#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1338 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1339#endif
885
886 } 1340 }
887 1341
888#ifdef DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1344 if (key_state & 16)
891 fputc ('C', stderr); 1345 fputc ('C', stderr);
892 if (key_state & 4) 1346 if (key_state & 4)
893 fputc ('S', stderr); 1347 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1351 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1353 button_number,
900 x + 1, 1354 x + 1,
901 y + 1); 1355 y + 1);
902#else 1356#endif
1357
903 tt_printf ("\033[M%c%c%c", 1358 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
905 (32 + x + 1), 1360 (32 + x + 1),
906 (32 + y + 1)); 1361 (32 + y + 1));
907#endif
908} 1362}
909
910#ifdef USING_W11LIB
911void
912rxvt_W11_process_x_event (XEvent *ev)
913{
914 rxvt_t *r = rxvt_get_r ();
915
916 x_cb (*ev);
917}
918#endif
919 1363
920/*{{{ process an X event */ 1364/*{{{ process an X event */
921void 1365void
922rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
923{ 1367{
924 SET_R (this); 1368 make_current ();
925 SET_LOCALE (locale);
926 1369
927#if defined(CURSOR_BLINK) 1370 dLocal (Display *, dpy);
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
929 {
930 if (hidden_cursor)
931 {
932 hidden_cursor = 0;
933 want_refresh = 1;
934 }
935 1371
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1372 if (ev.xany.window == vt
937 } 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
938#endif 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
939
940#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 {
943 if (ev.type == MotionNotify
944 || ev.type == ButtonPress
945 || ev.type == ButtonRelease)
946 if (hidden_pointer)
947 pointer_unblank ();
948
949 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank ();
951 }
952#endif
953
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return; 1375 return;
957#endif
958 1376
1377 // for XQueryPointer
959 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1380 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1381
1012 switch (ev.type) 1382 switch (ev.type)
1013 { 1383 {
1014 case KeyPress: 1384 case KeyPress:
1015 lookup_key (ev.xkey); 1385 key_press (ev.xkey);
1016 break; 1386 break;
1017 1387
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease: 1388 case KeyRelease:
1020 { 1389 key_release (ev.xkey);
1021 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0;
1030 }
1031 break; 1390 break;
1032 }
1033#endif
1034 1391
1035 case ButtonPress: 1392 case ButtonPress:
1036 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1037 break; 1394 break;
1038 1395
… …
1040 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1041 break; 1398 break;
1042 1399
1043 case ClientMessage: 1400 case ClientMessage:
1044 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1046 destroy ();
1047#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink))
1053 { 1403 {
1054 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1055 Atom ActualType; 1405 {
1056 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1057 unsigned char *data; 1407 {
1058 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1059 1409 {
1060 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1061 xa[XA_DNDSELECTION], 1411 destroy ();
1062 0L, 1000000L, 1412 }
1063 False, AnyPropertyType, 1413#if ENABLE_EWMH
1064 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1065 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1066 &data); 1417 &ev);
1067 XChangeProperty (display->display, display->root, 1418#endif
1068 XA_CUT_BUFFER0, XA_STRING, 1419 }
1069 8, PropModeReplace, 1420 }
1070 data, STRLEN (data)); 1421#if ENABLE_XEMBED
1071 XFree (data); 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1423 {
1073 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
1074 } 1430 }
1075#endif /* OFFIX_DND */
1076 break; 1431 break;
1077 1432
1078 case MappingNotify: 1433 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1435 break;
1081 1436
1082 /* 1437 /*
1083 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1103 break; 1458 break;
1104 } 1459 }
1105 break; 1460 break;
1106 1461
1107 case FocusIn: 1462 case FocusIn:
1108 if (!TermWin.focus) 1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1469 focus_out ();
1470 break;
1471
1472 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0])
1109 { 1474 {
1110 TermWin.focus = 1; 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1476 ;
1112#ifdef USE_XIM 1477
1113 if (Input_Context != NULL) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1479 {
1123 PixColors = PixColorsFocused; 1480 seen_resize = 1;
1124 set_colorfgbg (); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1125 scr_clear ();
1126 scr_touch (true);
1127 } 1482 }
1128#endif
1129 1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1130 } 1490 }
1131 break; 1491 break;
1132 1492
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break;
1159
1160 case ConfigureNotify: 1493 case PropertyNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1162 { 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1163 int height, width; 1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1164 1498
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 }
1193 break; 1499 break;
1194 1500
1195 case SelectionClear: 1501 case SelectionClear:
1196 selection_clear (); 1502 selection_clear ();
1197 break; 1503 break;
1198 1504
1199 case SelectionNotify: 1505 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1506 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1508 break;
1204 1509
1205 case SelectionRequest: 1510 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1207 break; 1512 break;
1208 1513
1514 case MapNotify:
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break;
1521
1209 case UnmapNotify: 1522 case UnmapNotify:
1210 TermWin.mapped = 0; 1523 mapped = 0;
1211#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1213#endif 1526#endif
1214 break; 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1215
1216 case MapNotify:
1217 TermWin.mapped = 1;
1218#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif
1221 break; 1528 break;
1222 1529
1223#ifdef TRANSPARENT 1530#ifdef TRANSPARENT
1224 case ReparentNotify: 1531 case ReparentNotify:
1225 rootwin_cb (ev); 1532 rootwin_cb (ev);
1226 break; 1533 break;
1227#endif /* TRANSPARENT */ 1534#endif /* TRANSPARENT */
1228 1535
1229 case GraphicsExpose: 1536 case GraphicsExpose:
1230 case Expose: 1537 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1538 if (ev.xany.window == vt)
1232 { 1539 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1540 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1544
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1550
1241 // ev.xexpose.width, TermWin.height, False);
1242#endif
1243 want_refresh = 1; 1551 want_refresh = 1;
1244 } 1552 }
1245 else 1553 else
1246 { 1554 {
1247 XEvent unused_event; 1555 XEvent unused_event;
1248 1556
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1250 ; 1558 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1560 ;
1253 1561
1254 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1255 { 1563 {
1256 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1257 scrollbar_show (0); 1565 scrollbar_show (0);
1258 } 1566 }
1259#ifdef MENUBAR 1567
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1568#ifdef TRANSPARENT
1261 menubar_expose (); 1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1262#endif 1571#endif
1263 } 1572 }
1264 break; 1573 break;
1265 1574
1266 case MotionNotify: 1575 case MotionNotify:
1267#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1268 if (hidden_pointer) 1577 if (hidden_pointer)
1269 pointer_unblank (); 1578 pointer_unblank ();
1270#endif 1579#endif
1271#if MENUBAR 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1272 if (isMenuBarWindow (ev.xany.window)) 1581 break;
1582
1583 if (ev.xany.window == vt)
1273 { 1584 {
1274 menubar_control (ev.xbutton); 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1275 break; 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1276 } 1587 ; // nop
1277#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1279 break;
1280
1281 if (ev.xany.window == TermWin.vt)
1282 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1589 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1286 ; 1591 ;
1287 1592
1288 XQueryPointer (display->display, TermWin.vt, 1593 XQueryPointer (dpy, vt,
1289 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1596 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1597 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1599 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1600 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1601 {
1297#endif 1602#endif
1603#if ISO_14755
1604 // 5.4
1605 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1606 {
1607 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1608 break;
1609 }
1610#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1611 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1612 ev.xbutton.state & Button3Mask ? 2 : 0);
1613
1300#ifdef SELECTION_SCROLLING 1614#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1615 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1616 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1617 {
1304 int dist; 1618 int dist;
1305 1619
1306 /* don't clobber the current delay if we are 1620 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1621 * already in the middle of scrolling.
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1625
1312 /* save the event params so we can highlight 1626 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1627 * the selection in the pending-scroll loop
1314 */ 1628 */
1315 selection_save_x=ev.xbutton.x; 1629 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1630 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1631 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1632
1320 /* calc number of lines to scroll */ 1633 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1634 if (ev.xbutton.y < int_bwidth)
1322 { 1635 {
1323 scroll_selection_dir = UP; 1636 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1637 dist = int_bwidth - ev.xbutton.y;
1325 } 1638 }
1326 else 1639 else
1327 { 1640 {
1328 scroll_selection_dir = DN; 1641 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1642 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1643 }
1644
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1645 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1646 / SELECTION_SCROLL_LINE_SPEEDUP
1647 + 1;
1334 MIN_IT (scroll_selection_lines, 1648 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1649 SELECTION_SCROLL_MAX_LINES);
1336 } 1650 }
1337 else 1651 else
1338 { 1652 {
1339 /* we are within the text window, so we 1653 /* we are within the text window, so we
1340 * shouldn't be scrolling 1654 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1656 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1344 } 1658 }
1345#endif 1659#endif
1346#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1347
1348 } 1661 }
1349#endif 1662#endif
1350
1351 } 1663 }
1352 } 1664 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1666 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1356 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1357 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1358 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1675 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1677 scrollbar_size ());
1364 scr_refresh (refresh_type); 1678 want_refresh = 1;
1365 refresh_limit = 0; 1679 refresh_limit = 0;
1366 scrollbar_show (1); 1680 scrollbar_show (1);
1367 } 1681 }
1368 break; 1682 break;
1369 } 1683 }
1370}
1371 1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ENABLE_OVERLAY
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1372void 1796void
1373rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1798{
1375 SET_R (this); 1799 make_current ();
1376 SET_LOCALE (locale);
1377 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1378 switch (ev.type) 1806 switch (ev.type)
1379 { 1807 {
1380 case PropertyNotify: 1808 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1809 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1393 */ 1812 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1815 return;
1399 }
1400 1816
1401 /* FALLTHROUGH */ 1817 /* FALLTHROUGH */
1402 case ReparentNotify: 1818 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1405 break; 1821 break;
1822 }
1406#endif 1823# endif
1407 }
1408} 1824}
1825#endif
1409 1826
1410void 1827void
1411rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1412{ 1829{
1413 int reportmode = 0, clickintime; 1830 int reportmode = 0, clickintime;
1414 1831
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1832 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1833
1416 if (!bypass_keystate) 1834 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836
1418 /* 1837 /*
1419 * VT window processing of button press 1838 * VT window processing of button press
1420 */ 1839 */
1421 if (ev.window == TermWin.vt) 1840 if (ev.window == vt)
1422 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1424 if (reportmode) 1856 if (reportmode)
1425 { 1857 {
1426 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1429#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1430 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1431 { 1863 {
1432 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1433 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1434 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1435 { 1868 {
1436 /* only report double clicks */ 1869 /* only report double clicks */
1437 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1438 mouse_report (ev); 1871 mouse_report (ev);
… …
1457 } 1890 }
1458 else 1891 else
1459 { 1892 {
1460 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1462 switch (ev.button) 1896 switch (ev.button)
1463 { 1897 {
1464 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1465 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1467 { 1909 {
1468 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1470 else 1912 else
1471 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1928 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1489 else 1931 else
1490 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1491 MEvent.button = Button3; 1934 MEvent.button = Button3;
1492 break; 1935 break;
1493 } 1936 }
1494 } 1937 }
1938
1495 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1496 return; 1940 return;
1497 } 1941 }
1498 1942
1499 /* 1943 /*
… …
1591 break; 2035 break;
1592 case R_SB_ALIGN_BOTTOM: 2036 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 2037 csrO = scrollBar.bot - scrollBar.top;
1594 break; 2038 break;
1595 } 2039 }
2040
1596 if (scrollBar.style == R_SB_XTERM 2041 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 2042 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 2043 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 2045
1601 scrollBar.setMotion (); 2046 scrollBar.setMotion ();
1602 break; 2047 break;
1603 2048
1604 case Button1: 2049 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2050 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 case Button3: 2054 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1611 { 2056 {
1612 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1615# else 2060# else
1616 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1617# endif 2062# endif
1618 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1621# else 2066# else
1622 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1623# endif 2068# endif
1624 else 2069 else
1625 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1626 } 2071 }
1627 else 2072 else
1628 { 2073 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2075 (nrow
1631 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 2077 / scrollbar_size ()));
1633 } 2078 }
2079
1634 break; 2080 break;
1635 } 2081 }
1636 } 2082 }
2083
1637 return; 2084 return;
1638 } 2085 }
1639#if MENUBAR
1640 /*
1641 * Menubar window processing of button press
1642 */
1643 if (isMenuBarWindow (ev.window))
1644 menubar_control (ev);
1645#endif
1646} 2086}
1647 2087
1648void 2088void
1649rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1650{ 2090{
1651 int reportmode = 0; 2091 int reportmode = 0;
1652 2092
1653 csrO = 0; /* reset csr Offset */ 2093 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2094 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2095 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2096
1657 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1658 { 2098 {
1659 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1660 scrollbar_show (0); 2100 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH;
1663#endif
1664
1665 } 2101 }
2102
1666#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1669#endif 2106#endif
2107
1670 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1671 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2113#if ISO_14755
2114 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return;
2117#endif
2118
1672 if (reportmode) 2119 if (reportmode)
1673 { 2120 {
1674 /* mouse report from vt window */ 2121 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2123 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2137 MEvent.button = AnyButton;
1691 mouse_report (ev); 2138 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2139#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2140 return;
1694 } 2141 }
2142
1695 /* 2143 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2144 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2145 * when overriding mouse reporting
1698 */ 2146 */
1699 if (PrivateModes & PrivMode_mouse_report 2147 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2148 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2149 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2150 selection_extend (ev.x, ev.y, 0);
1703 2151
1704 switch (ev.button) 2152 switch (ev.button)
1705 { 2153 {
1706 case Button1: 2154 case Button1:
1707 case Button3: 2155 case Button3:
1708 selection_make (ev.time); 2156 selection_make (ev.time);
1709 break; 2157 break;
2158
1710 case Button2: 2159 case Button2:
1711 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1712 break; 2162 break;
2163
1713#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
1714 case Button4: 2165 case Button4:
1715 case Button5: 2166 case Button5:
1716 { 2167 {
1717 int i; 2168 int i;
… …
1719 2170
1720 v = ev.button == Button4 ? UP : DN; 2171 v = ev.button == Button4 ? UP : DN;
1721 2172
1722 if (ev.state & ShiftMask) 2173 if (ev.state & ShiftMask)
1723 i = 1; 2174 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2175 else if (OPTION (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2176 i = nrow - 1;
1726 else 2177 else
1727 i = 5; 2178 i = 5;
1728 2179
1729# ifdef MOUSE_SLIP_WHEELING 2180# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2181 if (ev.state & ControlMask)
1731 { 2182 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2183 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2186
1736 if (slip_wheel_ev.at < NOW) 2187 if (slip_wheel_ev.at < NOW)
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738 2189
1739 slip_wheel_ev.start (); 2190 slip_wheel_ev.start ();
1740 } 2191 }
1741 else 2192 else
1742 { 2193 {
1743# endif 2194# endif
1744# ifdef JUMP_MOUSE_WHEEL
1745 scr_page (v, i); 2195 scr_page (v, i);
1746 scr_refresh (SMOOTH_REFRESH);
1747 scrollbar_show (1); 2196 scrollbar_show (1);
1748# else
1749 while (i--)
1750 {
1751 scr_page (v, 1);
1752 scr_refresh (SMOOTH_REFRESH);
1753 scrollbar_show (1);
1754 }
1755# endif
1756# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
1757 } 2198 }
1758#endif 2199# endif
1759 } 2200 }
1760 break; 2201 break;
1761#endif 2202#endif
1762 } 2203 }
1763 } 2204 }
1764#ifdef MENUBAR
1765 else if (isMenuBarWindow (ev.window))
1766 menubar_control (ev);
1767#endif
1768} 2205}
1769 2206
1770#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
1771#if TINTING 2208#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2209/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2210
1775static void 2211typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2212
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2214{
1783 /* No saturation */ 2215 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2216 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
1787 2221
1788 b = ((uint16_t *) ptr)[x]; 2222 Visual *visual = term->visual;
1789 r = (b & 0x7c00) * rm; 2223
1790 g = (b & 0x3e0) * gm; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2225
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2226 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2227 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2228 mask_g = visual->green_mask;
1795 } 2229 mask_b = visual->blue_mask;
1796 ptr += bpl; 2230
1797 } 2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2304 } else {
1799 for (y = h; --y >= 0;) { 2305 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2306 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2307
1803 b = ((uint16_t *) ptr)[x]; 2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2309
1805 g = (b & 0x3e0) * gm; 2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2313 }
1809 b |= (!(b >> 5) - 1); 2314
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2317 {
1813 } 2318 unsigned int tmp;
1814 ptr += bpl; 2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
1815 } 2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2371 }
1817} 2372 break;
1818 2373 }
1819/* RGB 16 */ 2374 case 16:
1820static void 2375 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2376 unsigned short *p1, *pf, *p, *pl;
1822{ 2377 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2379 while (p1 < pf)
1825 2380 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2381 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2382 pl = p1 + srcImage->width;
1828 /* No saturation */ 2383 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2384 {
1843 } else { 2385 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2386 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2387 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2388 }
1859 ptr += bpl; 2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
1860 } 2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2409 }
1862} 2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2417
1864/* RGB 24 */ 2418 while (p1 < pf)
1865static void 2419 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2420 p = p1;
1867{ 2421 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2422 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2423 {
1896 } else { 2424 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2425 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2426 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2427 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2428 }
1927 ptr += bpl; 2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2430 }
2431 break;
2432 }
1929 } 2433 }
1930}
1931 2434
1932/* RGB 32 */ 2435 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2436}
2003
2004#endif 2437#endif
2005 2438
2006/* 2439/*
2007 * Check our parents are still who we think they are. 2440 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2441 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2020 2453
2021 pchanged = 0; 2454 pchanged = 0;
2022 2455
2023 if (!(Options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2025 2458
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2028 2461
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2030 2463
2031 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2032 { 2465 {
2033 if (am_transparent) 2466 if (am_transparent)
2034 { 2467 {
2035 pchanged = 1; 2468 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2038 } 2471 }
2039 2472
2040 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2041 } 2474 }
2042 2475
2043 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False); 2477 XSync (dpy, False);
2045 2478
2046 /* 2479 /*
2047 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2050 */ 2483 */
2051 i = (xa[XA_XROOTPMAPID] 2484 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2055 2488
2056 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2061 2494
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2063 have_pixmap = 0; 2500 have_pixmap = 0;
2064 else 2501 else
2065 { 2502 {
2066 have_pixmap = 1; 2503 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2504 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2515 Window cr;
2079 XImage *image; 2516 XImage *image;
2080 GC gc; 2517 GC gc;
2081 XGCValues gcvalue; 2518 XGCValues gcvalue;
2082 2519
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2524 nx = ny = 0;
2088 2525
… …
2098 nh += sy; 2535 nh += sy;
2099 ny = -sy; 2536 ny = -sy;
2100 sy = 0; 2537 sy = 0;
2101 } 2538 }
2102 2539
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2105 allowedxerror = -1; 2544 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2546
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2549 allowedxerror = 0;
2111 2550
2112 if (image == NULL) 2551 if (image == NULL)
2113 { 2552 {
2114 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2115 { 2554 {
2116 pchanged = 1; 2555 pchanged = 1;
2117 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2118 { 2557 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (dpy, pixmap);
2120 TermWin.pixmap = None; 2559 pixmap = None;
2121 } 2560 }
2122 } 2561 }
2123 2562
2124 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2125 } 2564 }
2126 else 2565 else
2127 { 2566 {
2128 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (dpy, pixmap);
2130 2569
2131#if TINTING 2570#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2572 {
2134 unsigned short rm, gm, bm; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2135 if (rs[Rs_shade]) 2574
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2575 rgba c;
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2139 2577
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2579 }
2151#endif 2580#endif
2152 2581
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2154 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2586 XFreeGC (dpy, gc);
2159 XDestroyImage (image); 2587 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2161 2590
2162 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2592 pchanged = 1;
2164 2593
2165 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2166 } 2595 }
2167 } 2596 }
2168 2597
2169 if (!am_pixmap_trans) 2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2170 { 2601 {
2171 unsigned int n; 2602 unsigned int n;
2172 /* 2603 /*
2173 * InheritPixmap transparency 2604 * InheritPixmap transparency
2174 */ 2605 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2177 { 2607 {
2178 oldp = TermWin.parent[i]; 2608 oldp = parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2180 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2610 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2611
2184 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2185 { 2613 {
2186 if (oldp != None) 2614 if (oldp != None)
2187 pchanged = 1; 2615 pchanged = 1;
2188 2616
2189 break; 2617 break;
2190 } 2618 }
2191 2619
2192 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2193 pchanged = 1; 2621 pchanged = 1;
2194 } 2622 }
2195 2623
2196 n = 0; 2624 n = 0;
2197 2625
2198 if (pchanged) 2626 if (pchanged)
2199 {
2200 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2201 { 2628 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2630
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2632 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2207 break; 2634 break;
2208 } 2635 }
2209 } 2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2210 } 2639 {
2211
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2642 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2219 } 2644 }
2220 else 2645 else
2221 { 2646 {
2222#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1);
2226#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2230 2652
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2232 am_transparent = 1; 2654 am_transparent = 1;
2233 } 2655 }
2234 2656
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2237 } 2673 }
2238 2674
2239 return pchanged; 2675 return pchanged;
2240} 2676}
2241#endif 2677#endif
… …
2244 2680
2245bool 2681bool
2246rxvt_term::cmd_parse () 2682rxvt_term::cmd_parse ()
2247{ 2683{
2248 bool flag = false; 2684 bool flag = false;
2249 unicode_t ch = NOCHAR; 2685 wchar_t ch = NOCHAR;
2250 unsigned char *seq_begin; // remember start of esc-sequence here 2686 char *seq_begin; // remember start of esc-sequence here
2251 2687
2252 for (;;) 2688 for (;;)
2253 { 2689 {
2254 if (ch == NOCHAR) 2690 if (ch == NOCHAR)
2255 { 2691 {
2256 seq_begin = cmdbuf_ptr; 2692 seq_begin = cmdbuf_ptr;
2257 ch = next_char (); 2693 ch = next_char ();
2258 }
2259 2694
2260 if (ch == NOCHAR) // TODO: improve 2695 if (ch == NOCHAR)
2261 break; 2696 break;
2697 }
2262 2698
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2700 {
2701 if (!seen_input)
2702 {
2703 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs
2707 // then sometimes get the size wrong.
2708 // unfortunately other programs are even more buggy and dislike
2709 // being sent SIGWINCH, so only do it when we were in fact being
2710 // resized.
2711 if (seen_resize && cmd_pid)
2712 kill (-cmd_pid, SIGWINCH);
2713 }
2714
2265 /* Read a text string from the input buffer */ 2715 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2716 wchar_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2717 bool refreshnow = false;
2268 int nlines = 0; 2718 int nlines = 0;
2269 unicode_t *str = buf; 2719 wchar_t *str = buf;
2270 2720 wchar_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2721
2273 for (;;) 2722 for (;;)
2274 { 2723 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2725 break;
2280 2726
2281 *str++ = ch; 2727 *str++ = ch;
2282 2728
2283 if (ch == C0_LF) 2729 if (ch == C0_LF || str >= eol)
2284 { 2730 {
2731 if (ch == C0_LF)
2285 nlines++; 2732 nlines++;
2733
2286 refresh_count++; 2734 refresh_count++;
2287 2735
2288 if (! (Options & Opt_jumpScroll) 2736 if (!OPTION (Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2290 { 2738 {
2291 refreshnow = true; 2739 refreshnow = true;
2292 flag = true; 2740 refresh_count = 0;
2293 ch = NOCHAR; 2741 ch = NOCHAR;
2294 break; 2742 break;
2295 } 2743 }
2296 2744
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2746 if (nlines >= nrow - 1)
2299 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2300 scr_add_lines (buf, nlines, str - buf); 2750 scr_add_lines (buf, str - buf, nlines);
2751
2301 nlines = 0; 2752 nlines = 0;
2302 str = buf; 2753 str = buf;
2754 eol = str + min (ncol, UBUFSIZ);
2303 } 2755 }
2756
2757 if (str >= eol)
2758 {
2759 if (eol >= buf + UBUFSIZ)
2760 {
2761 ch = NOCHAR;
2762 break;
2763 }
2764 else
2765 eol = min (eol + ncol, buf + UBUFSIZ);
2766 }
2767
2304 } 2768 }
2305 2769
2306 if (str >= buf + UBUFSIZ) 2770 seq_begin = cmdbuf_ptr;
2307 { 2771 ch = next_char ();
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2772 }
2312 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2313 scr_add_lines (buf, nlines, str - buf); 2776 scr_add_lines (buf, str - buf, nlines);
2314 2777
2315 /* 2778 /*
2316 * If there have been a lot of new lines, then update the screen 2779 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2780 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2781 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2782 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2783 */
2324 if (refreshnow) 2784 if (refreshnow)
2325 { 2785 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2787 refresh_limit++;
2328 else 2788 else
2789 {
2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2329 scr_refresh (refresh_type); 2792 scr_refresh ();
2793 want_refresh = 1;
2794 }
2330 } 2795 }
2331 2796
2332 } 2797 }
2333 else 2798 else
2334 { 2799 {
… …
2348 } 2813 }
2349 2814
2350 return flag; 2815 return flag;
2351} 2816}
2352 2817
2353// read the next octet
2354unicode_t
2355rxvt_term::next_octet ()
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? *cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2362// read the next character 2818// read the next character
2363unicode_t 2819wchar_t
2364rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2365{ 2821{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2823 {
2368 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2369 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2370 return *cmdbuf_ptr++; 2826 return *cmdbuf_ptr++;
2371 2827
2372 wchar_t wc; 2828 wchar_t wc;
2373 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2374 2830
2375 if (len == (size_t)-2) 2831 if (len == (size_t)-2)
2376 { 2832 {
2377 // the mbstate stores incomplete sequences. didn't know this :/ 2833 // the mbstate stores incomplete sequences. didn't know this :/
2378 cmdbuf_ptr = cmdbuf_endp; 2834 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2835 break;
2380 } 2836 }
2381 2837
2382 if (len == (size_t)-1) 2838 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2840
2385 // assume wchar == unicode 2841 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2842 cmdbuf_ptr += len;
2387 return wc; 2843 return wc & UNICODE_MASK;
2388 } 2844 }
2389 2845
2390 return NOCHAR; 2846 return NOCHAR;
2391} 2847}
2848
2849// read the next octet
2850uint32_t
2851rxvt_term::next_octet () NOTHROW
2852{
2853 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR;
2856}
2857
2858static class out_of_input out_of_input;
2392 2859
2393/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2394/* 2861/*
2395 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2396 * to the command. 2863 * to the command.
2397 */ 2864 */
2398unicode_t 2865wchar_t
2399rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2400{ 2867{
2401 unicode_t c = next_char (); 2868 wchar_t c = next_char ();
2402 2869
2403 if (c == NOCHAR) 2870 if (c == NOCHAR)
2404 throw out_of_input; 2871 throw out_of_input;
2405 2872
2406 return c; 2873 return c;
2407} 2874}
2408 2875
2409unicode_t 2876uint32_t
2410rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2878{
2412 unicode_t c = next_octet (); 2879 uint32_t c = next_octet ();
2413 2880
2414 if (c == NOCHAR) 2881 if (c == NOCHAR)
2415 throw out_of_input; 2882 throw out_of_input;
2416 2883
2417 return c; 2884 return c;
… …
2517 case C0_ESC: 2984 case C0_ESC:
2518 process_escape_seq (); 2985 process_escape_seq ();
2519 break; 2986 break;
2520 case C0_ENQ: /* terminal Status */ 2987 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2988 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2989 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2524 else 2990 else
2525 tt_write ((unsigned char *)VT100_ANS, 2991 tt_write (VT100_ANS, strlen (VT100_ANS));
2526 (unsigned int)STRLEN (VT100_ANS));
2527 break; 2992 break;
2528 case C0_BEL: /* bell */ 2993 case C0_BEL: /* bell */
2529 scr_bell (); 2994 scr_bell ();
2530 break; 2995 break;
2531 case C0_BS: /* backspace */ 2996 case C0_BS: /* backspace */
… …
2630void 3095void
2631rxvt_term::process_escape_seq () 3096rxvt_term::process_escape_seq ()
2632{ 3097{
2633 unicode_t ch = cmd_getc (); 3098 unicode_t ch = cmd_getc ();
2634 3099
2635 if (PrivateModes & PrivMode_vt52) 3100 if (priv_modes & PrivMode_vt52)
2636 { 3101 {
2637 process_escape_vt52 (ch); 3102 process_escape_vt52 (ch);
2638 return; 3103 return;
2639 } 3104 }
2640 3105
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3121 break;
2657 case '+': 3122 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3124 break;
2660#ifndef NO_FRILLS 3125#if !ENABLE_MINIMAL
2661 case '6': 3126 case '6':
2662 scr_backindex (); 3127 scr_backindex ();
2663 break; 3128 break;
2664#endif 3129#endif
2665 case '7': 3130 case '7':
2666 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
2667 break; 3132 break;
2668 case '8': 3133 case '8':
2669 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
2670 break; 3135 break;
2671#ifndef NO_FRILLS 3136#if !ENABLE_MINIMAL
2672 case '9': 3137 case '9':
2673 scr_forwardindex (); 3138 scr_forwardindex ();
2674 break; 3139 break;
2675#endif 3140#endif
2676 case '=': 3141 case '=':
… …
2686 break; 3151 break;
2687 3152
2688 /* 8.3.87: NEXT LINE */ 3153 /* 8.3.87: NEXT LINE */
2689 case C1_NEL: /* ESC E */ 3154 case C1_NEL: /* ESC E */
2690 { 3155 {
2691 unicode_t nlcr[] = { C0_LF, C0_CR }; 3156 wchar_t nlcr[] = { C0_LF, C0_CR };
2692 scr_add_lines (nlcr, 1, 2); 3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2693 } 3158 }
2694 break; 3159 break;
2695 3160
2696 /* kidnapped escape sequence: Should be 8.3.48 */ 3161 /* kidnapped escape sequence: Should be 8.3.48 */
2697 case C1_ESA: /* ESC G */ 3162 case C1_ESA: /* ESC G */
… …
2719 process_dcs_seq (); 3184 process_dcs_seq ();
2720 break; 3185 break;
2721 3186
2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2723 case C1_SCI: /* ESC Z */ 3188 case C1_SCI: /* ESC Z */
2724 tt_write ((const unsigned char *)ESCZ_ANSWER, 3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2725 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2726 break; /* steal obsolete ESC [ c */ 3190 break; /* steal obsolete ESC [ c */
2727 3191
2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2729 case C1_CSI: /* ESC [ */ 3193 case C1_CSI: /* ESC [ */
2730 process_csi_seq (); 3194 process_csi_seq ();
… …
2839 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
2840 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
2841 if (arg[p] == -1) 3305 if (arg[p] == -1)
2842 arg[p] = ndef; 3306 arg[p] = ndef;
2843 3307
2844#ifdef DEBUG_CMD
2845 fprintf (stderr, "CSI ");
2846 for (p = 0; p < nargs; p++)
2847 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2848 fprintf (stderr, "%c\n", ch);
2849#endif
2850
2851 /* 3308 /*
2852 * private mode handling 3309 * private mode handling
2853 */ 3310 */
2854 if (priv) 3311 if (priv)
2855 { 3312 {
2856 switch (priv) 3313 switch (priv)
2857 { 3314 {
2858 case '>': 3315 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
2861 break; 3327 break;
2862 case '?': 3328 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3331 break;
… …
2970 3436
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3437 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3438 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3439 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3440 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3441 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3442 break;
2977 3443
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3444 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3445 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2980 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3446 break;
2982 3447
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3448 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3449 process_sgr_mode (nargs, arg);
2985 break; 3450 break;
… …
2992 break; 3457 break;
2993 case 6: /* CPR requested */ 3458 case 6: /* CPR requested */
2994 scr_report_position (); 3459 scr_report_position ();
2995 break; 3460 break;
2996 case 7: /* unofficial extension */ 3461 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3462 if (OPTION (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3463 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3464 break;
3000 case 8: /* unofficial extension */ 3465 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3467 break;
3003 } 3468 }
… …
3039 break; 3504 break;
3040 3505
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3506 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3507 if (arg[0] == 4)
3043 scr_insert_mode (0); 3508 scr_insert_mode (0);
3509 else if (arg[0] == 20)
3510 priv_modes &= ~PrivMode_LFNL;
3044 break; 3511 break;
3045 3512
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3513 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3514 if (arg[0] == 4)
3048 scr_insert_mode (1); 3515 scr_insert_mode (1);
3516 else if (arg[0] == 20)
3517 priv_modes |= PrivMode_LFNL;
3049 break; 3518 break;
3050 3519
3051 /* 3520 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3521 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3522 */
… …
3065 break; 3534 break;
3066 case CSI_75: 3535 case CSI_75:
3067 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3068 break; 3537 break;
3069 3538
3070#ifndef NO_FRILLS 3539#if !ENABLE_MINIMAL
3071 case CSI_74: 3540 case CSI_74:
3072 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3073 break; 3542 break;
3074#endif 3543#endif
3075 3544
… …
3082 break; 3551 break;
3083 } 3552 }
3084} 3553}
3085/*}}} */ 3554/*}}} */
3086 3555
3087#ifndef NO_FRILLS 3556#if !ENABLE_MINIMAL
3088/* ARGSUSED */ 3557/* ARGSUSED */
3089void 3558void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3560{
3092 int x, y; 3561 int x, y;
3093 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3094 Window wdummy; 3563 Window wdummy;
3564
3565 dLocal (Display *, dpy);
3095 3566
3096 if (nargs == 0) 3567 if (nargs == 0)
3097 return; 3568 return;
3098 3569
3099 switch (args[0]) 3570 switch (args[0])
3100 { 3571 {
3101 /* 3572 /*
3102 * commands 3573 * commands
3103 */ 3574 */
3104 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (dpy, parent[0]);
3106 break; 3577 break;
3107 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (dpy, parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3580 break;
3111 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3113 break; 3583 break;
3114 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3586 break;
3117 case 5: /* raise window */ 3587 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3119 break; 3589 break;
3120 case 6: /* lower window */ 3590 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3122 break; 3592 break;
3123 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3124 scr_touch (true); 3594 scr_touch (true);
3125 break; 3595 break;
3126 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3129 break; 3599 break;
3130 3600
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3602 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3136 break; 3606 break;
3137
3138 3607
3139 /* 3608 /*
3140 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3141 */ 3610 */
3142 case 11: /* report window state */ 3611 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3614 break;
3146 case 13: /* report window position */ 3615 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3621 break;
3153 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3625 break;
3157 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3628 break;
3160 case 19: /* report window size (chars) */ 3629 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3631 break;
3163 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3633 {
3166 char *s; 3634 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s);
3169 } 3638 }
3170 break; 3639 break;
3171 case 21: /* report window title */ 3640 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3641 {
3174 char *s; 3642 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s);
3177 } 3646 }
3178 break; 3647 break;
3179 } 3648 }
3180} 3649}
3181#endif 3650#endif
3182 3651
3183/*----------------------------------------------------------------------*/ 3652/*----------------------------------------------------------------------*/
3184/* 3653/*
3185 * get input up until STRING TERMINATOR (or BEL) 3654 * get input up until STRING TERMINATOR (or BEL)
3186 * ends_how is terminator used. returned input must be free()'d 3655 * ends_how is terminator used. returned input must be free()'d
3187 */ 3656 */
3188unsigned char * 3657char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3658rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3659{
3191 unicode_t prev = 0, ch; 3660 unicode_t ch;
3661 bool seen_esc = false;
3192 unsigned int n = 0; 3662 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3663 wchar_t string[STRING_MAX];
3195 3664
3196 while ((ch = cmd_getc ()) != NOCHAR) 3665 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3666 {
3198 if (prev == C0_ESC) 3667 if (seen_esc)
3199 { 3668 {
3200 if (ch == 0x5c) /* 7bit ST */ 3669 if (ch == 0x5c) /* 7bit ST */
3201 break; 3670 break;
3202 else 3671 else
3203 return NULL; 3672 return NULL;
3204 } 3673 }
3674 else if (ch == C0_ESC)
3675 {
3676 seen_esc = true;
3677 continue;
3678 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3207 else if (ch < 0x20) 3683 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3209 3685
3210 if (n >= sizeof (string) - 1) 3686 seen_esc = false;
3687
3688 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3689 // stop at some sane length
3212 return NULL; 3690 return NULL;
3213 3691
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
3220 string[n++] = prev = ch; 3692 string[n++] = ch;
3221 } 3693 }
3222 3694
3223 string[n++] = '\0'; 3695 string[n++] = '\0';
3224 3696
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3698
3230 return s; 3699 return rxvt_wcstombs (string);
3231} 3700}
3232 3701
3233/*----------------------------------------------------------------------*/ 3702/*----------------------------------------------------------------------*/
3234/* 3703/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3236 */ 3705 */
3237void 3706void
3238rxvt_term::process_dcs_seq () 3707rxvt_term::process_dcs_seq ()
3239{ 3708{
3240 unsigned char *s; 3709 char *s;
3241 unicode_t eh; 3710 unicode_t eh;
3242 3711
3243 /* 3712 /*
3244 * Not handled yet 3713 * Not handled yet
3245 */ 3714 */
… …
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3733 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3734 arg = arg * 10 + (ch - '0');
3266 3735
3267 if (ch == ';') 3736 if (ch == ';')
3268 { 3737 {
3269 unsigned char *s = get_to_st (eh); 3738 char *s = get_to_st (eh);
3270 3739
3271 if (s) 3740 if (s)
3272 { 3741 {
3273 process_xterm_seq (arg, (char *)s, eh); 3742 process_xterm_seq (arg, s, eh);
3274 free (s); 3743 free (s);
3275 } 3744 }
3276 } 3745 }
3277} 3746}
3278 3747
3279void 3748void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3281{ 3750{
3282 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3283 { 3752 {
3284 if (Options & Opt_insecure) 3753 rgba c;
3285 { 3754 pix_colors_focused[color].get (c);
3286 unsigned short r, g, b; 3755
3287 PixColorsFocused[color].get (display, r, g, b); 3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3289 }
3290 } 3762 }
3291 else 3763 else
3292 set_window_color (color, str); 3764 set_window_color (color, str);
3293} 3765}
3294 3766
3295/* 3767/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3769 */
3320void 3770void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3322{ 3772{
3323 int changed = 0;
3324 int color; 3773 int color;
3325 char *buf, *name; 3774 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3776 int saveop = op;
3777
3778 dLocal (Display *, dpy);
3327 3779
3328 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3329 switch (op) 3785 switch (op)
3330 { 3786 {
3331 case XTerm_name: 3787 case XTerm_name:
3332 set_title (str); 3788 set_title (str);
3333 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3338 set_title (str); 3794 set_title (str);
3339 break; 3795 break;
3340 case XTerm_property: 3796 case XTerm_property:
3341 if (str[0] == '?') 3797 if (str[0] == '?')
3342 { 3798 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3799 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3800 Atom actual_type;
3345 int actual_format; 3801 int actual_format;
3346 unsigned long nitems; 3802 unsigned long nitems;
3347 unsigned long bytes_after; 3803 unsigned long bytes_after;
3348 unsigned char *value = 0; 3804 unsigned char *value = 0;
3349 const char *str = ""; 3805 const char *str = "";
3350 3806
3351 if (prop 3807 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3812 && actual_type != None
3357 && actual_format == 8) 3813 && actual_format == 8)
3358 str = (const char *)(value); 3814 str = (const char *)(value);
3359 3815
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3361 3817
3362 XFree (value); 3818 XFree (value);
3363 } 3819 }
3364 else 3820 else
3365 { 3821 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3823
3368 if (eq) 3824 if (eq)
3369 { 3825 {
3370 *eq = 0; 3826 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3827 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3828 }
3376 else 3829 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3830 XDeleteProperty (dpy, parent[0],
3378 display->atom (str)); 3831 display->atom (str));
3379 } 3832 }
3380 break; 3833 break;
3381 3834
3382 case XTerm_Color: 3835 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3836 for (buf = (char *)str; buf && *buf;)
3384 { 3837 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3838 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3839 break;
3387 3840
3388 *name++ = '\0'; 3841 *name++ = '\0';
3389 color = atoi (buf); 3842 color = atoi (buf) + minCOLOR;
3390 3843
3391 if (color < 0 || color >= TOTAL_COLORS) 3844 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3392 break; 3845 break;
3393 3846
3394 if ((buf = STRCHR (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3848 *buf++ = '\0';
3396 3849
3397 if (name[0] == '?' && !name[1]) 3850 process_color_seq (op, color, name, resp);
3398 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 }
3406 else
3407 set_window_color (color + minCOLOR, name);
3408 } 3851 }
3409 break; 3852 break;
3410 case XTerm_Color00: 3853 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3412 break; 3855 break;
3413 case XTerm_Color01: 3856 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3415 break; 3858 break;
3416#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3417 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3419 break; 3862 break;
3420#endif 3863#endif
3421 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3423 break; 3866 break;
3424 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3426 break; 3869 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break;
3431 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break;
3434 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3436 break; 3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3881 break;
3882 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp);
3884 break;
3437#endif 3885#endif
3886#if TRANSPARENT && TINTING
3887 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp);
3438 3889
3890 check_our_parents ();
3891
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894
3895 break;
3896#endif
3897
3439 case XTerm_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3440 if (*str != ';') 3900 if (*str != ';')
3441 { 3901 {
3442#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3443 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3445#endif
3446 scr_touch (true); 3905 scr_touch (true);
3906#endif
3447 } 3907 }
3908
3909 int changed = 0;
3910
3448 while ((str = STRCHR (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3449 { 3912 {
3450 str++; 3913 str++;
3451#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3453#endif 3916#endif
3454
3455 } 3917 }
3918
3456 if (changed) 3919 if (changed)
3457 { 3920 {
3458#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3922 resize_pixmap ();
3460#endif
3461 scr_touch (true); 3923 scr_touch (true);
3924#endif
3462 } 3925 }
3926 }
3463 break; 3927 break;
3464 3928
3465 case XTerm_restoreFG: 3929 case Rxvt_restoreFG:
3466 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3467 break; 3931 break;
3468 case XTerm_restoreBG: 3932 case Rxvt_restoreBG:
3469 set_window_color (Color_bg, str); 3933 set_window_color (Color_bg, str);
3470 break; 3934 break;
3471 3935
3472 case XTerm_logfile: 3936 case XTerm_logfile:
3473 // TODO, when secure mode? 3937 // TODO, when secure mode?
3474 break; 3938 break;
3475 3939
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR
3517 case XTerm_Menu:
3518 if (Options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break;
3521#endif
3522#if 0 3940#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3524 { 3942 {
3525 int fd; 3943 int fd;
3526 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3527 { 3945 {
3528 scr_dump (fd); 3946 scr_dump (fd);
3529 close (fd); 3947 close (fd);
3530 } 3948 }
3531 } 3949 }
3950 break;
3951#endif
3952 case XTerm_font:
3953 op = URxvt_font;
3954 case URxvt_font:
3955#if ENABLE_STYLES
3956 case URxvt_boldFont:
3957 case URxvt_italicFont:
3958 case URxvt_boldItalicFont:
3959#endif
3960 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp);
3965 else
3966 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)];
3968
3969 res = strdup (str);
3970 allocated.push_back ((void *)res);
3971 set_fonts ();
3972 }
3973 break;
3974
3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3984 case URxvt_locale:
3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3987 else
3988 {
3989 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale ();
3992 }
3993 break;
3994
3995 case URxvt_view_up:
3996 case URxvt_view_down:
3997 {
3998 int lines = atoi (str);
3999
4000 if (lines)
4001 scr_page (op == URxvt_view_up ? UP : DN, lines);
4002 else
4003 scr_erase_savelines ();
4004 }
4005
4006 break;
4007#endif
4008
4009#if ENABLE_PERL
4010 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4012 ; // no responses yet
3532 break; 4013 break;
3533#endif 4014#endif
3534 } 4015 }
3535} 4016}
3536/*----------------------------------------------------------------------*/ 4017/*----------------------------------------------------------------------*/
… …
3550{ 4031{
3551 int state; 4032 int state;
3552 4033
3553 if (mode == 's') 4034 if (mode == 's')
3554 { 4035 {
3555 SavedModes |= (PrivateModes & bit); 4036 SavedModes |= (priv_modes & bit);
3556 return -1; 4037 return -1;
3557 } 4038 }
3558 else 4039 else
3559 { 4040 {
3560 if (mode == 'r') 4041 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 4043 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4044 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 4045 PrivMode (state, bit);
3565 } 4046 }
3566 4047
3567 return state; 4048 return state;
3568} 4049}
3569 4050
3570/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
3571void 4052void
3572rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3573{ 4054{
3574 unsigned int i, j; 4055 unsigned int i, j;
3575 int state; 4056 int state;
3576 4057
3577 static const struct 4058 static const struct
… …
3586 { 3, PrivMode_132 }, 4067 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 4068 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
4072 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 4074 // 18, 19 printing-related
3593 { menuBar_esc, PrivMode_menuBar }, 4075 { 25, PrivMode_VisibleCursor },
3594#endif
3595#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 4078#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 4079 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 4080 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 4081 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 4082 // 45 margin bell NYI
3605 // 46 start logging 4083 // 46 start logging
… …
3645 } 4123 }
3646 4124
3647 /* extra handling for values with state unkept */ 4125 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4126 switch (arg[i])
3649 { 4127 {
4128#if ENABLE_STYLES
4129 case 1021:
4130 set_option (Opt_intensityStyles, mode);
4131
4132 scr_touch (true);
4133 break;
4134#endif
3650 case 1048: /* alternative cursor save */ 4135 case 1048: /* alternative cursor save */
4136 case 1049:
3651 if (Options & Opt_secondaryScreen) 4137 if (OPTION (Opt_secondaryScreen))
3652 if (mode == 0) 4138 if (mode == 0)
3653 scr_cursor (RESTORE); 4139 scr_cursor (RESTORE);
3654 else if (mode == 1) 4140 else if (mode == 1)
3655 scr_cursor (SAVE); 4141 scr_cursor (SAVE);
3656 break; 4142 break;
… …
3667 * within VT52 mode 4153 * within VT52 mode
3668 */ 4154 */
3669 PrivMode (1, PrivMode_vt52); 4155 PrivMode (1, PrivMode_vt52);
3670 break; 4156 break;
3671 case 3: /* 80/132 */ 4157 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4158 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4159 set_widthheight (((state ? 132 : 80) * fwidth), height);
3674 break; 4160 break;
3675 case 4: /* smooth scrolling */ 4161 case 4: /* smooth scrolling */
3676 if (state) 4162 set_option (Opt_jumpScroll, !state);
3677 Options &= ~Opt_jumpScroll;
3678 else
3679 Options |= Opt_jumpScroll;
3680 break; 4163 break;
3681 case 5: /* reverse video */ 4164 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4165 scr_rvideo_mode (state);
3683 break; 4166 break;
3684 case 6: /* relative/absolute origins */ 4167 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4171 scr_autowrap (state);
3689 break; 4172 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4177 break;
3695#ifdef menuBar_esc
3696 case menuBar_esc:
3697#ifdef MENUBAR
3698 map_menuBar (state);
3699#endif
3700 break;
3701#endif
3702#ifdef scrollBar_esc 4178#ifdef scrollBar_esc
3703 case scrollBar_esc: 4179 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
3705 { 4181 {
3706 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
… …
3718 break; 4194 break;
3719 /* case 66: - application key pad */ 4195 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4196 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4197 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4198 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4199 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4200 break;
3725#if 0 4201#if 0
3726 case 1001: 4202 case 1001:
3727 break; /* X11 mouse highlighting */ 4203 break; /* X11 mouse highlighting */
3728#endif 4204#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4205 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state)
3731 Options &= ~Opt_scrollTtyOutput;
3732 else
3733 Options |= Opt_scrollTtyOutput; 4206 set_option (Opt_scrollTtyOutput, !state);
3734 break; 4207 break;
3735 case 1011: /* scroll to bottom on key press */ 4208 case 1011: /* scroll to bottom on key press */
3736 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4209 set_option (Opt_scrollTtyKeypress, state);
3738 else
3739 Options &= ~Opt_scrollTtyKeypress;
3740 break; 4210 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4211 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4212 if (OPTION (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4214 scr_erase_screen (2);
3745 scr_change_screen (state); 4215 scr_change_screen (state);
3746 break; 4216 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4217 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4218 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4219 if (OPTION (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 4220 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4221 scr_erase_screen (2);
3752 break; 4222 break;
3753 default: 4223 default:
3754 break; 4224 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4250 rendset = 0, rendstyle = ~RS_None;
3781 break; 4251 break;
3782 case 1: 4252 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4253 rendset = 1, rendstyle = RS_Bold;
3784 break; 4254 break;
3785 //case 2: // faint or second colour 4255 //case 2: // low intensity
4256 case 3:
4257 rendset = 1, rendstyle = RS_Italic;
4258 break;
3786 case 4: 4259 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4260 rendset = 1, rendstyle = RS_Uline;
3788 break; 4261 break;
3789 case 5: // slowly blinking 4262 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4263 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4275 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4276 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4277 //...
3805 //case 19: // ninth alt font 4278 //case 19: // ninth alt font
3806 //case 20: // gothic 4279 //case 20: // gothic
3807 case 21: // disable bold, faint 4280 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4281 rendset = 0, rendstyle = RS_Bold;
3809 break; 4282 break;
3810 case 22: 4283 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4284 rendset = 0, rendstyle = RS_Bold;
3812 break; 4285 break;
3813 //case 23: disable italic 4286 case 23: // disable italic
4287 rendset = 0, rendstyle = RS_Italic;
4288 break;
3814 case 24: 4289 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4290 rendset = 0, rendstyle = RS_Uline;
3816 break; 4291 break;
3817 case 25: 4292 case 25:
4293 rendset = 0, rendstyle = RS_Blink;
4294 break;
4295 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4296 rendset = 0, rendstyle = RS_Blink;
3819 break; 4297 break;
3820 case 27: 4298 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4299 rendset = 0, rendstyle = RS_RVid;
3822 break; 4300 break;
… …
3840 case 35: 4318 case 35:
3841 case 36: 4319 case 36:
3842 case 37: 4320 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4321 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4322 break;
3845#ifdef TTY_256COLOR 4323 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4324 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4325 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4326 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4327 i += 2;
3851 } 4328 }
3852 break; 4329 break;
3853#endif
3854 case 39: /* default fg */ 4330 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4331 scr_color (Color_fg, Color_fg);
3856 break; 4332 break;
3857 4333
3858 case 40: 4334 case 40:
… …
3863 case 45: 4339 case 45:
3864 case 46: 4340 case 46:
3865 case 47: 4341 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4343 break;
3868#ifdef TTY_256COLOR 4344 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4345 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4346 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4347 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4348 i += 2;
3874 } 4349 }
3875 break; 4350 break;
3876#endif
3877 case 49: /* default bg */ 4351 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
3879 break; 4353 break;
3880 4354
3881#ifndef NO_BRIGHTCOLOR 4355 //case 50: // not variable spacing
4356
4357#if !ENABLE_MINIMAL
3882 case 90: 4358 case 90:
3883 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
3884 case 92: 4360 case 92:
3885 case 93: 4361 case 93:
3886 case 94: 4362 case 94:
3887 case 95: 4363 case 95:
3888 case 96: 4364 case 96:
3889 case 97: 4365 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4367 break;
3893 case 100: 4368 case 100:
3894 case 101: /* set bright bg color */ 4369 case 101: /* set bright bg color */
3895 case 102: 4370 case 102:
3896 case 103: 4371 case 103:
3897 case 104: 4372 case 104:
3898 case 105: 4373 case 105:
3899 case 106: 4374 case 106:
3900 case 107: 4375 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4376 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4377 break;
3904#endif 4378#endif
3905
3906 } 4379 }
3907 } 4380 }
3908} 4381}
3909/*}}} */ 4382/*}}} */
3910 4383
… …
3914{ 4387{
3915 unicode_t ch, cmd = cmd_getc (); 4388 unicode_t ch, cmd = cmd_getc ();
3916 4389
3917 if (cmd == 'Q') 4390 if (cmd == 'Q')
3918 { /* query graphics */ 4391 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4392 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4393 return;
3921 } 4394 }
3922 /* swallow other graphics sequences until terminating ':' */ 4395 /* swallow other graphics sequences until terminating ':' */
3923 do 4396 do
3924 ch = cmd_getc (); 4397 ch = cmd_getc ();
… …
3934 */ 4407 */
3935void 4408void
3936rxvt_term::tt_printf (const char *fmt,...) 4409rxvt_term::tt_printf (const char *fmt,...)
3937{ 4410{
3938 va_list arg_ptr; 4411 va_list arg_ptr;
3939 unsigned char buf[256]; 4412 char buf[256];
3940 4413
3941 va_start (arg_ptr, fmt); 4414 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4415 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4416 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4417 tt_write (buf, strlen (buf));
3945} 4418}
3946 4419
3947/* ---------------------------------------------------------------------- */ 4420/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4421/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4422 * or generated by us in response to a query ESC sequence.
3950 */ 4423 */
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4425
3951void 4426void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
3953{ 4428{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return;
3955 4431
3956 if (len) 4432 if (pty->pty < 0)
4433 return;
4434
4435 if (v_buflen == 0)
4436 {
4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4438
4439 if ((unsigned int)written == len)
4440 return;
4441
4442 data += written;
4443 len -= written;
3957 { 4444 }
4445
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4447
4448 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len;
4450
4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4452}
4453
4454void rxvt_term::pty_write ()
4455{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4457
4458 if (written > 0)
4459 {
4460 v_buflen -= written;
4461
3958 if (v_buflen == 0) 4462 if (v_buflen == 0)
3959 { 4463 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4464 free (v_buffer);
3987 v_buffer = 0; 4465 v_buffer = 0;
3988 v_buflen = 0; 4466 v_buflen = 0;
3989 4467
3990 pty_ev.set (EVENT_READ); 4468 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4469 return;
4003 } 4470 }
4471
4472 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4473 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ);
4005} 4476}
4006 4477
4007/*----------------------- end-of-file (C source) -----------------------*/ 4478/*----------------------- end-of-file (C source) -----------------------*/
4008 4479

Diff Legend

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