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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

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

Diff Legend

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