ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC

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

Diff Legend

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