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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.493 by sf-exg, Sun Aug 21 20:17:40 2011 UTC

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

Diff Legend

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