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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.512 by root, Mon May 28 16:40:03 2012 UTC

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

Diff Legend

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