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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.443 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

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

Diff Legend

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