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.177 by root, Mon Dec 13 07:18:52 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 <wchar.h> 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h"
57#endif
58
54#include <signal.h> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
55 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 newlen = 0;
791 break;
792 }
793 if (newlen) 784 if (newlen)
794 len = strlen (kbuf); 785 len = strlen (kbuf);
795 }
796 786
797 /* 787 /*
798 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
799 */ 789 */
800#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
806 else if (ctrl && keysym == XK_minus) 796 else if (ctrl && keysym == XK_minus)
807 { 797 {
808 len = 1; 798 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 799 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 800 }
801 else if (keysym == XK_ISO_Left_Tab)
802 {
803 strcpy (kbuf, "\033[Z");
804 len = 3;
805 }
811 else 806 else
812 { 807 {
813#ifdef META8_OPTION 808#ifdef META8_OPTION
814 /* set 8-bit on */ 809 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 810 if (meta && (meta_char == 0x80))
816 { 811 {
817 unsigned char *ch; 812 char *ch;
818 813
819 for (ch = kbuf; ch < kbuf + len; ch++) 814 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 815 *ch |= 0x80;
821 816
822 meta = 0; 817 meta = 0;
… …
824#endif 819#endif
825 /* nil */ ; 820 /* nil */ ;
826 } 821 }
827 } 822 }
828 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
829 if (len <= 0) 827 if (len <= 0)
830 return; /* not mapped */ 828 return; /* not mapped */
831 829
832 if (options & Opt_scrollTtyKeypress) 830 if (option (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 831 if (view_start)
834 { 832 {
835 TermWin.view_start = 0; 833 view_start = 0;
836 want_refresh = 1; 834 want_refresh = 1;
837 } 835 }
838 836
839 /* 837 /*
840 * these modifications only affect the static keybuffer 838 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 853#ifdef META8_OPTION
856 && meta_char == C0_ESC 854 && meta_char == C0_ESC
857#endif 855#endif
858 ) 856 )
859 { 857 {
860 const unsigned char ch = C0_ESC; 858 const char ch = C0_ESC;
861 tt_write (&ch, 1); 859 tt_write (&ch, 1);
862 } 860 }
863 861
864#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */
866 unsigned char *p;
867 int i;
868
869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
870 for (i = 0, p = kbuf; i < len; i++, p++)
871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
872 fprintf (stderr, "'\n");
873#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 862 tt_write (kbuf, (unsigned int)len);
875} 863}
876/*}}} */
877 864
878#if (MENUBAR_MAX) 865void
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 866rxvt_term::key_release (XKeyEvent &ev)
880/* 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)
881unsigned int 943unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 944rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 945{
884 unsigned int n, s; 946 unsigned int n, s;
885 947
886 n = cmdbuf_ptr - cmdbuf_base; 948 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 968
907 cmd_parse (); 969 cmd_parse ();
908 970
909 return 0; 971 return 0;
910} 972}
911#endif /* MENUBAR_MAX */ 973#endif
912 974
913void 975void
914rxvt_term::flush () 976rxvt_term::flush ()
915{ 977{
916 flush_ev.stop (); 978 flush_ev.stop ();
917 979
918#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
919 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
920 { 982 {
921 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
922 scr_clear ();
923 scr_touch (false); 984 scr_touch (false);
924 } 985 }
925#endif 986#endif
926 987
927 if (want_refresh) 988 if (want_refresh)
928 { 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
929 scr_refresh (refresh_type); 1028 scr_refresh ();
930 scrollbar_show (1); 1029 scrollBar.show (1);
931#ifdef USE_XIM 1030#ifdef USE_XIM
932 IMSendSpot (); 1031 IMSendSpot ();
933#endif 1032#endif
934 } 1033 }
935 1034
936 display->flush (); 1035 display->flush ();
937} 1036}
938 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
939void 1039void
940rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
941{ 1041{
942 SET_R (this); 1042 if (want_refresh && !flush_ev.is_active ())
943 SET_LOCALE (locale); 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
944 1044
945 display->flush (); 1045 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949} 1046}
950 1047
951void 1048void
952rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
953{ 1050{
954 SET_R (this); 1051 make_current ();
955 SET_LOCALE (locale);
956 1052
957 refresh_limit = 1;
958 refresh_count = 0; 1053 refresh_count = 0;
959 flush (); 1054 flush ();
960} 1055}
961 1056
962#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
963void 1058void
964rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
965{ 1060{
966 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1062 want_refresh = 1;
968 1063 refresh_check ();
969 w.start (w.at + BLINK_INTERVAL);
970} 1064}
971#endif 1065#endif
972 1066
973#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
974void 1068void
975rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
976{ 1070{
977 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
978 { 1072 {
979 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
980 want_refresh = 1; 1074 want_refresh = 1;
981 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
982 } 1076 }
1077 else
1078 w.stop ();
983} 1079}
984#endif 1080#endif
985 1081
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void 1083void
988rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
989{ 1085{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
992 { 1088 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1089 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
996 } 1091 }
1092 else
1093 w.stop ();
997} 1094}
998#endif 1095#endif
999 1096
1000#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1001void 1098void
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1003{ 1100{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1102 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1104 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1010 } 1106 }
1107 else
1108 w.stop ();
1011} 1109}
1012#endif 1110#endif
1013 1111
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void 1113void
1016rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1017{ 1115{
1018 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1117 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1118 want_refresh = 1;
1024 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)
1025 } 1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1026} 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;
1027#endif 1156#endif
1028 1157
1029bool 1158bool
1030rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
1031{ 1160{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1162
1034 if (CBUFSIZ == n) 1163 if (CBUFSIZ == n)
1035 { 1164 {
1036 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");
1037 n = 0; 1166 n = 0;
1038 } 1167 }
1039 1168
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1043 1172
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1174
1046 if (n > 0) 1175 if (r > 0)
1047 { 1176 {
1048 cmdbuf_endp += n; 1177 cmdbuf_endp += r;
1049 return true; 1178 return true;
1050 } 1179 }
1051 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))
1052 destroy (); 1192 destroy ();
1053 1193 }
1194
1054 return false; 1195 return false;
1055} 1196}
1056 1197
1057void 1198void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1059{ 1200{
1060 SET_R (this); 1201 make_current ();
1061 SET_LOCALE (locale);
1062 1202
1063 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1064 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1066 if (cmd_parse ()) 1206 cmd_parse ();
1067 break;
1068 1207
1069 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1070 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1071} 1212}
1072 1213
1073void 1214void
1074rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1075{ 1216{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1217 XDefineCursor (dpy, vt, TermWin_cursor);
1077 recolour_cursor (); 1218 recolour_cursor ();
1078 1219
1079#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1221 hidden_pointer = 0;
1081 1222
1082 if (options & Opt_pointerBlank) 1223 if (option (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1084#endif 1225#endif
1085} 1226}
1086 1227
1087#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1088void 1229void
1089rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1090{ 1231{
1091 if (! (options & Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1092 return; 1233 return;
1093 1234
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1095 XFlush (display->display); 1236 XFlush (dpy);
1096 1237
1097 hidden_pointer = 1; 1238 hidden_pointer = 1;
1098} 1239}
1099 1240
1100void 1241void
1101rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1102{ 1243{
1103 SET_R (this); 1244 make_current ();
1104 SET_LOCALE (locale);
1105 1245
1106 pointer_blank (); 1246 pointer_blank ();
1107} 1247}
1108#endif 1248#endif
1109 1249
1110void 1250void
1111rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1112{ 1252{
1113 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1114 int x, y; 1254 int x, y;
1255 int code = 32;
1115 1256
1116 x = ev.x; 1257 x = Pixel2Col (ev.x);
1117 y = ev.y; 1258 y = Pixel2Row (ev.y);
1118 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 }
1119 1267
1120 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1121 button_number = 3; 1269 button_number = 3;
1122 else 1270 else
1123 { 1271 {
… …
1169 x + 1, 1317 x + 1,
1170 y + 1); 1318 y + 1);
1171#endif 1319#endif
1172 1320
1173 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1174 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1175 (32 + x + 1), 1323 (32 + x + 1),
1176 (32 + y + 1)); 1324 (32 + y + 1));
1177} 1325}
1178 1326
1179#ifdef USING_W11LIB
1180void
1181rxvt_W11_process_x_event (XEvent *ev)
1182{
1183 rxvt_t *r = rxvt_get_r ();
1184
1185 x_cb (*ev);
1186}
1187#endif
1188
1189/*{{{ process an X event */ 1327/*{{{ process an X event */
1190void 1328void
1191rxvt_term::x_cb (XEvent &ev) 1329rxvt_term::x_cb (XEvent &ev)
1192{ 1330{
1193 SET_R (this); 1331 make_current ();
1194 SET_LOCALE (locale);
1195 1332
1196#if defined(CURSOR_BLINK) 1333 dLocal (Display *, dpy);
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1198 {
1199 if (hidden_cursor)
1200 {
1201 hidden_cursor = 0;
1202 want_refresh = 1;
1203 }
1204 1334
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1335 if (ev.xany.window == vt
1206 } 1336 && SHOULD_INVOKE (HOOK_X_EVENT)
1207#endif 1337 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1338 return;
1208 1339
1209#if defined(POINTER_BLANK) 1340 // for XQueryPointer
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1211 {
1212 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease)
1215 if (hidden_pointer)
1216 pointer_unblank ();
1217
1218 if (ev.type == KeyPress && hidden_pointer == 0)
1219 pointer_blank ();
1220 }
1221#endif
1222
1223 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1343 unsigned int unused_mask;
1226 1344
1227 switch (ev.type) 1345 switch (ev.type)
1228 { 1346 {
1229 case KeyPress: 1347 case KeyPress:
1230#if ISO_14755 1348 key_press (ev.xkey);
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1233 lookup_key (ev.xkey);
1234
1235 break; 1349 break;
1236 1350
1237 case KeyRelease: 1351 case KeyRelease:
1238 { 1352 key_release (ev.xkey);
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
1298
1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1300 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1303 mouse_slip_wheel_speed = 0;
1304#endif
1305 break; 1353 break;
1306 }
1307 1354
1308 case ButtonPress: 1355 case ButtonPress:
1309 button_press (ev.xbutton); 1356 button_press (ev.xbutton);
1310 break; 1357 break;
1311 1358
… …
1313 button_release (ev.xbutton); 1360 button_release (ev.xbutton);
1314 break; 1361 break;
1315 1362
1316 case ClientMessage: 1363 case ClientMessage:
1317 if (ev.xclient.format == 32 1364 if (ev.xclient.format == 32
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1365 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1319 destroy ();
1320#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink))
1326 { 1366 {
1327 /* Get Dnd data */ 1367 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1368 {
1329 int ActualFormat; 1369 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1330 unsigned char *data; 1370 {
1331 unsigned long Size, RemainingBytes; 1371 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1332 1372 {
1333 XGetWindowProperty (display->display, display->root, 1373 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1334 xa[XA_DNDSELECTION], 1374 destroy ();
1335 0L, 1000000L, 1375 }
1336 False, AnyPropertyType, 1376#if ENABLE_EWMH
1337 &ActualType, &ActualFormat, 1377 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1338 &Size, &RemainingBytes, 1378 XSendEvent (dpy, ev.xclient.window = display->root,
1379 False, SubstructureRedirectMask | SubstructureNotifyMask,
1339 &data); 1380 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1381#endif
1341 XFree (data); 1382 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1383 }
1343 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
1344 } 1393 }
1345#endif /* OFFIX_DND */
1346 break;
1347
1348 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1394 break;
1351 1395
1352 /* 1396 /*
1353 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1354 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1373 break; 1417 break;
1374 } 1418 }
1375 break; 1419 break;
1376 1420
1377 case FocusIn: 1421 case FocusIn:
1378 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])
1379 { 1440 {
1380 TermWin.focus = 1; 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 { 1442 ;
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400 1443
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1447
1448 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1445 {
1450 seen_resize = 1; 1446 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1448 }
1453 1449 else
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450 {
1455 if (options & Opt_transparent) 1451#ifdef HAVE_BG_PIXMAP
1456 check_our_parents (); 1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1457#endif 1459#endif
1460 }
1461
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 } 1463 }
1459 break; 1464 break;
1460 1465
1461 case PropertyNotify: 1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue) 1469 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465 1471
1466 break; 1472 break;
1467 1473
1468 case SelectionClear: 1474 case SelectionClear:
1469 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1470 break; 1476 break;
1471 1477
1472 case SelectionNotify: 1478 case SelectionNotify:
1473 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1476 1482
1477 case SelectionRequest: 1483 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1479 break; 1485 break;
1480 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
1481 case UnmapNotify: 1511 case UnmapNotify:
1482 TermWin.mapped = 0; 1512 mapped = 0;
1483#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1485#endif 1515#endif
1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1486 break; 1517 break;
1487
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break;
1494
1495#ifdef TRANSPARENT
1496 case ReparentNotify:
1497 rootwin_cb (ev);
1498 break;
1499#endif /* TRANSPARENT */
1500 1518
1501 case GraphicsExpose: 1519 case GraphicsExpose:
1502 case Expose: 1520 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1521 if (ev.xany.window == vt)
1504 { 1522 {
1505 do 1523 do
1524 {
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1529
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1531
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1515 1537
1516 scr_refresh (refresh_type); 1538 want_refresh = 1;
1517 } 1539 }
1518 else 1540 else
1519 { 1541 {
1520 XEvent unused_event; 1542 XEvent unused_event;
1521 1543
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1523 ; 1545 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1547 ;
1526 1548
1527 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1528 { 1550 {
1529 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1530 scrollbar_show (0); 1552 scrollBar.show (0);
1531 } 1553 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1541 } 1554 }
1542 break; 1555 break;
1543 1556
1544 case MotionNotify: 1557 case MotionNotify:
1545#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1559 if (hidden_pointer)
1547 pointer_unblank (); 1560 pointer_unblank ();
1548#endif 1561#endif
1549#if MENUBAR 1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1550 if (isMenuBarWindow (ev.xany.window)) 1563 || priv_modes & PrivMode_MouseAnyEvent)
1551 {
1552 menubar_control (ev.xbutton); 1564 mouse_report (ev.xbutton);
1553 break;
1554 }
1555#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1566 break;
1558 1567
1559 if (ev.xany.window == TermWin.vt) 1568 if (ev.xany.window == vt)
1560 { 1569 {
1570 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1571 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1572 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1573 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1574 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1575 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1564 ; 1576 ;
1565 1577
1566 XQueryPointer (display->display, TermWin.vt, 1578 XQueryPointer (dpy, vt,
1567 &unused_root, &unused_child, 1579 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1580 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1581 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1582 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1583#ifdef MOUSE_THRESHOLD
… …
1583#endif 1595#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1596 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1597 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1598
1587#ifdef SELECTION_SCROLLING 1599#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1600 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1601 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1602 {
1591 int dist; 1603 int dist;
1592 1604
1593 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1595 */ 1607 */
1596 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1598 1610
1599 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1600 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1601 */ 1613 */
1602 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1615 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1616 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1617
1606 /* calc number of lines to scroll */ 1618 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1619 if (ev.xbutton.y < int_bwidth)
1608 { 1620 {
1609 scroll_selection_dir = UP; 1621 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1622 dist = int_bwidth - ev.xbutton.y;
1611 } 1623 }
1612 else 1624 else
1613 { 1625 {
1614 scroll_selection_dir = DN; 1626 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1627 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1628 }
1617 1629
1618 scroll_selection_lines = Pixel2Height (dist) 1630 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1631 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1632 + 1;
1621 MIN_IT (scroll_selection_lines, 1633 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1634 SELECTION_SCROLL_MAX_LINES);
1623 } 1635 }
1624 else 1636 else
1625 { 1637 {
1626 /* we are within the text window, so we 1638 /* we are within the text window, so we
1627 * shouldn't be scrolling 1639 * shouldn't be scrolling
1628 */ 1640 */
1629 if (sel_scroll_ev.active)
1630 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1631 } 1642 }
1632#endif 1643#endif
1633#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1634 } 1645 }
1635#endif 1646#endif
1636 } 1647 }
1637 } 1648 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1650 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1642 ; 1653 ;
1643 1654
1644 XQueryPointer (display->display, scrollBar.win, 1655 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1659 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1661 scrollBar.size ());
1651 scr_refresh (refresh_type);
1652 refresh_limit = 0; 1662 want_refresh = 1;
1653 scrollbar_show (1); 1663 scrollBar.show (1);
1654 } 1664 }
1655 break; 1665 break;
1656 } 1666 }
1657}
1658 1667
1659#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
1660void 1806void
1661rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1808{
1663 SET_R (this); 1809 make_current ();
1664 SET_LOCALE (locale);
1665 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
1666 switch (ev.type) 1816 switch (ev.type)
1667 { 1817 {
1668 case PropertyNotify: 1818 case PropertyNotify:
1669 /* 1819 /*
1670 * 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,
1671 * 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.
1672 */ 1822 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1677 return; 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1678 1829
1679 /* FALLTHROUGH */
1680 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1682 want_refresh = want_full_refresh = 1;
1683 break; 1830 break;
1684 } 1831 }
1832# endif
1833
1834 refresh_check ();
1685} 1835}
1686#endif 1836#endif
1687 1837
1688void 1838void
1689rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
1690{ 1840{
1691 int reportmode = 0, clickintime; 1841 int reportmode = 0, clickintime;
1692 1842
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1843 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1844
1694 if (!bypass_keystate) 1845 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1846 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1847
1697 /* 1848 /*
1698 * VT window processing of button press 1849 * VT window processing of button press
1699 */ 1850 */
1700 if (ev.window == TermWin.vt) 1851 if (ev.window == vt)
1701 { 1852 {
1853 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1854 return;
1855
1702#if ISO_14755 1856#if ISO_14755
1703 // 5.4 1857 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1858 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1859 {
1706 iso14755_54 (ev.x, ev.y); 1860 iso14755_54 (ev.x, ev.y);
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1872#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1873 if (ev.button == MEvent.button && clickintime)
1720 { 1874 {
1721 /* same button, within alloted time */ 1875 /* same button, within alloted time */
1722 MEvent.clicks++; 1876 MEvent.clicks++;
1877
1723 if (MEvent.clicks > 1) 1878 if (MEvent.clicks > 1)
1724 { 1879 {
1725 /* only report double clicks */ 1880 /* only report double clicks */
1726 MEvent.clicks = 2; 1881 MEvent.clicks = 2;
1727 mouse_report (ev); 1882 mouse_report (ev);
… …
1739 mouse_report (ev); 1894 mouse_report (ev);
1740 } 1895 }
1741#else 1896#else
1742 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1743 mouse_report (ev); 1898 mouse_report (ev);
1744#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1745 1900
1746 } 1901 }
1747 else 1902 else
1748 { 1903 {
1749 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
… …
1753 { 1908 {
1754 case Button1: 1909 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1910 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1911 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1912#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1913 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1914#else
1760 selection.rect = false; 1915 selection.rect = false;
1761#endif 1916#endif
1762 1917
1763 /* allow shift+left click to extend selection */ 1918 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1919 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1920 {
1766 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1768 else 1923 else
1769 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
… …
1797 } 1952 }
1798 1953
1799 /* 1954 /*
1800 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1801 */ 1956 */
1802 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1803 { 1958 {
1804 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;
1805 /* 1967 /*
1806 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1807 * move up if mouse is above slider 1969 * move up if mouse is above slider
1808 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1809 * 1971 *
… …
1818 /* 1980 /*
1819 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1820 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1821 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1822 */ 1984 */
1823 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1824 && scrollbarnext_upButton (ev.y))
1825 || (scrollBar.style == R_SB_RXVT
1826 && scrollbarrxvt_upButton (ev.y)))
1827 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1828 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1829 && scrollbarnext_dnButton (ev.y))
1830 || (scrollBar.style == R_SB_RXVT
1831 && scrollbarrxvt_dnButton (ev.y)))
1832 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1833 else 1989 else
1834 switch (ev.button) 1990 switch (ev.button)
1835 { 1991 {
1836 case Button2: 1992 case Button2:
… …
1843 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
1844 break; 2000 break;
1845 } 2001 }
1846 } 2002 }
1847 else 2003 else
1848#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1849
1850 {
1851 char upordown = 0;
1852
1853 if (scrollBar.style == R_SB_NEXT)
1854 { 2005 {
1855 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
1856 upordown = -1; /* up */
1857 else if (scrollbarnext_dnButton (ev.y))
1858 upordown = 1; /* down */
1859 }
1860 else if (scrollBar.style == R_SB_RXVT)
1861 {
1862 if (scrollbarrxvt_upButton (ev.y))
1863 upordown = -1; /* up */
1864 else if (scrollbarrxvt_dnButton (ev.y))
1865 upordown = 1; /* down */
1866 }
1867 if (upordown)
1868 { 2007 {
1869#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
1870 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1871#endif 2011#endif
1872 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
1873 { 2013 {
1874 if (upordown < 0) 2014 if (direction == UP)
1875 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
1876 else 2016 else
1877 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
1878 } 2018 }
1879 } 2019 }
1880 else 2020 else
1881 switch (ev.button) 2021 switch (ev.button)
1882 { 2022 {
1883 case Button2: 2023 case Button2:
1884 switch (scrollbar_align) 2024 switch (scrollBar.align)
1885 { 2025 {
1886 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
1887 csrO = 0; 2027 csrO = 0;
1888 break; 2028 break;
1889 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
1895 } 2035 }
1896 2036
1897 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
1898 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
1899 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1901 2041
1902 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
1903 break; 2043 break;
1904 2044
1905 case Button1: 2045 case Button1:
1906 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1907 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
1908 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
1909 2049
1910 case Button3: 2050 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
1912 { 2052 {
1913 if (scrollbar_above_slider (ev.y)) 2053 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2054# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2055 scr_page (UP, nrow - 1);
1916# else 2056# else
1917 scr_page (UP, TermWin.nrow / 4); 2057 scr_page (UP, nrow / 4);
1918# endif 2058# endif
1919 else if (scrollbar_below_slider (ev.y)) 2059 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2060# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2061 scr_page (DN, nrow - 1);
1922# else 2062# else
1923 scr_page (DN, TermWin.nrow / 4); 2063 scr_page (DN, nrow / 4);
1924# endif 2064# endif
1925 else 2065 else
1926 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
1927 } 2067 }
1928 else 2068 else
1929 { 2069 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2071 (nrow
1932 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2073 / scrollBar.size ()));
1934 } 2074 }
1935 2075
1936 break; 2076 break;
1937 } 2077 }
1938 } 2078 }
2079
1939 return; 2080 return;
1940 } 2081 }
1941#if MENUBAR
1942 /*
1943 * Menubar window processing of button press
1944 */
1945 if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948} 2082}
1949 2083
1950void 2084void
1951rxvt_term::button_release (XButtonEvent &ev) 2085rxvt_term::button_release (XButtonEvent &ev)
1952{ 2086{
… …
1954 2088
1955 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
1956 if (!bypass_keystate) 2090 if (!bypass_keystate)
1957 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
1958 2092
1959 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1960 { 2094 {
1961 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
1962 scrollbar_show (0); 2096 scrollBar.show (0);
1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1964 refresh_type &= ~SMOOTH_REFRESH;
1965#endif
1966 } 2097 }
1967 2098
1968#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
1971#endif 2101#endif
1972 2102
1973 if (ev.window == TermWin.vt) 2103 if (ev.window == vt)
1974 { 2104 {
2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2106 return;
2107
1975#if ISO_14755 2108#if ISO_14755
1976 // 5.4 2109 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2110 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2111 return;
1979#endif 2112#endif
2113
1980 if (reportmode) 2114 if (reportmode)
1981 { 2115 {
1982 /* mouse report from vt window */ 2116 /* mouse report from vt window */
1983 /* don't report release of wheel "buttons" */ 2117 /* don't report release of wheel "buttons" */
1984 if (ev.button >= 4) 2118 if (ev.button >= 4)
… …
1995 mouse_report (ev); 2129 mouse_report (ev);
1996 } 2130 }
1997#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
1998 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
1999 mouse_report (ev); 2133 mouse_report (ev);
2000#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2001 return; 2135 return;
2002 } 2136 }
2003 2137
2004 /* 2138 /*
2005 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2014 { 2148 {
2015 case Button1: 2149 case Button1:
2016 case Button3: 2150 case Button3:
2017 selection_make (ev.time); 2151 selection_make (ev.time);
2018 break; 2152 break;
2153
2019 case Button2: 2154 case Button2:
2020 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);
2021 break; 2157 break;
2158
2022#ifdef MOUSE_WHEEL 2159#ifdef MOUSE_WHEEL
2023 case Button4: 2160 case Button4:
2024 case Button5: 2161 case Button5:
2025 { 2162 {
2026 int i; 2163 int i;
… …
2028 2165
2029 v = ev.button == Button4 ? UP : DN; 2166 v = ev.button == Button4 ? UP : DN;
2030 2167
2031 if (ev.state & ShiftMask) 2168 if (ev.state & ShiftMask)
2032 i = 1; 2169 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2170 else if (option (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2171 i = nrow - 1;
2035 else 2172 else
2036 i = 5; 2173 i = 5;
2037 2174
2038# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2176 if (ev.state & ControlMask)
2040 { 2177 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2042 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;
2043 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;
2044 2181
2045 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047
2048 slip_wheel_ev.start ();
2049 } 2184 }
2050 else 2185 else
2186# endif
2051 { 2187 {
2052# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2188 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2189 scrollBar.show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING
2066 } 2190 }
2067#endif
2068 } 2191 }
2069 break; 2192 break;
2070#endif 2193#endif
2071 } 2194 }
2072 } 2195 }
2073#ifdef MENUBAR
2074 else if (isMenuBarWindow (ev.window))
2075 menubar_control (ev);
2076#endif
2077} 2196}
2078
2079#ifdef TRANSPARENT
2080#if TINTING
2081/* taken from aterm-0.4.2 */
2082
2083typedef uint32_t RUINT32T;
2084
2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2086{
2087 int sh_r, sh_g, sh_b;
2088 RUINT32T mask_r, mask_g, mask_b;
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
2093
2094 Visual* visual = display->visual;
2095
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097
2098 /* for convenience */
2099 mask_r = visual->red_mask;
2100 mask_g = visual->green_mask;
2101 mask_b = visual->blue_mask;
2102
2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2176 } else {
2177 if (shade < 0) shade = 0;
2178 if (shade > 100) shade = 100;
2179
2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2181
2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2185 }
2186
2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2189 {
2190 unsigned int tmp;
2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2243 }
2244 break;
2245 }
2246 case 16:
2247 {
2248 unsigned short *p1, *pf, *p, *pl;
2249 p1 = (unsigned short *) srcImage->data;
2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2251 while (p1 < pf)
2252 {
2253 p = p1;
2254 pl = p1 + srcImage->width;
2255 for (; p < pl; p++)
2256 {
2257 *p = lookup_r[(*p & 0xf800)>>11] |
2258 lookup_g[(*p & 0x07e0)>> 5] |
2259 lookup_b[(*p & 0x001f)];
2260 }
2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2281 }
2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2289
2290 while (p1 < pf)
2291 {
2292 p = p1;
2293 pl = p1 + srcImage->width;
2294 for (; p < pl; p++)
2295 {
2296 *p = lookup_r[(*p & 0xff0000)>>16] |
2297 lookup_g[(*p & 0x00ff00)>> 8] |
2298 lookup_b[(*p & 0x0000ff)] |
2299 (*p & ~0xffffff);
2300 }
2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2302 }
2303 break;
2304 }
2305 }
2306
2307 free (lookup);
2308}
2309#endif
2310
2311/*
2312 * Check our parents are still who we think they are.
2313 * Do transparency updates if required
2314 */
2315int
2316rxvt_term::check_our_parents ()
2317{
2318 int i, pchanged, aformat, have_pixmap, rootdepth;
2319 unsigned long nitems, bytes_after;
2320 Atom atype;
2321 unsigned char *prop = NULL;
2322 Window root, oldp, *list;
2323 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr;
2325
2326 pchanged = 0;
2327
2328 if (!(options & Opt_transparent))
2329 return pchanged; /* Don't try any more */
2330
2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth;
2333
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2335
2336 if (rootdepth != wattr.depth)
2337 {
2338 if (am_transparent)
2339 {
2340 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0;
2343 }
2344
2345 return pchanged; /* Don't try any more */
2346 }
2347
2348 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False);
2350
2351 /*
2352 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that.
2355 */
2356 i = (xa[XA_XROOTPMAPID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success);
2360
2361 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success);
2366
2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
2372 have_pixmap = 0;
2373 else
2374 {
2375 have_pixmap = 1;
2376 rootpixmap = *(Pixmap *)prop;
2377 XFree (prop);
2378 }
2379
2380 if (have_pixmap)
2381 {
2382 /*
2383 * Copy display->root pixmap transparency
2384 */
2385 int sx, sy, nx, ny;
2386 unsigned int nw, nh;
2387 Window cr;
2388 XImage *image;
2389 GC gc;
2390 XGCValues gcvalue;
2391
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2393 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height;
2396 nx = ny = 0;
2397
2398 if (sx < 0)
2399 {
2400 nw += sx;
2401 nx = -sx;
2402 sx = 0;
2403 }
2404
2405 if (sy < 0)
2406 {
2407 nh += sy;
2408 ny = -sy;
2409 sy = 0;
2410 }
2411
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2416 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */
2421 allowedxerror = 0;
2422
2423 if (image == NULL)
2424 {
2425 if (am_transparent && am_pixmap_trans)
2426 {
2427 pchanged = 1;
2428 if (TermWin.pixmap != None)
2429 {
2430 XFreePixmap (display->display, TermWin.pixmap);
2431 TermWin.pixmap = None;
2432 }
2433 }
2434
2435 am_pixmap_trans = 0;
2436 }
2437 else
2438 {
2439 if (TermWin.pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap);
2441
2442#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint))
2444 {
2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2447
2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2449
2450 ShadeXImage (display, image, shade, rm, gm, bm);
2451 }
2452#endif
2453
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2455 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc);
2460 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]);
2463
2464 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1;
2466
2467 am_transparent = am_pixmap_trans = 1;
2468 }
2469 }
2470
2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2474 {
2475 unsigned int n;
2476 /*
2477 * InheritPixmap transparency
2478 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2480 {
2481 oldp = TermWin.parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n);
2484 XFree (list);
2485
2486 if (TermWin.parent[i] == display->root)
2487 {
2488 if (oldp != None)
2489 pchanged = 1;
2490
2491 break;
2492 }
2493
2494 if (oldp != TermWin.parent[i])
2495 pchanged = 1;
2496 }
2497
2498 n = 0;
2499
2500 if (pchanged)
2501 {
2502 for (; n < (unsigned int)i; n++)
2503 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2508 break;
2509 }
2510 }
2511 }
2512
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2514 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */
2519 }
2520 else
2521 {
2522#if WAIT_FOR_WM
2523 /* wait (an arbitrary period) for the WM to do its thing
2524 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1);
2526#endif
2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2532
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2534 am_transparent = 1;
2535 }
2536
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None;
2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2553 }
2554
2555 return pchanged;
2556}
2557#endif
2558 2197
2559/*}}} */ 2198/*}}} */
2560 2199
2561bool 2200void
2562rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2563{ 2202{
2564 bool flag = false;
2565 unicode_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2567 2205
2568 for (;;) 2206 for (;;)
2569 { 2207 {
2570 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2571 { 2209 {
2572 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2211 ch = next_char ();
2574 }
2575 2212
2576 if (ch == NOCHAR) // TODO: improve 2213 if (ch == NOCHAR)
2577 break; 2214 break;
2215 }
2578 2216
2579 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))
2580 { 2218 {
2581 if (!seen_input) 2219 if (expect_false (!seen_input))
2582 { 2220 {
2583 seen_input = 1; 2221 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2225 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2226 // unfortunately other programs are even more buggy and dislike
2589 // 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
2590 // resized. 2228 // resized.
2591 if (seen_resize) 2229 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2230 kill (-cmd_pid, SIGWINCH);
2593 } 2231 }
2594 2232
2595 /* Read a text string from the input buffer */ 2233 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2234 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2235 bool refreshnow = false;
2598 int nlines = 0; 2236 int nlines = 0;
2599 unicode_t *str = buf; 2237 wchar_t *str = buf;
2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2239
2601 for (;;) 2240 for (;;)
2602 { 2241 {
2603 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)))
2604 break; 2243 break;
2605 2244
2606 *str++ = ch; 2245 *str++ = ch;
2607 2246
2608 if (ch == C0_LF) 2247 if (expect_false (ch == C0_LF || str >= eol))
2609 { 2248 {
2249 if (ch == C0_LF)
2610 nlines++; 2250 nlines++;
2251
2611 refresh_count++; 2252 refresh_count++;
2612 2253
2613 if (!(options & Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2615 { 2255 {
2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2616 refreshnow = true; 2260 refreshnow = true;
2617 ch = NOCHAR; 2261 ch = NOCHAR;
2618 break; 2262 break;
2263 }
2619 } 2264 }
2620 2265
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2267 if (nlines >= nrow - 1)
2623 { 2268 {
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2624 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2272
2625 nlines = 0; 2273 nlines = 0;
2626 str = buf; 2274 str = buf;
2275 eol = str + min (ncol, UBUFSIZ);
2627 } 2276 }
2628 }
2629 2277
2630 if (str >= buf + UBUFSIZ) 2278 if (str >= eol)
2631 { 2279 {
2280 if (eol >= buf + UBUFSIZ)
2281 {
2632 ch = NOCHAR; 2282 ch = NOCHAR;
2633 break; 2283 break;
2284 }
2285 else
2286 eol = min (eol + ncol, buf + UBUFSIZ);
2287 }
2288
2634 } 2289 }
2635 2290
2636 seq_begin = cmdbuf_ptr; 2291 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2292 ch = next_char ();
2638 } 2293 }
2639 2294
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2297 scr_add_lines (buf, str - buf, nlines);
2641 2298
2642 /* 2299 /*
2643 * 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
2644 * 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.
2645 * the number of pages between refreshes is refresh_limit, which 2302 * if skipScroll is enabled.
2646 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2303 */
2648 if (refreshnow) 2304 if (refreshnow)
2649 { 2305 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++;
2652 else
2653 {
2654 flag = true;
2655 scr_refresh (refresh_type); 2306 scr_refresh ();
2656 } 2307 want_refresh = 1;
2657 } 2308 }
2658
2659 } 2309 }
2660 else 2310 else
2661 { 2311 {
2662 try 2312 try
2663 { 2313 {
… …
2671 } 2321 }
2672 2322
2673 ch = NOCHAR; 2323 ch = NOCHAR;
2674 } 2324 }
2675 } 2325 }
2676
2677 return flag;
2678}
2679
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687} 2326}
2688 2327
2689// read the next character 2328// read the next character
2690unicode_t 2329wchar_t
2691rxvt_term::next_char () 2330rxvt_term::next_char () NOTHROW
2692{ 2331{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2333 {
2695 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2697 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2698 2337
2699 wchar_t wc; 2338 wchar_t wc;
2700 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);
2701 2340
2702 if (len == (size_t)-2) 2341 if (len == (size_t)-2)
2703 { 2342 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2343 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2345 break;
2707 } 2346 }
2708 2347
2709 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2710 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 }
2711 2353
2712 // assume wchar == unicode 2354 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2714 return wc; 2356 return wc & UNICODE_MASK;
2715 } 2357 }
2716 2358
2717 return NOCHAR; 2359 return NOCHAR;
2718} 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;
2719 2372
2720/* rxvt_cmd_getc () - Return next input character */ 2373/* rxvt_cmd_getc () - Return next input character */
2721/* 2374/*
2722 * Return the next input character after first passing any keyboard input 2375 * Return the next input character after first passing any keyboard input
2723 * to the command. 2376 * to the command.
2724 */ 2377 */
2725unicode_t 2378wchar_t
2726rxvt_term::cmd_getc () 2379rxvt_term::cmd_getc () THROW ((class out_of_input))
2727{ 2380{
2728 unicode_t c = next_char (); 2381 wchar_t c = next_char ();
2729 2382
2730 if (c == NOCHAR) 2383 if (c == NOCHAR)
2731 throw out_of_input; 2384 throw out_of_input;
2732 2385
2733 return c; 2386 return c;
2734} 2387}
2735 2388
2736unicode_t 2389uint32_t
2737rxvt_term::cmd_get8 () 2390rxvt_term::cmd_get8 () THROW ((class out_of_input))
2738{ 2391{
2739 unicode_t c = next_octet (); 2392 uint32_t c = next_octet ();
2740 2393
2741 if (c == NOCHAR) 2394 if (c == NOCHAR)
2742 throw out_of_input; 2395 throw out_of_input;
2743 2396
2744 return c; 2397 return c;
… …
2748/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2749#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2750FILE * 2403FILE *
2751rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2752{ 2405{
2753 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2754 2407
2755 if (stream == NULL) 2408 if (stream == NULL)
2756 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2757 2410
2758 return stream; 2411 return stream;
… …
2769 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2770 */ 2423 */
2771void 2424void
2772rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2773{ 2426{
2774 int done; 2427 FILE *fd = popen_printer ();
2775 FILE *fd;
2776 2428
2777 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2778 return; 2430 return;
2779 2431
2780 /* 2432 /*
2781 * 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
2782 * is received. 2434 * is received.
2783 */ 2435 */
2784 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2785 { 2437 {
2786 unsigned char buf[8]; 2438 unsigned char buf[8];
2787 unicode_t ch; 2439 unicode_t ch;
2788 unsigned int i, len; 2440 unsigned int i, len;
2789 2441
… …
2808 { 2460 {
2809 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2810 break; /* done = 1 */ 2462 break; /* done = 1 */
2811 } 2463 }
2812 } 2464 }
2813 2465
2814 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2815 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2816 { 2468 {
2817 done = 1; 2469 done = 1;
2818 break; 2470 break;
… …
2820 } 2472 }
2821 } 2473 }
2822 2474
2823 pclose_printer (fd); 2475 pclose_printer (fd);
2824} 2476}
2825#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2826/*}}} */ 2478/*}}} */
2827 2479
2828/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2829enum { 2481enum {
2830 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2844 case C0_ESC: 2496 case C0_ESC:
2845 process_escape_seq (); 2497 process_escape_seq ();
2846 break; 2498 break;
2847 case C0_ENQ: /* terminal Status */ 2499 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 2500 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2501 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 2502 else
2852 tt_write ((unsigned char *)VT100_ANS, 2503 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 2504 break;
2855 case C0_BEL: /* bell */ 2505 case C0_BEL: /* bell */
2856 scr_bell (); 2506 scr_bell ();
2857 break; 2507 break;
2858 case C0_BS: /* backspace */ 2508 case C0_BS: /* backspace */
… …
2882 process_dcs_seq (); 2532 process_dcs_seq ();
2883 break; 2533 break;
2884 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2885 process_csi_seq (); 2535 process_csi_seq ();
2886 break; 2536 break;
2887 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2888 process_osc_seq (); 2538 process_osc_seq ();
2889 break; 2539 break;
2890#endif 2540#endif
2891 } 2541 }
2892} 2542}
… …
2936 break; 2586 break;
2937 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
2938 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2939 break; 2589 break;
2940 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
2941 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
2942 break; 2592 break;
2943 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
2944 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
2945 /* unimplemented */ 2595 /* unimplemented */
2946 break; 2596 break;
… …
2982 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
2983 break; 2633 break;
2984 case '+': 2634 case '+':
2985 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
2986 break; 2636 break;
2987#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
2988 case '6': 2638 case '6':
2989 scr_backindex (); 2639 scr_backindex ();
2990 break; 2640 break;
2991#endif 2641#endif
2992 case '7': 2642 case '7':
2993 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
2994 break; 2644 break;
2995 case '8': 2645 case '8':
2996 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
2997 break; 2647 break;
2998#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
2999 case '9': 2649 case '9':
3000 scr_forwardindex (); 2650 scr_forwardindex ();
3001 break; 2651 break;
3002#endif 2652#endif
3003 case '=': 2653 case '=':
3004 case '>': 2654 case '>':
3005 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3006 break; 2656 break;
3007 2657
3008 case C1_40: 2658 case C1_40:
3009 cmd_getc (); 2659 cmd_getc ();
3010 break; 2660 break;
… …
3013 break; 2663 break;
3014 2664
3015 /* 8.3.87: NEXT LINE */ 2665 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 2666 case C1_NEL: /* ESC E */
3017 { 2667 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 2668 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 2670 }
3021 break; 2671 break;
3022 2672
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 2673 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 2674 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 2696 process_dcs_seq ();
3047 break; 2697 break;
3048 2698
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3054 2703
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3056 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 2706 process_csi_seq ();
3058 break; 2707 break;
3059 2708
3060 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3061 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3062 process_osc_seq (); 2711 process_osc_seq ();
3063 break; 2712 break;
3064 2713
3065 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3066 case 'c': 2715 case 'c':
3067 mbstate.reset (); 2716 mbstate.reset ();
3068 scr_poweron (); 2717 scr_poweron ();
3069 scrollbar_show (1); 2718 scrollBar.show (1);
3070 break; 2719 break;
3071 2720
3072 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3073 case 'n': 2722 case 'n':
3074 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3119rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3120{ 2769{
3121 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3122 unsigned int nargs, p; 2771 unsigned int nargs, p;
3123 int n, ndef; 2772 int n, ndef;
3124 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3125 2774
3126 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3127 arg[--nargs] = 0;
3128 2776
3129 priv = 0; 2777 priv = 0;
3130 ch = cmd_getc (); 2778 ch = cmd_getc ();
3131 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3132 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3133 priv = ch; 2782 priv = ch;
3134 ch = cmd_getc (); 2783 ch = cmd_getc ();
3135 } 2784 }
3136 2785
3137 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3166 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
3167 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
3168 if (arg[p] == -1) 2817 if (arg[p] == -1)
3169 arg[p] = ndef; 2818 arg[p] = ndef;
3170 2819
3171#ifdef DEBUG_CMD
3172 fprintf (stderr, "CSI ");
3173 for (p = 0; p < nargs; p++)
3174 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3175 fprintf (stderr, "%c\n", ch);
3176#endif
3177
3178 /* 2820 /*
3179 * private mode handling 2821 * private mode handling
3180 */ 2822 */
3181 if (priv) 2823 if (priv)
3182 { 2824 {
3183 switch (priv) 2825 switch (priv)
3184 { 2826 {
3185 case '>': 2827 case '>':
3186 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 //
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
3188 break; 2839 break;
2840
3189 case '?': 2841 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3192 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);
3193 } 2857 }
2858 break;
2859 }
2860
3194 return; 2861 return;
3195 } 2862 }
3196 2863
3197 switch (ch) 2864 switch (ch)
3198 { 2865 {
… …
3297 2964
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2965 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 2966 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 2967 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2968 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2969 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 2970 break;
3304 2971
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2972 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 2974 break;
3309 2975
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2976 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 2977 process_sgr_mode (nargs, arg);
3312 break; 2978 break;
… …
3319 break; 2985 break;
3320 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
3321 scr_report_position (); 2987 scr_report_position ();
3322 break; 2988 break;
3323 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 2990 if (option (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 2992 break;
3327 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 2995 break;
… …
3396 break; 3062 break;
3397 case CSI_75: 3063 case CSI_75:
3398 scr_cursor (RESTORE); 3064 scr_cursor (RESTORE);
3399 break; 3065 break;
3400 3066
3401#if ENABLE_FRILLS 3067#if !ENABLE_MINIMAL
3402 case CSI_74: 3068 case CSI_74:
3403 process_window_ops (arg, nargs); 3069 process_window_ops (arg, nargs);
3404 break; 3070 break;
3405#endif 3071#endif
3406 3072
… …
3413 break; 3079 break;
3414 } 3080 }
3415} 3081}
3416/*}}} */ 3082/*}}} */
3417 3083
3418#if ENABLE_FRILLS 3084#if !ENABLE_MINIMAL
3419/* ARGSUSED */ 3085/* ARGSUSED */
3420void 3086void
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3087rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3088{
3423 int x, y; 3089 int x, y;
3424 XWindowAttributes wattr; 3090 XWindowAttributes wattr;
3425 Window wdummy; 3091 Window wdummy;
3092
3093 dLocal (Display *, dpy);
3426 3094
3427 if (nargs == 0) 3095 if (nargs == 0)
3428 return; 3096 return;
3429 3097
3430 switch (args[0]) 3098 switch (args[0])
3431 { 3099 {
3432 /* 3100 /*
3433 * commands 3101 * commands
3434 */ 3102 */
3435 case 1: /* deiconify window */ 3103 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3104 XMapWindow (dpy, parent[0]);
3437 break; 3105 break;
3438 case 2: /* iconify window */ 3106 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3107 XIconifyWindow (dpy, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3108 break;
3442 case 3: /* set position (pixels) */ 3109 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3110 XMoveWindow (dpy, parent[0], args[1], args[2]);
3444 break; 3111 break;
3445 case 4: /* set size (pixels) */ 3112 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3114 break;
3448 case 5: /* raise window */ 3115 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3116 XRaiseWindow (dpy, parent[0]);
3450 break; 3117 break;
3451 case 6: /* lower window */ 3118 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3119 XLowerWindow (dpy, parent[0]);
3453 break; 3120 break;
3454 case 7: /* refresh window */ 3121 case 7: /* refresh window */
3455 scr_touch (true); 3122 scr_touch (true);
3456 break; 3123 break;
3457 case 8: /* set size (chars) */ 3124 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3125 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3126 (unsigned int) (args[1] * fheight));
3460 break; 3127 break;
3461 3128
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3129 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3130 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3131 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3132 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3133 (unsigned int) (args[1] * fheight));
3467 break; 3134 break;
3468
3469 3135
3470 /* 3136 /*
3471 * reports - some output format copied from XTerm 3137 * reports - some output format copied from XTerm
3472 */ 3138 */
3473 case 11: /* report window state */ 3139 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3142 break;
3477 case 13: /* report window position */ 3143 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3145 XTranslateCoordinates (dpy, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3146 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3147 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3148 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3149 break;
3484 case 14: /* report window size (pixels) */ 3150 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3153 break;
3488 case 18: /* report text area size (chars) */ 3154 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3155 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3156 break;
3491 case 19: /* report window size (chars) */ 3157 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3158 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3159 break;
3494 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3495 { 3161 {
3496 char *s; 3162 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
3498 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 */
3499 XFree (s); 3165 XFree (s);
3500 } 3166 }
3501 break; 3167 break;
3502 case 21: /* report window title */ 3168 case 21: /* report window title */
3503 { 3169 {
3504 char *s; 3170 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
3506 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 */
3507 XFree (s); 3173 XFree (s);
3508 } 3174 }
3509 break; 3175 break;
3510 } 3176 }
3511} 3177}
… …
3514/*----------------------------------------------------------------------*/ 3180/*----------------------------------------------------------------------*/
3515/* 3181/*
3516 * get input up until STRING TERMINATOR (or BEL) 3182 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3183 * ends_how is terminator used. returned input must be free()'d
3518 */ 3184 */
3519unsigned char * 3185char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3186rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3187{
3522 unicode_t ch; 3188 unicode_t ch;
3523 bool seen_esc = false; 3189 bool seen_esc = false;
3524 unsigned int n = 0; 3190 unsigned int n = 0;
… …
3538 seen_esc = true; 3204 seen_esc = true;
3539 continue; 3205 continue;
3540 } 3206 }
3541 else if (ch == C0_BEL || ch == CHAR_ST) 3207 else if (ch == C0_BEL || ch == CHAR_ST)
3542 break; 3208 break;
3209 else if (ch == C0_SYN)
3210 ch = cmd_get8 ();
3543 else if (ch < 0x20) 3211 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3212 return NULL; /* other control character - exit */
3545 3213
3546 seen_esc = false; 3214 seen_esc = false;
3547 3215
3548 if (n >= sizeof (string) - 1) 3216 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3217 // stop at some sane length
3550 return NULL; 3218 return NULL;
3551 3219
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
3555 string[n++] = ch; 3220 string[n++] = ch;
3556 } 3221 }
3557 3222
3558 string[n++] = '\0'; 3223 string[n++] = '\0';
3559 3224
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3225 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3226
3562 return (unsigned char *)rxvt_wcstombs (string); 3227 return rxvt_wcstombs (string);
3563} 3228}
3564 3229
3565/*----------------------------------------------------------------------*/ 3230/*----------------------------------------------------------------------*/
3566/* 3231/*
3567 * 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)'
3568 */ 3233 */
3569void 3234void
3570rxvt_term::process_dcs_seq () 3235rxvt_term::process_dcs_seq ()
3571{ 3236{
3572 unsigned char *s; 3237 char *s;
3573 unicode_t eh; 3238 unicode_t eh;
3574 3239
3575 /* 3240 /*
3576 * Not handled yet 3241 * Not handled yet
3577 */ 3242 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3261 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3262 arg = arg * 10 + (ch - '0');
3598 3263
3599 if (ch == ';') 3264 if (ch == ';')
3600 { 3265 {
3601 unsigned char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3602 3267
3603 if (s) 3268 if (s)
3604 { 3269 {
3605 process_xterm_seq (arg, (char *)s, eh); 3270 process_xterm_seq (arg, s, eh);
3606 free (s); 3271 free (s);
3607 } 3272 }
3608 } 3273 }
3609} 3274}
3610 3275
3611void 3276void
3612rxvt_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)
3613{ 3278{
3614 if (str[0] == '?' && !str[1]) 3279 if (str[0] == '?' && !str[1])
3615 { 3280 {
3616 unsigned short r, g, b; 3281 rgba c;
3617 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
3618 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);
3619 } 3290 }
3620 else 3291 else
3621 set_window_color (color, str); 3292 set_window_color (color, str);
3622} 3293}
3623 3294
3624/* 3295/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3297 */
3649void 3298void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3651{ 3300{
3652 int changed = 0;
3653 int color; 3301 int color;
3654 char *buf, *name; 3302 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3304 int saveop = op;
3657 3305
3306 dLocal (Display *, dpy);
3307
3658 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
3659 switch (op) 3313 switch (op)
3660 { 3314 {
3661 case XTerm_name: 3315 case XTerm_name:
3662 set_title (str); 3316 set_title (str);
3663 /* FALLTHROUGH */ 3317 /* FALLTHROUGH */
… …
3677 unsigned long bytes_after; 3331 unsigned long bytes_after;
3678 unsigned char *value = 0; 3332 unsigned char *value = 0;
3679 const char *str = ""; 3333 const char *str = "";
3680 3334
3681 if (prop 3335 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3336 && XGetWindowProperty (dpy, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3337 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3338 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3339 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3340 && actual_type != None
3687 && actual_format == 8) 3341 && actual_format == 8)
3688 str = (const char *)(value); 3342 str = (const char *)(value);
3689 3343
3690 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3344 tt_printf ("\033]%d;%s%c", op, str, resp);
3691 3345
3692 XFree (value); 3346 XFree (value);
3693 } 3347 }
3694 else 3348 else
3695 { 3349 {
3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3697 3351
3698 if (eq) 3352 if (eq)
3699 { 3353 {
3700 *eq = 0; 3354 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3702 } 3356 }
3703 else 3357 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3358 XDeleteProperty (dpy, parent[0],
3705 display->atom (str)); 3359 display->atom (str));
3706 } 3360 }
3707 break; 3361 break;
3708 3362
3709 case XTerm_Color: 3363 case XTerm_Color:
… …
3711 { 3365 {
3712 if ((name = strchr (buf, ';')) == NULL) 3366 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3367 break;
3714 3368
3715 *name++ = '\0'; 3369 *name++ = '\0';
3716 color = atoi (buf); 3370 color = atoi (buf) + minCOLOR;
3717 3371
3718 if (color < 0 || color >= TOTAL_COLORS) 3372 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3373 break;
3720 3374
3721 if ((buf = strchr (name, ';')) != NULL) 3375 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3376 *buf++ = '\0';
3723 3377
3724 if (name[0] == '?' && !name[1]) 3378 process_color_seq (op, color, name, resp);
3725 {
3726 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 }
3730 else
3731 set_window_color (color + minCOLOR, name);
3732 } 3379 }
3733 break; 3380 break;
3381 case Rxvt_restoreFG:
3734 case XTerm_Color00: 3382 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3736 break; 3384 break;
3385 case Rxvt_restoreBG:
3737 case XTerm_Color01: 3386 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3739 break; 3388 break;
3740#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3391 process_color_seq (op, Color_cursor, str, resp);
3743 break; 3392 break;
3744#endif 3393#endif
3745 case XTerm_Color_pointer_fg: 3394 case XTerm_Color_pointer_fg:
3746 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3747 break; 3396 break;
3748 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3750 break; 3399 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3400#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break;
3761 case XTerm_Color_RV: 3401 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3402 process_color_seq (op, Color_RV, str, resp);
3763 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;
3764#endif 3415#endif
3765#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3766 case XTerm_Color_tint: 3420 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3768 check_our_parents (); 3422 {
3769 if (am_transparent) 3423 bool changed = false;
3770 want_full_refresh = want_refresh = 1;
3771 break;
3772#endif
3773 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
3774 case XTerm_Pixmap: 3438 case Rxvt_Pixmap:
3775 if (*str != ';') 3439 if (!strcmp (str, "?"))
3776 { 3440 {
3777#if XPM_BACKGROUND 3441 char str[256];
3778 scale_pixmap (""); /* reset to default scaling */ 3442
3779 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3780#endif 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3781 scr_touch (true); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3782 } 3447 }
3783 while ((str = strchr (str, ';')) != NULL) 3448 else
3784 { 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 {
3785 str++; 3465 str++;
3786#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3787 changed += scale_pixmap (str); 3467 changed++;
3788#endif 3468 str = strchr (str, ';');
3469 }
3789 3470
3471 if (changed)
3472 update_background ();
3790 } 3473 }
3791 if (changed)
3792 {
3793#ifdef XPM_BACKGROUND
3794 resize_pixmap ();
3795#endif
3796 scr_touch (true);
3797 }
3798 break; 3474 break;
3799 3475#endif
3800 case XTerm_restoreFG:
3801 set_window_color (Color_fg, str);
3802 break;
3803 case XTerm_restoreBG:
3804 set_window_color (Color_bg, str);
3805 break;
3806 3476
3807 case XTerm_logfile: 3477 case XTerm_logfile:
3808 // TODO, when secure mode? 3478 // TODO, when secure mode?
3809 break; 3479 break;
3810 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
3811 case XTerm_font: 3493 case XTerm_font:
3812 op = URxvt_font; 3494 op = URxvt_font;
3813 case URxvt_font: 3495 case URxvt_font:
3814#if ENABLE_STYLES 3496#if ENABLE_STYLES
3815 case URxvt_boldFont: 3497 case URxvt_boldFont:
3816 case URxvt_italicFont: 3498 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3499 case URxvt_boldItalicFont:
3818#endif 3500#endif
3819 if (query) 3501 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3504 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3505 resp);
3824 else 3506 else
3825 { 3507 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3509
… …
3829 allocated.push_back ((void *)res); 3511 allocated.push_back ((void *)res);
3830 set_fonts (); 3512 set_fonts ();
3831 } 3513 }
3832 break; 3514 break;
3833 3515
3834#if ENABLE_FRILLS 3516 case URxvt_version:
3835 case XTerm_locale:
3836 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)
3837 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);
3838 else 3528 else
3839 { 3529 {
3840 set_locale (str); 3530 set_locale (str);
3841# ifdef USE_XIM 3531 pty->set_utf8_mode (enc_utf8);
3842 im_cb (); 3532 init_xlocale ();
3843# endif
3844 } 3533 }
3845 break; 3534 break;
3846#endif
3847 3535
3848#ifdef MENUBAR 3536 case URxvt_view_up:
3849 case XTerm_Menu: 3537 case URxvt_view_down:
3850 if (options & Opt_insecure) 3538 {
3851 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
3852 break; 3547 break;
3853#endif 3548#endif
3854#if 0 3549
3855 case XTerm_dumpscreen: /* no error notices */ 3550#if ENABLE_PERL
3856 { 3551 case URxvt_perl:
3857 int fd; 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 3553 break;
3865#endif 3554#endif
3866 } 3555 }
3867} 3556}
3868/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
3891 { 3580 {
3892 if (mode == 'r') 3581 if (mode == 'r')
3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3894 else 3583 else
3895 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3896 PrivMode (state, bit); 3585 set_privmode (bit, state);
3897 } 3586 }
3898 3587
3899 return state; 3588 return state;
3900} 3589}
3901 3590
3902/* we're not using priv _yet_ */ 3591/* we're not using priv _yet_ */
3903void 3592void
3904rxvt_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)
3905{ 3594{
3906 unsigned int i, j; 3595 unsigned int i, j;
3907 int state; 3596 int state;
3908 3597
3909 static const struct 3598 static const struct
3910 { 3599 {
3911 const int argval; 3600 const int argval;
3912 const unsigned long bit; 3601 const unsigned long bit;
3913 }
3914
3915 argtopriv[] = { 3602 } argtopriv[] = {
3916 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3917 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3918 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3919 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3920 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3921 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3922 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3923 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3924 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3925#ifdef menuBar_esc 3612 // 18 end FF to printer after print screen
3926 { menuBar_esc, PrivMode_menuBar }, 3613 // 19 Print screen prints full screen/scorll region
3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3930#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3931 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3932#endif 3617#endif
3933 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3934 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3935 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3936 // 45 margin bell NYI 3622 // 45 margin bell NYI
3937 // 46 start logging 3623 // 46 start logging
3938 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3939 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3940#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3941 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3942#endif 3628#endif
3943 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3944 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
3945 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
3946 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3947 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3948 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
3949 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
3950 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
3951 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3952 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3953 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3954 { 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 */
3955 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3956 }; 3642 };
3957 3643
3958 if (nargs == 0) 3644 if (nargs == 0)
3959 return; 3645 return;
3960 3646
… …
3977 } 3663 }
3978 3664
3979 /* extra handling for values with state unkept */ 3665 /* extra handling for values with state unkept */
3980 switch (arg[i]) 3666 switch (arg[i])
3981 { 3667 {
3668#if ENABLE_STYLES
3669 case 1021:
3670 set_option (Opt_intensityStyles, mode);
3671
3672 scr_touch (true);
3673 break;
3674#endif
3982 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3983 case 1049:
3984 if (options & Opt_secondaryScreen) 3676 if (option (Opt_secondaryScreen))
3985 if (mode == 0) 3677 if (mode == 0)
3986 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3987 else if (mode == 1) 3679 else if (mode == 1)
3988 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
3989 break; 3681 break;
… …
3997 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3998 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3999 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4000 * within VT52 mode 3692 * within VT52 mode
4001 */ 3693 */
4002 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4003 break; 3695 break;
4004 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4007 break; 3699 break;
4008 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 3701 set_option (Opt_jumpScroll, !state);
4013 break; 3702 break;
4014 case 5: /* reverse video */ 3703 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 3704 scr_rvideo_mode (state);
4016 break; 3705 break;
4017 case 6: /* relative/absolute origins */ 3706 case 6: /* relative/absolute origins */
… …
4021 scr_autowrap (state); 3710 scr_autowrap (state);
4022 break; 3711 break;
4023 /* 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 */
4024 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4025 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4026 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4027 break; 3716 break;
4028#ifdef menuBar_esc
4029 case menuBar_esc:
4030#ifdef MENUBAR
4031 map_menuBar (state);
4032#endif
4033 break;
4034#endif
4035#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4036 case scrollBar_esc: 3718 case scrollBar_esc:
4037 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4038 { 3720 {
4039 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4040 scr_touch (true); 3722 scr_touch (true);
4041 } 3723 }
4042 break; 3724 break;
… …
4051 break; 3733 break;
4052 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4053 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4054 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4055 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4056 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4057 break; 3739 break;
4058#if 0
4059 case 1001: 3740 case 1002:
4060 break; /* X11 mouse highlighting */ 3741 case 1003:
4061#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;
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 3754 set_option (Opt_scrollTtyOutput, !state);
4067 break; 3755 break;
4068 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 3757 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 3758 break;
4074 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 3760 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3761 if (!state)
4077 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4078 scr_change_screen (state); 3764 scr_change_screen (state);
4079 break; 3765 break;
4080 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
4081 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4082 if (options & Opt_secondaryScreen) 3773 if (option (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 3774 if (state)
4084 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4085 break; 3778 break;
4086 default: 3779 default:
4087 break; 3780 break;
4088 } 3781 }
4089 } 3782 }
… …
4215 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4216 break; 3909 break;
4217 3910
4218 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4219 3912
4220#ifndef NO_BRIGHTCOLOR 3913#if !ENABLE_MINIMAL
4221 case 90: 3914 case 90:
4222 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4223 case 92: 3916 case 92:
4224 case 93: 3917 case 93:
4225 case 94: 3918 case 94:
… …
4237 case 106: 3930 case 106:
4238 case 107: 3931 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3932 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 3933 break;
4241#endif 3934#endif
4242
4243 } 3935 }
4244 } 3936 }
4245} 3937}
4246/*}}} */ 3938/*}}} */
4247 3939
… …
4250rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4251{ 3943{
4252 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4253 3945
4254 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4255 { /* query graphics */ 3948 /* query graphics */
4256 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4257 return; 3950 return;
4258 } 3951 }
4259 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4260 do 3953 do
… …
4271 */ 3964 */
4272void 3965void
4273rxvt_term::tt_printf (const char *fmt,...) 3966rxvt_term::tt_printf (const char *fmt,...)
4274{ 3967{
4275 va_list arg_ptr; 3968 va_list arg_ptr;
4276 unsigned char buf[256]; 3969 char buf[256];
4277 3970
4278 va_start (arg_ptr, fmt); 3971 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3972 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 3973 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 3974 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 3979 * or generated by us in response to a query ESC sequence.
4287 */ 3980 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 3982
4290void 3983void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 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
4293 if (v_buflen == 0) 3992 if (v_buflen == 0)
4294 { 3993 {
4295 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));
4296 3995
4297 if ((unsigned int)written == len) 3996 if ((unsigned int)written == len)
4298 return; 3997 return;
4299 3998
4300 data += written; 3999 data += written;
4301 len -= written; 4000 len -= written;
4302 } 4001 }
4303 4002
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4004
4306 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4006 v_buflen += len;
4308 4007
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4310} 4009}
4311 4010
4312void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4313{ 4012{
4314 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));
4315 4014
4316 if (written > 0) 4015 if (written > 0)
4317 { 4016 {
4318 v_buflen -= written; 4017 v_buflen -= written;
4319 4018
4320 if (v_buflen == 0) 4019 if (v_buflen == 0)
4321 { 4020 {
4322 free (v_buffer); 4021 free (v_buffer);
4323 v_buffer = 0; 4022 v_buffer = 0;
4324 v_buflen = 0;
4325 4023
4326 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4327 return; 4025 return;
4328 } 4026 }
4329 4027
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4029 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4031 pty_ev.set (ev::READ);
4334 destroy ();
4335} 4032}
4336 4033
4337/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4338 4035

Diff Legend

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