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

Diff Legend

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