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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.436 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

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

Diff Legend

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