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

Diff Legend

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