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.377 by root, Fri Dec 14 02:22:24 2007 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
304{ 416{
305 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
309 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
310 422
311#if ISO_14755 423#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
313 return; 425 return;
314#endif 426#endif
… …
321 */ 433 */
322 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
325 437
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 438 kbuf[0] = 0;
333 439
334#ifdef USE_XIM 440#if USE_XIM
335 if (Input_Context) 441 if (Input_Context)
336 { 442 {
337 Status status_return; 443 Status status_return;
338 444
339#if 0 445#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 516#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 517 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 518#else
413 lnsppg = nrow * 4 / 5; 519 lnsppg = nrow * 4 / 5;
414#endif 520#endif
521 max_it (lnsppg, 1);
522
415 if (keysym == XK_Prior) 523 if (keysym == XK_Prior)
416 { 524 {
417 scr_page (UP, lnsppg); 525 scr_page (lnsppg);
418 return; 526 return;
419 } 527 }
420 else if (keysym == XK_Next) 528 else if (keysym == XK_Next)
421 { 529 {
422 scr_page (DN, lnsppg); 530 scr_page (-lnsppg);
423 return; 531 return;
424 } 532 }
425 } 533 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 534#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 535 if (IS_SCROLL_MOD)
428 { 536 {
429 if (keysym == XK_Up) 537 if (keysym == XK_Up)
430 { 538 {
431 scr_page (UP, 1); 539 scr_page (1);
432 return; 540 return;
433 } 541 }
434 else if (keysym == XK_Down) 542 else if (keysym == XK_Down)
435 { 543 {
436 scr_page (DN, 1); 544 scr_page (-1);
437 return; 545 return;
438 } 546 }
439 } 547 }
440#endif 548#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 549#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 550 if (IS_SCROLL_MOD)
443 { 551 {
444 if (keysym == XK_Home) 552 if (keysym == XK_Home)
445 { 553 {
446 scr_move_to (0, 1); 554 scr_changeview (top_row);
447 return; 555 return;
448 } 556 }
449 else if (keysym == XK_End) 557 else if (keysym == XK_End)
450 { 558 {
451 scr_move_to (1, 1); 559 scr_changeview (0);
452 return; 560 return;
453 } 561 }
454 } 562 }
455#endif 563#endif
456 } 564 }
… …
472 selection_request (ev.time); 580 selection_request (ev.time);
473 return; 581 return;
474#if TODO 582#if TODO
475 /* rxvt extras */ 583 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 584 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 585 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 586 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 587 return;
482#endif 588#endif
483 } 589 }
484 } 590 }
485 } 591 }
486 592
593 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
594 {
595 if (keysym == XK_v)
596 selection_request (ev.time, Sel_Clipboard);
597 else if (selection.len > 0)
598 {
599 free (selection.clip_text);
600 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
601 selection.clip_len = selection.len;
602 selection_grab (CurrentTime, true);
603 }
604
605 return;
606 }
607
487#if ENABLE_FRILLS || ISO_14755 608#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 609 // ISO 14755 support
489 if (shft && ctrl) 610 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 611 {
491 int hv; 612 int hv;
492 613
493 if (iso14755buf & ISO_14755_51 614 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 615 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 645 scr_overlay_off ();
525# endif 646# endif
526 iso14755buf = 0; 647 iso14755buf = 0;
527 } 648 }
528 } 649 }
650 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 651 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 652 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 653 if (!(iso14755buf & ISO_14755_STARTED))
532 { 654 {
533 iso14755buf |= ISO_14755_STARTED; 655 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 656# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 657 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 668 }
547#endif 669#endif
548 670
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 671 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 672 {
673 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
674 unsigned int newlen = 1;
675
676 if (ev.state & ModNumLockMask)
677 kp = false;
678
679 keysym = translate_keypad (keysym, kp);
680
681 switch (keysym)
551 { 682 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 683#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 684 case XK_BackSpace:
554#ifdef XK_KP_Home 685 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 686 {
556 XK_KP_7, // XK_KP_Home 687 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 688 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 689 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 690 }
691 else
692 strcpy (kbuf, rs[Rs_backspace_key]);
693 break;
694#endif
695#ifndef NO_DELETE_KEY
696 case XK_Delete:
697 strcpy (kbuf, rs[Rs_delete_key]);
698 break;
699#endif
700 case XK_Tab:
701 if (shft)
702 strcpy (kbuf, "\033[Z");
703 else
704 {
705#ifdef CTRL_TAB_MAKES_META
706 if (ctrl)
707 meta = 1;
708#endif
709#ifdef MOD4_TAB_MAKES_META
710 if (ev.state & Mod4Mask)
711 meta = 1;
712#endif
713 newlen = 0;
714 }
715 break;
571 716
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 717 case XK_Up: /* "\033[A" */
718 case XK_Down: /* "\033[B" */
719 case XK_Right: /* "\033[C" */
720 case XK_Left: /* "\033[D" */
721 strcpy (kbuf, "\033[Z");
722 kbuf[2] = "DACB"[keysym - XK_Left];
723 /* do Shift first */
724 if (shft)
725 kbuf[2] = "dacb"[keysym - XK_Left];
726 else if (ctrl)
727 {
728 kbuf[1] = 'O';
729 kbuf[2] = "dacb"[keysym - XK_Left];
730 }
731 else if (priv_modes & PrivMode_aplCUR)
732 kbuf[1] = 'O';
733 break;
734
735 case XK_KP_Enter:
736 /* allow shift to override */
737 if (kp)
738 {
739 strcpy (kbuf, "\033OM");
740 break;
741 }
742
743 /* FALLTHROUGH */
744
745 case XK_Return:
746 if (priv_modes & PrivMode_LFNL)
747 {
748 kbuf[0] = '\015';
749 kbuf[1] = '\012';
750 kbuf[2] = '\0';
751 }
752 else
753 {
754 kbuf[0] = '\015';
755 kbuf[1] = '\0';
756 }
757 break;
758
759 case XK_KP_F1: /* "\033OP" */
760 case XK_KP_F2: /* "\033OQ" */
761 case XK_KP_F3: /* "\033OR" */
762 case XK_KP_F4: /* "\033OS" */
763 strcpy (kbuf, "\033OP");
764 kbuf[2] += (keysym - XK_KP_F1);
765 break;
766
767 case XK_KP_Multiply: /* "\033Oj" : "*" */
768 case XK_KP_Add: /* "\033Ok" : "+" */
769 case XK_KP_Separator: /* "\033Ol" : "," */
770 case XK_KP_Subtract: /* "\033Om" : "-" */
771 case XK_KP_Decimal: /* "\033On" : "." */
772 case XK_KP_Divide: /* "\033Oo" : "/" */
773 case XK_KP_0: /* "\033Op" : "0" */
774 case XK_KP_1: /* "\033Oq" : "1" */
775 case XK_KP_2: /* "\033Or" : "2" */
776 case XK_KP_3: /* "\033Os" : "3" */
777 case XK_KP_4: /* "\033Ot" : "4" */
778 case XK_KP_5: /* "\033Ou" : "5" */
779 case XK_KP_6: /* "\033Ov" : "6" */
780 case XK_KP_7: /* "\033Ow" : "7" */
781 case XK_KP_8: /* "\033Ox" : "8" */
782 case XK_KP_9: /* "\033Oy" : "9" */
783 /* allow shift to override */
784 if (kp)
785 {
786 strcpy (kbuf, "\033Oj");
787 kbuf[2] += (keysym - XK_KP_Multiply);
788 }
789 else
790 {
791 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
792 kbuf[1] = '\0';
793 }
794 break;
795
796 default:
573 { 797 {
574 unsigned int index = keysym - XK_KP_Home; 798 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 799 if (param > 0)
800 sprintf (kbuf,"\033[%d~", param);
801 else
802 newlen = 0;
576 } 803 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 804 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 805 }
794 806
807 if (newlen)
808 len = strlen (kbuf);
809
810 if (len > 0)
811 {
795 /* 812 /*
813 * pass Shift/Control indicators for function keys ending with `~'
814 *
815 * eg,
816 * Prior = "ESC[5~"
817 * Shift+Prior = "ESC[5$"
818 * Ctrl+Prior = "ESC[5^"
819 * Ctrl+Shift+Prior = "ESC[5@"
820 */
821 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
822 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
823
824 /*
796 * Pass meta for all function keys, if 'meta' option set 825 * Pass meta for all function keys, if 'meta' option set
797 */ 826 */
798#ifdef META8_OPTION 827#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 828 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 829 kbuf[len - 1] |= 0x80;
801#endif 830#endif
831 }
802 832
803 } 833 }
804 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
805 { 835 {
806 len = 1; 836 len = 1;
… …
825 meta = 0; 855 meta = 0;
826 } 856 }
827#endif 857#endif
828 /* nil */ ; 858 /* nil */ ;
829 } 859 }
860 }
861
862 /* escape prefix */
863 if (len && meta
864#ifdef META8_OPTION
865 && meta_char == C0_ESC
866#endif
867 )
868 {
869 *--kbuf = C0_ESC;
870 len++;
830 } 871 }
831 872
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return; 874 return;
834 875
… …
840 { 881 {
841 view_start = 0; 882 view_start = 0;
842 want_refresh = 1; 883 want_refresh = 1;
843 } 884 }
844 885
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 886 tt_write (kbuf, (unsigned int)len);
871} 887}
872 888
873void 889void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 890rxvt_term::key_release (XKeyEvent &ev)
875{ 891{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 892#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 893 KeySym keysym;
878 894
… …
898 commit_iso14755 (); 914 commit_iso14755 ();
899 915
900 return; 916 return;
901 } 917 }
902 918
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 919 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 920 if (i[0] == keysym)
905 { 921 {
906 iso14755buf = ISO_14755_51 | i[1]; 922 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 923 commit_iso14755 ();
908 924
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 961 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 962 mouse_slip_wheel_speed = 0;
947#endif 963#endif
948} 964}
949 965
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 966void
984rxvt_term::flush () 967rxvt_term::flush ()
985{ 968{
986 flush_ev.stop (); 969 flush_ev.stop ();
987 970
988#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 972 if (bg_flags & BG_NEEDS_REFRESH)
990 { 973 {
991// scr_clear (true); This needs to be researched further! 974 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 975 scr_touch (false);
993 } 976 }
994#endif 977#endif
995 978
996 if (want_refresh) 979 if (want_refresh)
… …
1032 } 1015 }
1033 while (row < end_row); 1016 while (row < end_row);
1034 } 1017 }
1035 1018
1036 scr_refresh (); 1019 scr_refresh ();
1037 scrollbar_show (1); 1020 scrollBar.show (1);
1038#ifdef USE_XIM 1021#if USE_XIM
1039 IMSendSpot (); 1022 im_send_spot ();
1040#endif 1023#endif
1041 } 1024 }
1042 1025
1043 display->flush (); 1026 display->flush ();
1044} 1027}
1045 1028
1029/* checks whether a refresh is requested and starts the refresh timer */
1046void 1030void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1031rxvt_term::refresh_check ()
1048{ 1032{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1033 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1055} 1037}
1056 1038
1057void 1039void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1041{
… …
1063 flush (); 1045 flush ();
1064} 1046}
1065 1047
1066#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1067void 1049void
1050rxvt_term::cursor_blink_reset ()
1051{
1052 if (hidden_cursor)
1053 {
1054 hidden_cursor = 0;
1055 want_refresh = 1;
1056 }
1057
1058 if (option (Opt_cursorBlink))
1059 cursor_blink_ev.again ();
1060 else
1061 cursor_blink_ev.stop ();
1062}
1063
1064void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1066{
1070 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1068 want_refresh = 1;
1069 refresh_check ();
1072} 1070}
1073#endif 1071#endif
1074 1072
1075#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1076void 1074void
… …
1078{ 1076{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1078 {
1081 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1082 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1083 } 1082 }
1084 else 1083 else
1085 w.stop (); 1084 w.stop ();
1086} 1085}
1087#endif 1086#endif
1088 1087
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1089void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1091{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 {
1095 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1097 }
1096 else 1098 else
1097 w.stop (); 1099 w.stop ();
1098} 1100}
1099#endif 1101#endif
1100 1102
1101#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1102void 1104void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{ 1106{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_lines))
1106 { 1108 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check ();
1109 } 1112 }
1110 else 1113 else
1111 w.stop (); 1114 w.stop ();
1112} 1115}
1113#endif 1116#endif
1114 1117
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1119void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1121{
1119 if (mouse_slip_wheel_speed == 0 1122 if (scr_page (mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1123 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1124 want_refresh = 1;
1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1129 {
1128 else 1130 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1131 w.stop ();
1132 }
1130} 1133}
1131#endif 1134#endif
1132 1135
1133#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1134static struct event_handler 1137static struct event_handler
… …
1139 { 1142 {
1140 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1144 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1145 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
1147 // since the linux guys additionally thought that breaking the only
1148 // known workaround against their unusable sched_yield hack is cool,
1149 // we just nanosleep a bit and hope for the best.
1144 1150
1145 struct timespec ts = { 0, 0 }; 1151 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1152 nanosleep (&ts, 0);
1147 1153
1148 w.stop (); 1154 w.stop ();
1149 } 1155 }
1150 1156
… …
1153 { 1159 {
1154 } 1160 }
1155} event_handler; 1161} event_handler;
1156#endif 1162#endif
1157 1163
1164/* make sure all the cmd data is at beginning of cmdbuf */
1165void
1166rxvt_term::cmdbuf_reify ()
1167{
1168 if (cmdbuf_ptr == cmdbuf_base)
1169 return;
1170
1171 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1172
1173 memmove (cmdbuf_base, cmdbuf_ptr, used);
1174 cmdbuf_ptr = cmdbuf_base;
1175 cmdbuf_endp = cmdbuf_ptr + used;
1176
1177}
1178
1179#if defined (KEYSYM_RESOURCE)
1180void
1181rxvt_term::cmdbuf_append (const char *str, size_t count)
1182{
1183 cmdbuf_reify ();
1184
1185 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1186
1187 if (count > avail)
1188 return;
1189
1190 memcpy (cmdbuf_endp, str, count);
1191 cmdbuf_endp += count;
1192
1193 cmd_parse ();
1194}
1195#endif
1196
1158bool 1197bool
1159rxvt_term::pty_fill () 1198rxvt_term::pty_fill ()
1160{ 1199{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1200 cmdbuf_reify ();
1162 1201
1163 if (CBUFSIZ == n) 1202 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1203
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1204 if (!avail)
1166 n = 0;
1167 } 1205 {
1168 1206 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1207 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1208 cmdbuf_endp = cmdbuf_ptr;
1209 avail = CBUFSIZ;
1210 }
1172 1211
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1212 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1213
1175 if (r > 0) 1214 if (r > 0)
1176 { 1215 {
1177 cmdbuf_endp += r; 1216 cmdbuf_endp += r;
1178 return true; 1217 return true;
… …
1200{ 1239{
1201 make_current (); 1240 make_current ();
1202 1241
1203 if (revents & ev::READ) 1242 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1243 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1244 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1245 cmd_parse ();
1207 break;
1208 1246
1209 if (revents & ev::WRITE) 1247 if (revents & ev::WRITE)
1210 pty_write (); 1248 pty_write ();
1211}
1212 1249
1213void 1250 refresh_check ();
1251}
1252
1253void ecb_cold
1214rxvt_term::pointer_unblank () 1254rxvt_term::pointer_unblank ()
1215{ 1255{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1256 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1257 recolour_cursor ();
1218 1258
… …
1223 pointer_ev.start (pointerBlankDelay); 1263 pointer_ev.start (pointerBlankDelay);
1224#endif 1264#endif
1225} 1265}
1226 1266
1227#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1228void 1268void ecb_cold
1229rxvt_term::pointer_blank () 1269rxvt_term::pointer_blank ()
1230{ 1270{
1231 if (!option (Opt_pointerBlank)) 1271 if (!option (Opt_pointerBlank))
1232 return; 1272 return;
1233 1273
… …
1235 XFlush (dpy); 1275 XFlush (dpy);
1236 1276
1237 hidden_pointer = 1; 1277 hidden_pointer = 1;
1238} 1278}
1239 1279
1240void 1280void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1281rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1282{
1243 make_current (); 1283 make_current ();
1244 1284
1245 pointer_blank (); 1285 pointer_blank ();
… …
1251{ 1291{
1252 int button_number, key_state = 0; 1292 int button_number, key_state = 0;
1253 int x, y; 1293 int x, y;
1254 int code = 32; 1294 int code = 32;
1255 1295
1256 x = Pixel2Col (ev.x); 1296 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1297 y = Pixel2Row (ev.y) + 1;
1298
1258 if (ev.type == MotionNotify) 1299 if (ev.type == MotionNotify)
1259 { 1300 {
1260 if (x == mouse_row && y == mouse_col) 1301 if (x == mouse_row && y == mouse_col)
1261 return; 1302 return;
1303
1262 mouse_row = x; 1304 mouse_row = x;
1263 mouse_col = y; 1305 mouse_col = y;
1264 code += 32; 1306 code += 32;
1265 } 1307 }
1266 1308
… …
1269 else 1311 else
1270 { 1312 {
1271 button_number = MEvent.button - Button1; 1313 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1314 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1315 if (button_number >= 3)
1274 button_number += (64 - 3); 1316 button_number += 64 - 3;
1275 } 1317 }
1276 1318
1277 if (priv_modes & PrivMode_MouseX10) 1319 if (priv_modes & PrivMode_MouseX10)
1278 { 1320 {
1279 /* 1321 /*
… …
1311 fputc ('A', stderr); 1353 fputc ('A', stderr);
1312 if (key_state & 32) 1354 if (key_state & 32)
1313 fputc ('2', stderr); 1355 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1356 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1357 button_number,
1316 x + 1, 1358 x,
1317 y + 1); 1359 y);
1318#endif 1360#endif
1319 1361
1362#if ENABLE_FRILLS
1363 if (priv_modes & PrivMode_ExtMouseRight)
1364 tt_printf ("\033[%d;%d;%dM",
1365 code + button_number + key_state,
1366 x,
1367 y);
1368 else if (priv_modes & PrivMode_ExtModeMouse)
1369 tt_printf ("\033[M%c%lc%lc",
1370 code + button_number + key_state,
1371 wint_t (32 + x),
1372 wint_t (32 + y));
1373 else
1374#endif
1320 tt_printf ("\033[M%c%c%c", 1375 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1376 code + button_number + key_state,
1322 (32 + x + 1), 1377 32 + x,
1323 (32 + y + 1)); 1378 32 + y);
1324} 1379}
1325 1380
1326/*{{{ process an X event */ 1381/*{{{ process an X event */
1327void 1382void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1383rxvt_term::x_cb (XEvent &ev)
1329{ 1384{
1330 make_current (); 1385 make_current ();
1331 1386
1332 dLocal (Display *, dpy); 1387 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1485 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1486 focus_out ();
1432 break; 1487 break;
1433 1488
1434 case ConfigureNotify: 1489 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1490 if (ev.xconfigure.window == parent)
1439 { 1491 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1493 ;
1494
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496
1497 bool moved = false;
1498#ifdef HAVE_BG_PIXMAP
1499 if (bg_window_position_sensitive ())
1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
1506
1507 if (want_position_change)
1508 {
1509 int x, y;
1510
1511 if (ev.xconfigure.send_event)
1512 {
1513 x = ev.xconfigure.x;
1514 y = ev.xconfigure.y;
1515 }
1516 else
1517 get_window_origin (x, y);
1518
1519 if (x != parent_x || y != parent_y)
1520 {
1521 parent_x = x;
1522 parent_y = y;
1523 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1524 moved = true;
1525 }
1526 }
1442 1527
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1529 {
1445 seen_resize = 1; 1530 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1532 }
1448 else 1533 else
1449 { 1534 {
1450#ifdef HAVE_BG_PIXMAP 1535#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1536 if (moved)
1452 update_background (); 1537 update_background ();
1453#endif 1538#endif
1454 } 1539 }
1540
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1542 }
1457 break; 1543 break;
1458 1544
1459 case PropertyNotify: 1545 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1546 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1547 break;
1466 1548
1467 case SelectionClear: 1549 case SelectionClear:
1468 selection_clear (); 1550 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1551 break;
1475 1552
1476 case SelectionRequest: 1553 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1554 selection_send (ev.xselectionrequest);
1478 break; 1555 break;
1479 1556
1480 case MapNotify: 1557 case MapNotify:
1558#ifdef HAVE_BG_PIXMAP
1559 // This is needed at startup for the case of no window manager
1560 // or a non-reparenting window manager and also because we
1561 // defer bg image updates if the window is not mapped. The
1562 // short delay is to optimize for multiple ConfigureNotify
1563 // events at startup when the window manager reparents the
1564 // window, so as to perform the computation after we have
1565 // received all of them.
1566 if (bg_img == 0)
1567 update_background_ev.start (0.025);
1568#endif
1481 mapped = 1; 1569 mapped = 1;
1482#ifdef TEXT_BLINK 1570#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1571 text_blink_ev.start ();
1484#endif 1572#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1573 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1499 { 1587 {
1500 do 1588 do
1501 { 1589 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1590 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1591 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1592 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1594
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1596
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1597 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1598 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1601 }
1602
1514 want_refresh = 1; 1603 want_refresh = 1;
1515 } 1604 }
1516 else 1605 else
1517 { 1606 {
1518 XEvent unused_event; 1607 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1609 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1610 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1611 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1612 ;
1524 1613
1525 if (isScrollbarWindow (ev.xany.window)) 1614 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1615 {
1527 scrollBar.setIdle (); 1616 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1617 scrollBar.show (0);
1529 } 1618 }
1530 } 1619 }
1531 break; 1620 break;
1532 1621
1533 case MotionNotify: 1622 case MotionNotify:
… …
1574 1663
1575#ifdef SELECTION_SCROLLING 1664#ifdef SELECTION_SCROLLING
1576 if (ev.xbutton.y < int_bwidth 1665 if (ev.xbutton.y < int_bwidth
1577 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1666 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1578 { 1667 {
1668 page_dirn scroll_selection_dir;
1579 int dist; 1669 int dist;
1580 1670
1581 /* don't clobber the current delay if we are 1671 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1672 * already in the middle of scrolling.
1583 */ 1673 */
… …
1598 dist = int_bwidth - ev.xbutton.y; 1688 dist = int_bwidth - ev.xbutton.y;
1599 } 1689 }
1600 else 1690 else
1601 { 1691 {
1602 scroll_selection_dir = DN; 1692 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1693 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1694 }
1605 1695
1606 scroll_selection_lines = Pixel2Height (dist) 1696 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1697 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1698 + 1;
1609 min_it (scroll_selection_lines, 1699 min_it (scroll_selection_lines,
1610 SELECTION_SCROLL_MAX_LINES); 1700 SELECTION_SCROLL_MAX_LINES);
1701 scroll_selection_lines *= scroll_selection_dir;
1611 } 1702 }
1612 else 1703 else
1613 { 1704 {
1614 /* we are within the text window, so we 1705 /* we are within the text window, so we
1615 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1620#ifdef MOUSE_THRESHOLD 1711#ifdef MOUSE_THRESHOLD
1621 } 1712 }
1622#endif 1713#endif
1623 } 1714 }
1624 } 1715 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1717 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1719 MotionNotify, &ev))
1629 ; 1720 ;
1630 1721
1631 XQueryPointer (dpy, scrollBar.win, 1722 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1723 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1724 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1725 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1726 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1727 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1728 scrollBar.size ());
1638 want_refresh = 1; 1729 want_refresh = 1;
1639 scrollbar_show (1); 1730 scrollBar.show (1);
1640 } 1731 }
1641 break; 1732 break;
1642 } 1733 }
1643 1734
1644#if defined(CURSOR_BLINK) 1735#if defined(CURSOR_BLINK)
1645 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1736 if (ev.type == KeyPress)
1646 {
1647 if (hidden_cursor)
1648 {
1649 hidden_cursor = 0;
1650 want_refresh = 1;
1651 }
1652
1653 cursor_blink_ev.again (); 1737 cursor_blink_reset ();
1654 }
1655#endif 1738#endif
1656 1739
1657#if defined(POINTER_BLANK) 1740#if defined(POINTER_BLANK)
1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1741 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1659 { 1742 {
… …
1665 1748
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1749 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1750 pointer_blank ();
1668 } 1751 }
1669#endif 1752#endif
1670}
1671 1753
1672void 1754 refresh_check ();
1755}
1756
1757#if ENABLE_FRILLS
1758void ecb_cold
1759rxvt_term::set_urgency (bool enable)
1760{
1761 if (enable == urgency_hint)
1762 return;
1763
1764 if (XWMHints *h = XGetWMHints (dpy, parent))
1765 {
1766 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1767 XSetWMHints (dpy, parent, h);
1768 urgency_hint = enable;
1769 XFree (h);
1770 }
1771}
1772#endif
1773
1774void ecb_cold
1673rxvt_term::focus_in () 1775rxvt_term::focus_in ()
1674{ 1776{
1675 if (!focus) 1777 if (!focus)
1676 { 1778 {
1677 focus = 1; 1779 focus = 1;
1678 want_refresh = 1; 1780 want_refresh = 1;
1679 1781
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1682#if USE_XIM 1782#if USE_XIM
1683 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1684 { 1784 {
1685 IMSetPosition (); 1785 im_set_position ();
1686 XSetICFocus (Input_Context); 1786 XSetICFocus (Input_Context);
1687 } 1787 }
1688#endif 1788#endif
1689#if CURSOR_BLINK 1789#if CURSOR_BLINK
1690 if (option (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
… …
1697 scr_recolour (); 1797 scr_recolour ();
1698 } 1798 }
1699#endif 1799#endif
1700#if ENABLE_FRILLS 1800#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1801 if (option (Opt_urgentOnBell))
1702 { 1802 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1803#endif
1710 }
1711}
1712 1804
1713void 1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1806 }
1807}
1808
1809void ecb_cold
1714rxvt_term::focus_out () 1810rxvt_term::focus_out ()
1715{ 1811{
1716 if (focus) 1812 if (focus)
1717 { 1813 {
1718 focus = 0; 1814 focus = 0;
1719 want_refresh = 1; 1815 want_refresh = 1;
1720 1816
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1817#if ENABLE_FRILLS
1722 1818 if (option (Opt_urgentOnBell))
1819 set_urgency (0);
1820#endif
1723#if ENABLE_FRILLS || ISO_14755 1821#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1822 if (iso14755buf)
1725 { 1823 {
1726 iso14755buf = 0; 1824 iso14755buf = 0;
1727# if ISO_14755 1825# if ISO_14755
… …
1744 { 1842 {
1745 pix_colors = pix_colors_unfocused; 1843 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1844 scr_recolour ();
1747 } 1845 }
1748#endif 1846#endif
1749 }
1750}
1751 1847
1752void 1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1849 }
1850}
1851
1852void ecb_cold
1753rxvt_term::update_fade_color (unsigned int idx) 1853rxvt_term::update_fade_color (unsigned int idx)
1754{ 1854{
1755#if OFF_FOCUS_FADING 1855#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1856 if (rs[Rs_fade])
1757 { 1857 {
… …
1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1761 } 1861 }
1762#endif 1862#endif
1763} 1863}
1764 1864
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL 1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1766void 1866void ecb_hot
1767rxvt_term::rootwin_cb (XEvent &ev) 1867rxvt_term::rootwin_cb (XEvent &ev)
1768{ 1868{
1769 make_current (); 1869 make_current ();
1770 1870
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1871 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1872 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return; 1873 return;
1774 1874
1775# if ENABLE_TRANSPARENCY
1776 switch (ev.type) 1875 switch (ev.type)
1777 { 1876 {
1778 case PropertyNotify: 1877 case PropertyNotify:
1779 /* 1878 /*
1780 * if user used some Esetroot compatible prog to set the root bg, 1879 * if user used some Esetroot compatible prog to set the root bg,
1781 * use the property to determine the pixmap. We use it later on. 1880 * use the property to determine the pixmap. We use it later on.
1782 */ 1881 */
1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1884 {
1786 bgPixmap.set_root_pixmap (); 1885#if BG_IMAGE_FROM_ROOT
1886 if (option (Opt_transparent))
1887 {
1888 rxvt_img::new_from_root (this)->replace (root_img);
1787 update_background (); 1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1788 } 1893 }
1894
1789 break; 1895 break;
1790 } 1896 }
1791# endif 1897
1898 refresh_check ();
1792} 1899}
1793#endif 1900#endif
1794 1901
1795void 1902void
1796rxvt_term::button_press (XButtonEvent &ev) 1903rxvt_term::button_press (XButtonEvent &ev)
… …
1827 /* save the xbutton state (for ButtonRelease) */ 1934 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1935 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1936#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1937 if (ev.button == MEvent.button && clickintime)
1831 { 1938 {
1832 /* same button, within alloted time */ 1939 /* same button, within allowed time */
1833 MEvent.clicks++; 1940 MEvent.clicks++;
1834 1941
1835 if (MEvent.clicks > 1) 1942 if (MEvent.clicks > 1)
1836 { 1943 {
1837 /* only report double clicks */ 1944 /* only report double clicks */
… …
1909 } 2016 }
1910 2017
1911 /* 2018 /*
1912 * Scrollbar window processing of button press 2019 * Scrollbar window processing of button press
1913 */ 2020 */
1914 if (isScrollbarWindow (ev.window)) 2021 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 2022 {
1916 scrollBar.setIdle (); 2023 page_dirn direction = NO_DIR;
2024
2025 if (scrollBar.upButton (ev.y))
2026 direction = UP; /* up */
2027 else if (scrollBar.dnButton (ev.y))
2028 direction = DN; /* down */
2029
2030 scrollBar.state = SB_STATE_IDLE;
1917 /* 2031 /*
1918 * Rxvt-style scrollbar: 2032 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 2033 * move up if mouse is above slider
1920 * move dn if mouse is below slider 2034 * move dn if mouse is below slider
1921 * 2035 *
… …
1930 /* 2044 /*
1931 * Mouse report disabled scrollbar: 2045 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 2046 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 2047 * click on scrollbar - send pageup/down
1934 */ 2048 */
1935 if ((scrollBar.style == R_SB_NEXT 2049 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 2050 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 2051 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 2052 tt_printf ("\033[B");
1945 else 2053 else
1946 switch (ev.button) 2054 switch (ev.button)
1947 { 2055 {
1948 case Button2: 2056 case Button2:
… …
1956 break; 2064 break;
1957 } 2065 }
1958 } 2066 }
1959 else 2067 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2068#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2069 {
1967 if (scrollbarnext_upButton (ev.y)) 2070 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2071 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2073 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2074 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2075#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2076 if (scr_page (direction, 1))
1987 { 2077 {
1988 if (upordown < 0) 2078 if (direction == UP)
1989 scrollBar.setUp (); 2079 scrollBar.state = SB_STATE_UP;
1990 else 2080 else
1991 scrollBar.setDn (); 2081 scrollBar.state = SB_STATE_DOWN;
1992 } 2082 }
1993 } 2083 }
1994 else 2084 else
1995 switch (ev.button) 2085 switch (ev.button)
1996 { 2086 {
1997 case Button2: 2087 case Button2:
1998 switch (scrollbar_align) 2088 switch (scrollBar.align)
1999 { 2089 {
2000 case R_SB_ALIGN_TOP: 2090 case SB_ALIGN_TOP:
2001 csrO = 0; 2091 csrO = 0;
2002 break; 2092 break;
2003 case R_SB_ALIGN_CENTRE: 2093 case SB_ALIGN_CENTRE:
2004 csrO = (scrollBar.bot - scrollBar.top) / 2; 2094 csrO = (scrollBar.bot - scrollBar.top) / 2;
2005 break; 2095 break;
2006 case R_SB_ALIGN_BOTTOM: 2096 case SB_ALIGN_BOTTOM:
2007 csrO = scrollBar.bot - scrollBar.top; 2097 csrO = scrollBar.bot - scrollBar.top;
2008 break; 2098 break;
2009 } 2099 }
2010 2100
2011 if (scrollBar.style == R_SB_XTERM 2101 if (scrollBar.style == SB_STYLE_XTERM
2012 || scrollbar_above_slider (ev.y) 2102 || scrollBar.above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2103 || scrollBar.below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2104 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2015 2105
2016 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
2017 break; 2107 break;
2018 2108
2019 case Button1: 2109 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2110 if (scrollBar.align == SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2111 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2112 /* FALLTHROUGH */
2023 2113
2024 case Button3: 2114 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2115 if (scrollBar.style != SB_STYLE_XTERM)
2026 { 2116 {
2027 if (scrollbar_above_slider (ev.y)) 2117 if (scrollBar.above_slider (ev.y))
2028# ifdef RXVT_SCROLL_FULL 2118# ifdef RXVT_SCROLL_FULL
2029 scr_page (UP, nrow - 1); 2119 scr_page (UP, nrow - 1);
2030# else 2120# else
2031 scr_page (UP, nrow / 4); 2121 scr_page (UP, nrow / 4);
2032# endif 2122# endif
2033 else if (scrollbar_below_slider (ev.y)) 2123 else if (scrollBar.below_slider (ev.y))
2034# ifdef RXVT_SCROLL_FULL 2124# ifdef RXVT_SCROLL_FULL
2035 scr_page (DN, nrow - 1); 2125 scr_page (DN, nrow - 1);
2036# else 2126# else
2037 scr_page (DN, nrow / 4); 2127 scr_page (DN, nrow / 4);
2038# endif 2128# endif
2039 else 2129 else
2040 scrollBar.setMotion (); 2130 scrollBar.state = SB_STATE_MOTION;
2041 } 2131 }
2042 else 2132 else
2043 { 2133 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2134 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2135 (nrow
2046 * scrollbar_position (ev.y) 2136 * scrollBar.position (ev.y)
2047 / scrollbar_size ())); 2137 / scrollBar.size ()));
2048 } 2138 }
2049 2139
2050 break; 2140 break;
2051 } 2141 }
2052 } 2142 }
… …
2062 2152
2063 csrO = 0; /* reset csr Offset */ 2153 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2154 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2155 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2156
2067 if (scrollbar_isUpDn ()) 2157 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2068 { 2158 {
2069 scrollBar.setIdle (); 2159 scrollBar.state = SB_STATE_IDLE;
2070 scrollbar_show (0); 2160 scrollBar.show (0);
2071 } 2161 }
2072 2162
2073#ifdef SELECTION_SCROLLING 2163#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2164 sel_scroll_ev.stop();
2075#endif 2165#endif
… …
2124 case Button3: 2214 case Button3:
2125 selection_make (ev.time); 2215 selection_make (ev.time);
2126 break; 2216 break;
2127 2217
2128 case Button2: 2218 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2219 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2220 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2221 break;
2132 2222
2133#ifdef MOUSE_WHEEL 2223#ifdef MOUSE_WHEEL
2134 case Button4: 2224 case Button4:
2135 case Button5: 2225 case Button5:
2136 { 2226 {
2137 int i; 2227 int lines;
2138 page_dirn v; 2228 page_dirn dirn;
2139 2229
2140 v = ev.button == Button4 ? UP : DN; 2230 dirn = ev.button == Button4 ? UP : DN;
2141 2231
2142 if (ev.state & ShiftMask) 2232 if (ev.state & ShiftMask)
2143 i = 1; 2233 lines = 1;
2144 else if (option (Opt_mouseWheelScrollPage)) 2234 else if (option (Opt_mouseWheelScrollPage))
2145 i = nrow - 1; 2235 lines = nrow - 1;
2146 else 2236 else
2147 i = 5; 2237 lines = 5;
2148 2238
2149# ifdef MOUSE_SLIP_WHEELING 2239# ifdef MOUSE_SLIP_WHEELING
2150 if (ev.state & ControlMask) 2240 if (ev.state & ControlMask)
2151 { 2241 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2242 mouse_slip_wheel_speed += dirn;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2243 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2244
2156 if (!slip_wheel_ev.is_active ()) 2245 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2246 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2247 }
2159 else 2248 else
2249# endif
2160 { 2250 {
2161# endif
2162 scr_page (v, i); 2251 scr_page (dirn, lines);
2163 scrollbar_show (1); 2252 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2253 }
2166# endif
2167 } 2254 }
2168 break; 2255 break;
2169#endif 2256#endif
2170 } 2257 }
2171 } 2258 }
2172} 2259}
2173 2260
2174/*}}} */ 2261/*}}} */
2175 2262
2176bool 2263void ecb_hot
2177rxvt_term::cmd_parse () 2264rxvt_term::cmd_parse ()
2178{ 2265{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2266 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2267 char *seq_begin; // remember start of esc-sequence here
2182 2268
2183 for (;;) 2269 for (;;)
2184 { 2270 {
2185 if (ch == NOCHAR) 2271 if (ecb_unlikely (ch == NOCHAR))
2186 { 2272 {
2187 seq_begin = cmdbuf_ptr; 2273 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2274 ch = next_char ();
2189 2275
2190 if (ch == NOCHAR) 2276 if (ch == NOCHAR)
2191 break; 2277 break;
2192 } 2278 }
2193 2279
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2280 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2281 {
2196 if (!seen_input) 2282 if (ecb_unlikely (!seen_input))
2197 { 2283 {
2198 seen_input = 1; 2284 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2285 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2286 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2287 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2300 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2301 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2302
2217 for (;;) 2303 for (;;)
2218 { 2304 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2305 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2306 break;
2221 2307
2222 *str++ = ch; 2308 *str++ = ch;
2223 2309
2224 if (ch == C0_LF || str >= eol) 2310 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2311 {
2226 if (ch == C0_LF) 2312 if (ch == C0_LF)
2227 nlines++; 2313 nlines++;
2228 2314
2229 refresh_count++; 2315 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2364 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2365 * if skipScroll is enabled.
2280 */ 2366 */
2281 if (refreshnow) 2367 if (refreshnow)
2282 { 2368 {
2283 flag = true;
2284 scr_refresh (); 2369 scr_refresh ();
2285 want_refresh = 1; 2370 want_refresh = 1;
2286 } 2371 }
2287
2288 } 2372 }
2289 else 2373 else
2290 { 2374 {
2291 try 2375 try
2292 { 2376 {
… …
2300 } 2384 }
2301 2385
2302 ch = NOCHAR; 2386 ch = NOCHAR;
2303 } 2387 }
2304 } 2388 }
2305
2306 return flag;
2307} 2389}
2308 2390
2309// read the next character 2391// read the next character
2310wchar_t 2392wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2393rxvt_term::next_char () NOTHROW
2312{ 2394{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2395 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2396 {
2315 // assume 7-bit to be ascii ALWAYS 2397 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2399 return *cmdbuf_ptr++;
2318 2400
2319 wchar_t wc; 2401 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2402 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2403
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2407 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2408 break;
2327 } 2409 }
2328 2410
2329 if (len == (size_t)-1) 2411 if (len == (size_t)-1)
2412 {
2413 mbstate.reset (); // reset now undefined conversion state
2414 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2415 // in which case we "erroneously" return the next byte which might be valid.
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2416 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2417 }
2331 2418
2332 // assume wchar == unicode 2419 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2420 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2421 return wc & UNICODE_MASK;
2335 } 2422 }
2336 2423
2337 return NOCHAR; 2424 return NOCHAR;
2338} 2425}
2339 2426
2340// read the next octet 2427// read the next octet
2341uint32_t 2428uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2429rxvt_term::next_octet () NOTHROW
2343{ 2430{
2344 return cmdbuf_ptr < cmdbuf_endp 2431 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2432 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2433 : NOCHAR;
2347} 2434}
2348 2435
2349static class out_of_input out_of_input; 2436static class out_of_input out_of_input;
2350 2437
2351/* rxvt_cmd_getc () - Return next input character */ 2438wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2439rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2440{
2359 wchar_t c = next_char (); 2441 wchar_t c = next_char ();
2360 2442
2361 if (c == NOCHAR) 2443 if (c == NOCHAR)
2362 throw out_of_input; 2444 throw out_of_input;
2363 2445
2364 return c; 2446 return c;
2365} 2447}
2366 2448
2367uint32_t 2449uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2450rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2451{
2370 uint32_t c = next_octet (); 2452 uint32_t c = next_octet ();
2371 2453
2372 if (c == NOCHAR) 2454 if (c == NOCHAR)
… …
2376} 2458}
2377 2459
2378/*{{{ print pipe */ 2460/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2461/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2462#ifdef PRINTPIPE
2381FILE * 2463FILE * ecb_cold
2382rxvt_term::popen_printer () 2464rxvt_term::popen_printer ()
2383{ 2465{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2466 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2467
2386 if (stream == NULL) 2468 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2469 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2470
2389 return stream; 2471 return stream;
2390} 2472}
2391 2473
2392int 2474int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2475rxvt_term::pclose_printer (FILE *stream)
2394{ 2476{
2395 fflush (stream); 2477 fflush (stream);
2396 return pclose (stream); 2478 return pclose (stream);
2397} 2479}
2398 2480
2399/* 2481/*
2400 * simulate attached vt100 printer 2482 * simulate attached vt100 printer
2401 */ 2483 */
2402void 2484void ecb_cold
2403rxvt_term::process_print_pipe () 2485rxvt_term::process_print_pipe ()
2404{ 2486{
2405 int done; 2487 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2488
2408 if ((fd = popen_printer ()) == NULL) 2489 if (!fd)
2409 return; 2490 return;
2410 2491
2411 /* 2492 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2493 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2494 * is received.
2414 */ 2495 */
2415 for (done = 0; !done;) 2496 for (int done = 0; !done; )
2416 { 2497 {
2417 unsigned char buf[8]; 2498 unsigned char buf[8];
2418 unicode_t ch; 2499 unicode_t ch;
2419 unsigned int i, len; 2500 unsigned int i, len;
2420 2501
… …
2454 pclose_printer (fd); 2535 pclose_printer (fd);
2455} 2536}
2456#endif /* PRINTPIPE */ 2537#endif /* PRINTPIPE */
2457/*}}} */ 2538/*}}} */
2458 2539
2459/* *INDENT-OFF* */
2460enum { 2540enum {
2461 C1_40 = 0x40, 2541 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2542 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2543 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2544 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2545 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2546};
2467/* *INDENT-ON* */
2468 2547
2469/*{{{ process non-printing single characters */ 2548/*{{{ process non-printing single characters */
2470void 2549void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2550rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2551{
2473 switch (ch) 2552 switch (ch)
2474 { 2553 {
2475 case C0_ESC: 2554 case C0_ESC:
… …
2521} 2600}
2522/*}}} */ 2601/*}}} */
2523 2602
2524 2603
2525/*{{{ process VT52 escape sequences */ 2604/*{{{ process VT52 escape sequences */
2526void 2605void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2606rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2607{
2529 int row, col; 2608 int row, col;
2530 2609
2531 switch (ch) 2610 switch (ch)
… …
2565 break; 2644 break;
2566 case 'Z': /* identify the terminal type */ 2645 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2646 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2647 break;
2569 case '<': /* turn off VT52 mode */ 2648 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2649 priv_modes &= ~PrivMode_vt52;
2571 break; 2650 break;
2572 case 'F': /* use special graphics character set */ 2651 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2652 case 'G': /* use regular character set */
2574 /* unimplemented */ 2653 /* unimplemented */
2575 break; 2654 break;
… …
2581} 2660}
2582/*}}} */ 2661/*}}} */
2583 2662
2584 2663
2585/*{{{ process escape sequences */ 2664/*{{{ process escape sequences */
2586void 2665void ecb_hot
2587rxvt_term::process_escape_seq () 2666rxvt_term::process_escape_seq ()
2588{ 2667{
2589 unicode_t ch = cmd_getc (); 2668 unicode_t ch = cmd_getc ();
2590 2669
2591 if (priv_modes & PrivMode_vt52) 2670 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2673 return;
2595 } 2674 }
2596 2675
2597 switch (ch) 2676 switch (ch)
2598 { 2677 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2678 case '#':
2601 if (cmd_getc () == '8') 2679 if (cmd_getc () == '8')
2602 scr_E (); 2680 scr_E ();
2603 break; 2681 break;
2604 case '(': 2682 case '(':
… …
2627#if !ENABLE_MINIMAL 2705#if !ENABLE_MINIMAL
2628 case '9': 2706 case '9':
2629 scr_forwardindex (); 2707 scr_forwardindex ();
2630 break; 2708 break;
2631#endif 2709#endif
2710 // DECPAM/DECPNM
2632 case '=': 2711 case '=':
2712 priv_modes |= PrivMode_aplKP;
2713 break;
2633 case '>': 2714 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2715 priv_modes &= ~PrivMode_aplKP;
2635 break; 2716 break;
2636 2717
2637 case C1_40: 2718 case C1_40:
2638 cmd_getc (); 2719 cmd_getc ();
2639 break; 2720 break;
… …
2643 2724
2644 /* 8.3.87: NEXT LINE */ 2725 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2726 case C1_NEL: /* ESC E */
2646 { 2727 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2728 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2730 }
2650 break; 2731 break;
2651 2732
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2733 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2734 case C1_ESA: /* ESC G */
2654 process_graphics (); 2735 // used by original rxvt for rob nations own graphics mode
2736 if (cmd_getc () == 'Q')
2737 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2738 break;
2656 2739
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2740 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2741 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2742 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2746 case C1_RI: /* ESC M */
2664 scr_index (DN); 2747 scr_index (DN);
2665 break; 2748 break;
2666 2749
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2750 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2751 /* case C1_SS2: break; */
2669 2752
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2753 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2754 /* case C1_SS3: break; */
2672 2755
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2756 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2757 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2758 process_dcs_seq ();
2676 break; 2759 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2761 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2762 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2763 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2764 break; /* steal obsolete ESC [ c */
2682 2765
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2766 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2767 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2768 process_csi_seq ();
2686 break; 2769 break;
2687 2770
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2771 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2772 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2773 process_osc_seq ();
2691 break; 2774 break;
2692 2775
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2776 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2777 case 'c':
2695 mbstate.reset (); 2778 mbstate.reset ();
2696 scr_poweron (); 2779 scr_poweron ();
2697 scrollbar_show (1); 2780 scrollBar.show (1);
2698 break; 2781 break;
2699 2782
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2783 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2784 case 'n':
2702 scr_charset_choose (2); 2785 scr_charset_choose (2);
… …
2709 } 2792 }
2710} 2793}
2711/*}}} */ 2794/*}}} */
2712 2795
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2796/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2797enum {
2716 CSI_ICH = 0x40, 2798 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2799 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2800 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2801 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2804 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2805 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2806 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2807};
2726 2808
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2809#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2810 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2811 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2812#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2813 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2814
2733const unsigned char csi_defaults[] = 2815static const unsigned char csi_defaults[] =
2734 { 2816 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2817 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2818 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2819 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2820 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2821 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2822 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2825 };
2744/* *INDENT-ON* */
2745 2826
2746void 2827void ecb_hot
2747rxvt_term::process_csi_seq () 2828rxvt_term::process_csi_seq ()
2748{ 2829{
2749 unicode_t ch, priv, i; 2830 unicode_t ch, priv, prev_ch, i;
2750 unsigned int nargs, p; 2831 unsigned int nargs, p;
2751 int n, ndef; 2832 int n, ndef;
2752 int arg[ESC_ARGS] = { }; 2833 int arg[ESC_ARGS] = { };
2753 2834
2754 nargs = 0; 2835 nargs = 0;
2755 2836
2756 priv = 0; 2837 priv = 0;
2757 ch = cmd_getc (); 2838 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2839 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2840 {
2760 /* '<' '=' '>' '?' */ 2841 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2842 priv = ch;
2762 ch = cmd_getc (); 2843 ch = cmd_getc ();
2763 } 2844 }
2764 2845
2846 prev_ch = 0;
2765 /* read any numerical arguments */ 2847 /* read any numerical arguments */
2766 for (n = -1; ch < CSI_ICH; ) 2848 for (n = -1; ch < CSI_ICH; )
2767 { 2849 {
2768 if (isdigit (ch)) 2850 if (isdigit (ch))
2769 { 2851 {
… …
2779 n = -1; 2861 n = -1;
2780 } 2862 }
2781 else if (IS_CONTROL (ch)) 2863 else if (IS_CONTROL (ch))
2782 process_nonprinting (ch); 2864 process_nonprinting (ch);
2783 2865
2866 prev_ch = ch;
2784 ch = cmd_getc (); 2867 ch = cmd_getc ();
2785 } 2868 }
2786 2869
2787 if (ch > CSI_7F) 2870 if (ch > CSI_7F)
2788 return; 2871 return;
… …
2814 // versions. 2897 // versions.
2815 // 2898 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2899 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2900 }
2818 break; 2901 break;
2902
2819 case '?': 2903 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2904 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2905 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2906 break;
2907
2908 case '!':
2909 if (ch == CSI_70)
2910 {
2911 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2912 scr_soft_reset ();
2913
2914 static const int pm_h[] = { 7, 25 };
2915 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2916
2917 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2918 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2919 }
2920 break;
2921 }
2922
2824 return; 2923 return;
2825 } 2924 }
2826 2925
2827 switch (ch) 2926 switch (ch)
2828 { 2927 {
… …
2842 } 2941 }
2843 break; 2942 break;
2844#endif 2943#endif
2845 2944
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2945 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2946 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2947 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2948 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2949 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2951 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2952 break;
2854 2953
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3006 scr_insert_mode (1); 3105 scr_insert_mode (1);
3007 else if (arg[0] == 20) 3106 else if (arg[0] == 20)
3008 priv_modes |= PrivMode_LFNL; 3107 priv_modes |= PrivMode_LFNL;
3009 break; 3108 break;
3010 3109
3110 case CSI_71: // DESCUSR: set cursor style
3111 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]);
3113 break;
3114
3011 /* 3115 /*
3012 * PRIVATE USE beyond this point. All CSI_7? sequences here 3116 * PRIVATE USE beyond this point. All CSI_7? sequences here
3013 */ 3117 */
3014 case CSI_72: /* DECSTBM: set top and bottom margins */ 3118 case CSI_72: /* DECSTBM: set top and bottom margins */
3015 if (nargs == 1) 3119 if (nargs == 1)
… …
3043 } 3147 }
3044} 3148}
3045/*}}} */ 3149/*}}} */
3046 3150
3047#if !ENABLE_MINIMAL 3151#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3152void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3153rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3154{
3052 int x, y; 3155 int x, y;
3053 XWindowAttributes wattr; 3156 XWindowAttributes wattr;
… …
3062 { 3165 {
3063 /* 3166 /*
3064 * commands 3167 * commands
3065 */ 3168 */
3066 case 1: /* deiconify window */ 3169 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3170 XMapWindow (dpy, parent);
3068 break; 3171 break;
3069 case 2: /* iconify window */ 3172 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3173 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3174 break;
3072 case 3: /* set position (pixels) */ 3175 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3176 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3177 break;
3075 case 4: /* set size (pixels) */ 3178 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3179 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3180 break;
3078 case 5: /* raise window */ 3181 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3182 XRaiseWindow (dpy, parent);
3080 break; 3183 break;
3081 case 6: /* lower window */ 3184 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3185 XLowerWindow (dpy, parent);
3083 break; 3186 break;
3084 case 7: /* refresh window */ 3187 case 7: /* refresh window */
3085 scr_touch (true); 3188 scr_touch (true);
3086 break; 3189 break;
3087 case 8: /* set size (chars) */ 3190 case 8: /* set size (chars) */
… …
3090 break; 3193 break;
3091 3194
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3195 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3196 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3197 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3198 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3199 (unsigned int) (args[1] * fheight));
3097 break; 3200 break;
3098 3201
3099 /* 3202 /*
3100 * reports - some output format copied from XTerm 3203 * reports - some output format copied from XTerm
3101 */ 3204 */
3102 case 11: /* report window state */ 3205 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3207 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3208 break;
3106 case 13: /* report window position */ 3209 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3211 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3212 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3213 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3214 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3215 break;
3113 case 14: /* report window size (pixels) */ 3216 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3217 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3218 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3219 break;
3117 case 18: /* report text area size (chars) */ 3220 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3221 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3222 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3225 break;
3123 case 20: /* report icon label */ 3226 case 20: /* report icon label */
3124 { 3227 {
3125 char *s; 3228 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3229 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3231 XFree (s);
3129 } 3232 }
3130 break; 3233 break;
3131 case 21: /* report window title */ 3234 case 21: /* report window title */
3132 { 3235 {
3133 char *s; 3236 char *s;
3134 XFetchName (dpy, parent[0], &s); 3237 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3238 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3239 XFree (s);
3137 } 3240 }
3138 break; 3241 break;
3139 } 3242 }
… …
3149rxvt_term::get_to_st (unicode_t &ends_how) 3252rxvt_term::get_to_st (unicode_t &ends_how)
3150{ 3253{
3151 unicode_t ch; 3254 unicode_t ch;
3152 bool seen_esc = false; 3255 bool seen_esc = false;
3153 unsigned int n = 0; 3256 unsigned int n = 0;
3154 wchar_t string[STRING_MAX]; 3257 wchar_t string[CBUFSIZ];
3155 3258
3156 while ((ch = cmd_getc ()) != NOCHAR) 3259 while ((ch = cmd_getc ()) != NOCHAR)
3157 { 3260 {
3158 if (seen_esc) 3261 if (seen_esc)
3159 { 3262 {
… …
3174 else if (ch < 0x20) 3277 else if (ch < 0x20)
3175 return NULL; /* other control character - exit */ 3278 return NULL; /* other control character - exit */
3176 3279
3177 seen_esc = false; 3280 seen_esc = false;
3178 3281
3179 if (n >= STRING_MAX - 1) 3282 if (n >= sizeof (string) - 1)
3180 // stop at some sane length 3283 // stop at some sane length
3181 return NULL; 3284 return NULL;
3182 3285
3183 string[n++] = ch; 3286 string[n++] = ch;
3184 } 3287 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3298 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3299 */
3197void 3300void
3198rxvt_term::process_dcs_seq () 3301rxvt_term::process_dcs_seq ()
3199{ 3302{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3303 /*
3204 * Not handled yet 3304 * Not handled yet
3205 */ 3305 */
3306
3307 unicode_t eh;
3206 s = get_to_st (eh); 3308 char *s = get_to_st (eh);
3207 if (s) 3309 if (s)
3208 free (s); 3310 free (s);
3209 3311
3210 return; 3312 return;
3211} 3313}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3317 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3318 */
3217void 3319void
3218rxvt_term::process_osc_seq () 3320rxvt_term::process_osc_seq ()
3219{ 3321{
3220 unicode_t ch, eh;
3221 int arg; 3322 int arg;
3222 3323
3223 ch = cmd_getc (); 3324 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3325 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3326 arg = arg * 10 + (ch - '0');
3226 3327
3227 if (ch == ';') 3328 if (ch == ';')
3228 { 3329 {
3330 unicode_t eh;
3229 char *s = get_to_st (eh); 3331 char *s = get_to_st (eh);
3230 3332
3231 if (s) 3333 if (s)
3232 { 3334 {
3233 process_xterm_seq (arg, s, eh); 3335 process_xterm_seq (arg, s, eh);
… …
3257 3359
3258/* 3360/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3361 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3362 */
3261void 3363void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3364rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3365{
3264 int color; 3366 int color;
3265 char *buf, *name; 3367 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3368 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3369 int saveop = op;
… …
3294 unsigned long bytes_after; 3396 unsigned long bytes_after;
3295 unsigned char *value = 0; 3397 unsigned char *value = 0;
3296 const char *str = ""; 3398 const char *str = "";
3297 3399
3298 if (prop 3400 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3401 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3402 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3403 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3404 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3405 && actual_type != None
3304 && actual_format == 8) 3406 && actual_format == 8)
3305 str = (const char *)(value); 3407 str = (const char *)(value);
3306 3408
3307 tt_printf ("\033]%d;%s%c", op, str, resp); 3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3308 3410
3309 XFree (value); 3411 XFree (value);
3310 } 3412 }
3311 else 3413 else
3312 { 3414 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3415 char *eq = strchr (str, '=');
3314 3416
3315 if (eq) 3417 if (eq)
3316 { 3418 {
3317 *eq = 0; 3419 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3420 set_utf8_property (display->atom (str), eq + 1);
3319 } 3421 }
3320 else 3422 else
3321 XDeleteProperty (dpy, parent[0], 3423 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3424 display->atom (str));
3323 } 3425 }
3324 break; 3426 break;
3325 3427
3326 case XTerm_Color: 3428 case XTerm_Color:
… …
3339 *buf++ = '\0'; 3441 *buf++ = '\0';
3340 3442
3341 process_color_seq (op, color, name, resp); 3443 process_color_seq (op, color, name, resp);
3342 } 3444 }
3343 break; 3445 break;
3446 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3447 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3448 process_color_seq (op, Color_fg, str, resp);
3346 break; 3449 break;
3450 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3451 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3452 process_color_seq (op, Color_bg, str, resp);
3349 break; 3453 break;
3350#ifndef NO_CURSORCOLOR 3454#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3455 case XTerm_Color_cursor:
… …
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3460 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3461 break;
3358 case XTerm_Color_pointer_bg: 3462 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3463 process_color_seq (op, Color_pointer_bg, str, resp);
3360 break; 3464 break;
3465#ifdef OPTION_HC
3466 case XTerm_Color_HC:
3467 process_color_seq (op, Color_HC, str, resp);
3468 break;
3469 case XTerm_Color_HTC:
3470 process_color_seq (op, Color_HTC, str, resp);
3471 break;
3472#endif
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3473#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3474 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3475 process_color_seq (op, Color_BD, str, resp);
3368 break; 3476 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3477 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3478 process_color_seq (op, Color_UL, str, resp);
3372 break; 3479 break;
3373 case URxvt_Color_IT: 3480 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3481 process_color_seq (op, Color_IT, str, resp);
3375 break; 3482 break;
3376#endif 3483#endif
3377#if ENABLE_TRANSPARENCY 3484 case URxvt_Color_border:
3485 process_color_seq (op, Color_border, str, resp);
3486 break;
3487
3488#if BG_IMAGE_FROM_ROOT
3378 case URxvt_Color_tint: 3489 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3490 process_color_seq (op, Color_tint, str, resp);
3380 { 3491 {
3381 bool changed = false; 3492 bool changed = false;
3493
3382 if (ISSET_PIXCOLOR (Color_tint)) 3494 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3384 else 3496
3385 changed = bgPixmap.unset_tint ();
3386 if (changed) 3497 if (changed)
3387 update_background (); 3498 update_background ();
3388 } 3499 }
3389 3500
3390 break; 3501 break;
… …
3393#if BG_IMAGE_FROM_FILE 3504#if BG_IMAGE_FROM_FILE
3394 case Rxvt_Pixmap: 3505 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3506 if (!strcmp (str, "?"))
3396 { 3507 {
3397 char str[256]; 3508 char str[256];
3509 int h_scale = fimage.h_scale;
3510 int v_scale = fimage.v_scale;
3511 int h_align = fimage.h_align;
3512 int v_align = fimage.v_align;
3398 3513
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3514 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3515 h_scale, v_scale,
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3516 h_align, v_align);
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3518 }
3404 else 3519 else
3405 { 3520 {
3406 int changed = 0; 3521 bool changed = false;
3407 3522
3408 if (*str != ';') 3523 if (*str != ';')
3409 { 3524 {
3410 /* reset to default scaling :*/ 3525 try
3411 bgPixmap.unset_geometry (); 3526 {
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3527 fimage.set_file_geometry (this, str);
3413 changed++; 3528 changed = true;
3414 str = strchr (str, ';'); 3529 }
3415 if (str == NULL) 3530 catch (const class rxvt_failure_exception &e)
3416 bgPixmap.set_defaultGeometry (); 3531 {
3532 }
3417 } 3533 }
3418 while (str) 3534 else
3419 { 3535 {
3420 str++; 3536 str++;
3421 if (bgPixmap.set_geometry (str)) 3537 if (fimage.set_geometry (str, true))
3422 changed++; 3538 changed = true;
3423 str = strchr (str, ';');
3424 } 3539 }
3540
3425 if (changed) 3541 if (changed)
3542 {
3543 if (bg_window_position_sensitive ())
3544 {
3545 int x, y;
3546 get_window_origin (x, y);
3547 parent_x = x;
3548 parent_y = y;
3549 }
3426 update_background (); 3550 update_background ();
3551 }
3427 } 3552 }
3428 break; 3553 break;
3429#endif 3554#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3555
3438 case XTerm_logfile: 3556 case XTerm_logfile:
3439 // TODO, when secure mode? 3557 // TODO, when secure mode?
3440 break; 3558 break;
3441 3559
… …
3508 break; 3626 break;
3509#endif 3627#endif
3510 3628
3511#if ENABLE_PERL 3629#if ENABLE_PERL
3512 case URxvt_perl: 3630 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3631 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3632 break;
3516#endif 3633#endif
3517 } 3634 }
3518} 3635}
3519/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3643 * 's' = save
3527 * 'r' = restore 3644 * 'r' = restore
3528 * 't' = toggle 3645 * 't' = toggle
3529 * so no need for fancy checking 3646 * so no need for fancy checking
3530 */ 3647 */
3531int 3648int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3649rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3650{
3534 int state; 3651 int state;
3535 3652
3536 if (mode == 's') 3653 if (mode == 's')
3537 { 3654 {
3538 SavedModes |= (priv_modes & bit); 3655 if (priv_modes & bit)
3656 SavedModes |= bit;
3657 else
3658 SavedModes &= ~bit;
3539 return -1; 3659 return -1;
3540 } 3660 }
3541 else 3661 else
3542 { 3662 {
3543 if (mode == 'r') 3663 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3664 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3665 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3666 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3667
3668 if (state)
3669 priv_modes |= bit;
3670 else
3671 priv_modes &= ~bit;
3548 } 3672 }
3549 3673
3550 return state; 3674 return state;
3551} 3675}
3552 3676
3553/* we're not using priv _yet_ */ 3677/* we're not using priv _yet_ */
3554void 3678void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3679rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3680{
3557 unsigned int i, j; 3681 unsigned int i, j;
3558 int state; 3682 int state;
3559 3683
3560 static const struct 3684 static const struct
3561 { 3685 {
3562 const int argval; 3686 const int argval;
3563 const unsigned long bit; 3687 const unsigned long bit;
3564 } argtopriv[] = { 3688 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3689 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3690 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3691 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3692 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3693 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3694 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3695 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3696 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3697 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3698 // 18 end FF to printer after print screen
3699 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3701#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3702 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3703#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3704 { 35, PrivMode_ShiftKeys }, // rxvt extension
3705 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3706 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3707 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3708 // 45 margin bell NYI
3583 // 46 start logging 3709 // 46 start logging
3584 { 47, PrivMode_Screen }, 3710 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3711 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3712#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3713 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3714#endif
3589 { 1000, PrivMode_MouseX11 }, 3715 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3716 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3717 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS
3719 { 1005, PrivMode_ExtModeMouse },
3720#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3722 { 1011, PrivMode_Keypress }, // rxvt extension
3723#if ENABLE_FRILLS
3724 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3725#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3726 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3727 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3728 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3729 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3730 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3731 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3732 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3733 { 2004, PrivMode_BracketPaste },
3601 }; 3734 };
3602 3735
3603 if (nargs == 0) 3736 if (nargs == 0)
3604 return; 3737 return;
3605 3738
… …
3612 for (i = 0; i < nargs; i++) 3745 for (i = 0; i < nargs; i++)
3613 { 3746 {
3614 state = -1; 3747 state = -1;
3615 3748
3616 /* basic handling */ 3749 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3750 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3751 if (argtopriv[j].argval == arg[i])
3619 { 3752 {
3620 state = privcases (mode, argtopriv[j].bit); 3753 state = privcases (mode, argtopriv[j].bit);
3621 break; 3754 break;
3622 } 3755 }
… …
3630 3763
3631 scr_touch (true); 3764 scr_touch (true);
3632 break; 3765 break;
3633#endif 3766#endif
3634 case 1048: /* alternative cursor save */ 3767 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3769 if (mode == 0)
3638 scr_cursor (RESTORE); 3770 scr_cursor (RESTORE);
3639 else if (mode == 1) 3771 else if (mode == 1)
3640 scr_cursor (SAVE); 3772 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3781 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3782 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3783 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3784 * within VT52 mode
3653 */ 3785 */
3654 PrivMode (1, PrivMode_vt52); 3786 priv_modes |= PrivMode_vt52;
3655 break; 3787 break;
3656 case 3: /* 80/132 */ 3788 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3789 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3790 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3791 break;
3660 case 4: /* smooth scrolling */ 3792 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3793 set_option (Opt_jumpScroll, !state);
3662 break; 3794 break;
3663 case 5: /* reverse video */ 3795 case 5: /* reverse video */
… …
3674 if (state) /* orthogonal */ 3806 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3807 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3808 break;
3677#ifdef scrollBar_esc 3809#ifdef scrollBar_esc
3678 case scrollBar_esc: 3810 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3811 scrollBar.map (state);
3680 {
3681 resize_all_windows (0, 0, 0); 3812 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3813 scr_touch (true);
3683 }
3684 break; 3814 break;
3685#endif 3815#endif
3686 case 25: /* visible/invisible cursor */ 3816 case 25: /* visible/invisible cursor */
3687 scr_cursor_visible (state); 3817 scr_cursor_visible (state);
3688 break; 3818 break;
… …
3701 case 1003: 3831 case 1003:
3702 if (state) 3832 if (state)
3703 { 3833 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3834 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3835 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3836 mouse_row = mouse_col = 0;
3706 vt_emask_mouse = PointerMotionMask; 3837 vt_emask_mouse = PointerMotionMask;
3707 } 3838 }
3708 else 3839 else
3709 vt_emask_mouse = NoEventMask; 3840 vt_emask_mouse = NoEventMask;
3841
3710 vt_select_input (); 3842 vt_select_input ();
3711 break; 3843 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3844 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3845 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3846 break;
3715 case 1011: /* scroll to bottom on key press */ 3847 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3848 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3849 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3850 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3852 if (!state)
3721 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854
3722 scr_change_screen (state); 3855 scr_change_screen (state);
3723 break; 3856 break;
3724 case 1049: /* secondary screen w/ clearing first */ 3857 case 1049: /* secondary screen w/ clearing first */
3858 if (option (Opt_secondaryScreen))
3859 if (state)
3860 scr_cursor (SAVE);
3861
3725 scr_change_screen (state); 3862 scr_change_screen (state);
3863
3726 if (option (Opt_secondaryScreen)) 3864 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3865 if (state)
3728 scr_erase_screen (2); 3866 scr_erase_screen (2);
3867 else
3868 scr_cursor (RESTORE);
3729 break; 3869 break;
3730 default: 3870 default:
3731 break; 3871 break;
3732 } 3872 }
3733 } 3873 }
3734} 3874}
3735/*}}} */ 3875/*}}} */
3736 3876
3737/*{{{ process sgr sequences */ 3877/*{{{ process sgr sequences */
3738void 3878void ecb_hot
3739rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3879rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3740{ 3880{
3741 unsigned int i; 3881 unsigned int i;
3742 short rendset; 3882 short rendset;
3743 int rendstyle; 3883 int rendstyle;
… …
3884 break; 4024 break;
3885#endif 4025#endif
3886 } 4026 }
3887 } 4027 }
3888} 4028}
3889/*}}} */
3890 4029
3891/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3892void 4030void
3893rxvt_term::process_graphics () 4031rxvt_term::set_cursor_style (int style)
3894{ 4032{
3895 unicode_t ch, cmd = cmd_getc (); 4033 if (!IN_RANGE_INC (style, 0, 4))
3896
3897 if (cmd == 'Q')
3898 {
3899 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 4034 return;
3902 } 4035
3903 /* swallow other graphics sequences until terminating ':' */ 4036 set_option (Opt_cursorUnderline, style >= 3);
3904 do 4037
3905 ch = cmd_getc (); 4038#ifdef CURSOR_BLINK
3906 while (ch != ':'); 4039 set_option (Opt_cursorBlink, !style || (style & 1));
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
3907} 4044}
3908/*}}} */ 4045/*}}} */
3909 4046
3910/* ------------------------------------------------------------------------- */ 4047/* ------------------------------------------------------------------------- */
3911 4048
… …
3927 4064
3928/* ---------------------------------------------------------------------- */ 4065/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 4066/* Write data to the pty as typed by the user, pasted with the mouse,
3930 * or generated by us in response to a query ESC sequence. 4067 * or generated by us in response to a query ESC sequence.
3931 */ 4068 */
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3933 4070
3934void 4071void
3935rxvt_term::tt_write (const char *data, unsigned int len) 4072rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 4073{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3942 4079
3943 if (v_buflen == 0) 4080 if (v_buflen == 0)
3944 { 4081 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4082 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 4083
4084 max_it (written, 0);
4085
3947 if ((unsigned int)written == len) 4086 if (written == len)
3948 return; 4087 return;
3949 4088
3950 data += written; 4089 data += written;
3951 len -= written; 4090 len -= written;
3952 } 4091 }
3953 4092
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4093 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4094
3956 memcpy (v_buffer + v_buflen, data, len); 4095 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4096 v_buflen += len;
3958 4097
3959 pty_ev.set (ev::READ | ev::WRITE); 4098 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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