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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC

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

Diff Legend

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