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

Diff Legend

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