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

Diff Legend

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