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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <cwchar>
54#include <csignal>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
243#endif 488#endif
244 489
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
246 { 491 {
247#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 494 {
250 unsigned int l; 495 unsigned int l;
251 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
252 497
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
306 newlen = 0; 551 newlen = 0;
307 } 552 }
308 break; 553 break;
309 554
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
529 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
530 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
531 break; 787 break;
532#undef FKEY 788#undef FKEY
533 default: 789 default:
534 newlen = 0; 790 if (len == 0
535 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
536 } 795 }
796
537 if (newlen) 797 if (newlen)
538 len = STRLEN (kbuf); 798 len = strlen (kbuf);
539 } 799 }
540 800
541 /* 801 /*
542 * Pass meta for all function keys, if 'meta' option set 802 * Pass meta for all function keys, if 'meta' option set
543 */ 803 */
… …
550 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
551 { 811 {
552 len = 1; 812 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
555 else 827 else
556 { 828 {
557#ifdef META8_OPTION 829#ifdef META8_OPTION
558 /* set 8-bit on */ 830 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 831 if (meta && (meta_char == 0x80))
… …
571 } 843 }
572 844
573 if (len <= 0) 845 if (len <= 0)
574 return; /* not mapped */ 846 return; /* not mapped */
575 847
576 if (Options & Opt_scrollTtyKeypress) 848 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 849 if (TermWin.view_start)
578 { 850 {
579 TermWin.view_start = 0; 851 TermWin.view_start = 0;
580 want_refresh = 1; 852 want_refresh = 1;
581 } 853 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 902 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 904
633 if (n > 0 && s < count) 905 if (n > 0 && s < count)
634 { 906 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 907 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 908 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 909 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 910 cmdbuf_endp -= n;
639 s += n; 911 s += n;
640 } 912 }
… …
655#endif /* MENUBAR_MAX */ 927#endif /* MENUBAR_MAX */
656 928
657void 929void
658rxvt_term::flush () 930rxvt_term::flush ()
659{ 931{
932 flush_ev.stop ();
933
660#ifdef TRANSPARENT 934#ifdef TRANSPARENT
661 if (want_full_refresh) 935 if (want_full_refresh)
662 { 936 {
663 want_full_refresh = 0; 937 want_full_refresh = 0;
664 scr_clear (); 938 scr_clear ();
665 scr_touch (false); 939 scr_touch (false);
666 want_refresh = 1;
667 } 940 }
668#endif 941#endif
669 942
670 if (want_refresh) 943 if (want_refresh)
671 { 944 {
672 scr_refresh (refresh_type); 945 scr_refresh (refresh_type);
673 scrollbar_show (1); 946 scrollbar_show (1);
674#ifdef USE_XIM 947#ifdef USE_XIM
675 IMSendSpot (); 948 IMSendSpot ();
676#endif 949#endif
677
678 } 950 }
679 951
680 display->flush (); 952 display->flush ();
681} 953}
682 954
… …
684rxvt_term::check_cb (check_watcher &w) 956rxvt_term::check_cb (check_watcher &w)
685{ 957{
686 SET_R (this); 958 SET_R (this);
687 SET_LOCALE (locale); 959 SET_LOCALE (locale);
688 960
961 display->flush ();
962
963 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01);
965}
966
967void
968rxvt_term::flush_cb (time_watcher &w)
969{
970 SET_R (this);
971 SET_LOCALE (locale);
972
973 refresh_limit = 1;
974 refresh_count = 0;
689 flush (); 975 flush ();
690} 976}
691 977
692#ifdef CURSOR_BLINK 978#ifdef CURSOR_BLINK
693void 979void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 997 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 998 }
713} 999}
714#endif 1000#endif
715 1001
1002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1003void
1004rxvt_term::cont_scroll_cb (time_watcher &w)
1005{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 }
1013}
1014#endif
1015
1016#ifdef SELECTION_SCROLLING
1017void
1018rxvt_term::sel_scroll_cb (time_watcher &w)
1019{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 }
1027}
1028#endif
1029
1030#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1031void
1032rxvt_term::slip_wheel_cb (time_watcher &w)
1033{
1034 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed))
1037 {
1038 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 }
1042}
1043#endif
1044
716bool 1045bool
717rxvt_term::pty_fill () 1046rxvt_term::pty_fill ()
718{ 1047{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049
1050 if (CBUFSIZ == n)
1051 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0;
1054 }
720 1055
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1056 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1057 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1058 cmdbuf_endp = cmdbuf_ptr + n;
724 1059
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1061
727 if (n > 0) 1062 if (n > 0)
728 { 1063 {
729 cmdbuf_endp += n; 1064 cmdbuf_endp += n;
730 return true; 1065 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1075{
741 SET_R (this); 1076 SET_R (this);
742 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
743 1078
1079 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ())
1082 if (cmd_parse ())
1083 break;
1084
744 if (revents & EVENT_WRITE) 1085 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1086 pty_write ();
746 else if (revents & EVENT_READ) 1087}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1088
760 if (cmd_parse ()) 1089void
761 break; 1090rxvt_term::pointer_unblank ()
762 } 1091{
763 } 1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1093 recolour_cursor ();
1094
1095#ifdef POINTER_BLANK
1096 hidden_pointer = 0;
1097
1098 if (options & Opt_pointerBlank)
1099 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif
764} 1101}
765 1102
766#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
767void 1104void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1105rxvt_term::pointer_blank ()
781{ 1106{
782 if (! (Options & Opt_pointerBlank)) 1107 if (! (options & Opt_pointerBlank))
783 return; 1108 return;
784 1109
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1110 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1111 XFlush (display->display);
787 1112
… …
807 x = ev.x; 1132 x = ev.x;
808 y = ev.y; 1133 y = ev.y;
809 pixel_position (&x, &y); 1134 pixel_position (&x, &y);
810 1135
811 if (MEvent.button == AnyButton) 1136 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1137 button_number = 3;
814 }
815 else 1138 else
816 { 1139 {
817 button_number = MEvent.button - Button1; 1140 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1141 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1142 if (button_number >= 3)
820 button_number += (64 - 3); 1143 button_number += (64 - 3);
821 } 1144 }
822 1145
823 if (PrivateModes & PrivMode_MouseX10) 1146 if (priv_modes & PrivMode_MouseX10)
824 { 1147 {
825 /* 1148 /*
826 * do not report ButtonRelease 1149 * do not report ButtonRelease
827 * no state info allowed 1150 * no state info allowed
828 */ 1151 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1166 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1167 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1168#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1169 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1170#endif
848
849 } 1171 }
850 1172
851#ifdef DEBUG_MOUSEREPORT 1173#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1174 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1175 if (key_state & 16)
854 fputc ('C', stderr); 1176 fputc ('C', stderr);
855 if (key_state & 4) 1177 if (key_state & 4)
856 fputc ('S', stderr); 1178 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1182 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1183 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1184 button_number,
863 x + 1, 1185 x + 1,
864 y + 1); 1186 y + 1);
865#else 1187#endif
1188
866 tt_printf ("\033[M%c%c%c", 1189 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1190 (32 + button_number + key_state),
868 (32 + x + 1), 1191 (32 + x + 1),
869 (32 + y + 1)); 1192 (32 + y + 1));
870#endif
871} 1193}
872 1194
873#ifdef USING_W11LIB 1195#ifdef USING_W11LIB
874void 1196void
875rxvt_W11_process_x_event (XEvent *ev) 1197rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1208{
887 SET_R (this); 1209 SET_R (this);
888 SET_LOCALE (locale); 1210 SET_LOCALE (locale);
889 1211
890#if defined(CURSOR_BLINK) 1212#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1214 {
893 if (hidden_cursor) 1215 if (hidden_cursor)
894 { 1216 {
895 hidden_cursor = 0; 1217 hidden_cursor = 0;
896 want_refresh = 1; 1218 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1222 }
901#endif 1223#endif
902 1224
903#if defined(POINTER_BLANK) 1225#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1227 {
906 if (ev.type == MotionNotify 1228 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1229 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1230 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1231 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1234 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1235 pointer_blank ();
914 } 1236 }
915#endif 1237#endif
916 1238
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1239 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1240 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1241 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1242
975 switch (ev.type) 1243 switch (ev.type)
976 { 1244 {
977 case KeyPress: 1245 case KeyPress:
1246#if ISO_14755
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
978 lookup_key (ev.xkey); 1249 lookup_key (ev.xkey);
1250
1251 break;
1252
1253 case KeyRelease:
1254 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
979 break; 1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
980 1314
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1316 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1319 mouse_slip_wheel_speed = 0;
986 else 1320#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1321 break;
995 } 1322 }
996#endif
997 1323
998 case ButtonPress: 1324 case ButtonPress:
999 button_press (ev.xbutton); 1325 button_press (ev.xbutton);
1000 break; 1326 break;
1001 1327
… …
1013 && (ev.xclient.data.l[0] == DndFile 1339 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1340 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1341 || ev.xclient.data.l[0] == DndLink))
1016 { 1342 {
1017 /* Get Dnd data */ 1343 /* Get Dnd data */
1018 Atom ActualType; 1344 Atom ActualType;
1019 int ActualFormat; 1345 int ActualFormat;
1020 unsigned char *data; 1346 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1347 unsigned long Size, RemainingBytes;
1022 1348
1023 XGetWindowProperty (display->display, display->root, 1349 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1350 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1351 0L, 1000000L,
1026 False, AnyPropertyType, 1352 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1353 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1354 &Size, &RemainingBytes,
1029 &data); 1355 &data);
1030 XChangeProperty (display->display, display->root, 1356 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1357 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1358 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1360 }
1037#endif /* OFFIX_DND */ 1361#endif /* OFFIX_DND */
1038 break; 1362 break;
1039 1363
1040 case MappingNotify: 1364 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1365 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1366 break;
1043 1367
1044 /* 1368 /*
1045 * XXX: this is not the _current_ arrangement 1369 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1370 * Here's my conclusion:
… …
1071 { 1395 {
1072 TermWin.focus = 1; 1396 TermWin.focus = 1;
1073 want_refresh = 1; 1397 want_refresh = 1;
1074#ifdef USE_XIM 1398#ifdef USE_XIM
1075 if (Input_Context != NULL) 1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1402 XSetICFocus (Input_Context);
1403 }
1077#endif 1404#endif
1078#ifdef CURSOR_BLINK 1405#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1406 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1081#endif 1415#endif
1082 1416
1083 } 1417 }
1084 break; 1418 break;
1085 1419
1086 case FocusOut: 1420 case FocusOut:
1087 if (TermWin.focus) 1421 if (TermWin.focus)
1088 { 1422 {
1089 TermWin.focus = 0; 1423 TermWin.focus = 0;
1090 want_refresh = 1; 1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1091#ifdef USE_XIM 1432#ifdef USE_XIM
1092 if (Input_Context != NULL) 1433 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1434 XUnsetICFocus (Input_Context);
1094#endif 1435#endif
1095#ifdef CURSOR_BLINK 1436#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1437 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1438 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1439 hidden_cursor = 0;
1099#endif 1440#endif
1100 1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1101 } 1448 }
1102 break; 1449 break;
1103 1450
1104 case ConfigureNotify: 1451 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1461 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1463
1117 if (szHint.width != width || szHint.height != height) 1464 if (szHint.width != width || szHint.height != height)
1118 { 1465 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1466 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1467 resize_all_windows (width, height, 1);
1121 } 1468 }
1122#ifdef DEBUG_SIZE 1469
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1471 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1472 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1473#endif
1136 } 1474 }
1475 break;
1476
1477 case PropertyNotify:
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481
1137 break; 1482 break;
1138 1483
1139 case SelectionClear: 1484 case SelectionClear:
1140 selection_clear (); 1485 selection_clear ();
1141 break; 1486 break;
1142 1487
1143 case SelectionNotify: 1488 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1489 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1490 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1491 break;
1148 1492
1149 case SelectionRequest: 1493 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1494 selection_send (ev.xselectionrequest);
1151 break; 1495 break;
… …
1172 1516
1173 case GraphicsExpose: 1517 case GraphicsExpose:
1174 case Expose: 1518 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1519 if (ev.xany.window == TermWin.vt)
1176 { 1520 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1521 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1525
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1531
1185 // ev.xexpose.width, TermWin.height, False); 1532 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1533 }
1189 else 1534 else
1190 { 1535 {
1191 XEvent unused_event; 1536 XEvent unused_event;
1192 1537
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1539 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1541 ;
1198 &unused_event)) ; 1542
1199 if (isScrollbarWindow (ev.xany.window)) 1543 if (isScrollbarWindow (ev.xany.window))
1200 { 1544 {
1201 scrollBar.setIdle (); 1545 scrollBar.setIdle ();
1202 scrollbar_show (0); 1546 scrollbar_show (0);
1203 } 1547 }
1204#ifdef MENUBAR 1548#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1550 menubar_expose ();
1207#endif 1551#endif
1552
1553#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window);
1556#endif
1208 } 1557 }
1209 break; 1558 break;
1210 1559
1211 case MotionNotify: 1560 case MotionNotify:
1212#ifdef POINTER_BLANK 1561#ifdef POINTER_BLANK
… …
1218 { 1567 {
1219 menubar_control (ev.xbutton); 1568 menubar_control (ev.xbutton);
1220 break; 1569 break;
1221 } 1570 }
1222#endif 1571#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1573 break;
1225 1574
1226 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == TermWin.vt)
1227 { 1576 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1577 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1578 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1580 ;
1232 1581
1233 XQueryPointer (display->display, TermWin.vt, 1582 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1585 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1586 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1588 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1589 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1590 {
1242#endif 1591#endif
1592#if ISO_14755
1593 // 5.4
1594 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 {
1596 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1597 break;
1598 }
1599#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1600 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1601 ev.xbutton.state & Button3Mask ? 2 : 0);
1602
1245#ifdef SELECTION_SCROLLING 1603#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1604 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1606 {
1249 int dist; 1607 int dist;
1250 1608
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1255 */ 1611 */
1256 if (scroll_selection_delay<=0) 1612 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1613 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1614
1259 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1261 */ 1617 */
1262 selection_save_x=ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1619 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1621
1267 /* calc number of lines to scroll */ 1622 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1623 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1624 {
1270 scroll_selection_dir = UP; 1625 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1626 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1627 }
1273 else 1628 else
1274 { 1629 {
1275 scroll_selection_dir = DN; 1630 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1632 }
1633
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1634 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1635 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1;
1281 MIN_IT (scroll_selection_lines, 1637 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1638 SELECTION_SCROLL_MAX_LINES);
1283 } 1639 }
1284 else 1640 else
1285 { 1641 {
1286 /* we are within the text window, so we 1642 /* we are within the text window, so we
1287 * shouldn't be scrolling 1643 * shouldn't be scrolling
1288 */ 1644 */
1289 pending_scroll_selection = 0; 1645 if (sel_scroll_ev.active)
1646 sel_scroll_ev.stop();
1290 } 1647 }
1291#endif 1648#endif
1292#ifdef MOUSE_THRESHOLD 1649#ifdef MOUSE_THRESHOLD
1293
1294 } 1650 }
1295#endif 1651#endif
1296
1297 } 1652 }
1298 } 1653 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1655 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1657 MotionNotify, &ev))
1658 ;
1659
1303 XQueryPointer (display->display, scrollBar.win, 1660 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1661 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1662 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1663 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1664 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1666 scrollbar_size ());
1310 scr_refresh (refresh_type); 1667 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1668 refresh_limit = 0;
… …
1313 } 1670 }
1314 break; 1671 break;
1315 } 1672 }
1316} 1673}
1317 1674
1675#if TRANSPARENT
1318void 1676void
1319rxvt_term::rootwin_cb (XEvent &ev) 1677rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1678{
1321 SET_R (this); 1679 SET_R (this);
1322 SET_LOCALE (locale); 1680 SET_LOCALE (locale);
1323 1681
1324 switch (ev.type) 1682 switch (ev.type)
1325 { 1683 {
1326 case PropertyNotify: 1684 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1685 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1686 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1687 * use the property to determine the pixmap. We use it later on.
1339 */ 1688 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1691 return;
1345 }
1346 1692
1347 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1348 case ReparentNotify: 1694 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1696 want_refresh = want_full_refresh = 1;
1351 break; 1697 break;
1352#endif
1353 } 1698 }
1354} 1699}
1700#endif
1355 1701
1356void 1702void
1357rxvt_term::button_press (XButtonEvent &ev) 1703rxvt_term::button_press (XButtonEvent &ev)
1358{ 1704{
1359 int reportmode = 0, clickintime; 1705 int reportmode = 0, clickintime;
1360 1706
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1708 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1709 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710
1364 /* 1711 /*
1365 * VT window processing of button press 1712 * VT window processing of button press
1366 */ 1713 */
1367 if (ev.window == TermWin.vt) 1714 if (ev.window == TermWin.vt)
1368 { 1715 {
1716#if ISO_14755
1717 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 {
1720 iso14755_54 (ev.x, ev.y);
1721 return;
1722 }
1723#endif
1724
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1725 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1726
1370 if (reportmode) 1727 if (reportmode)
1371 { 1728 {
1372 /* mouse report from vt window */ 1729 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1730 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1731 MEvent.state = ev.state;
… …
1403 } 1760 }
1404 else 1761 else
1405 { 1762 {
1406 if (ev.button != MEvent.button) 1763 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1764 MEvent.clicks = 0;
1765
1408 switch (ev.button) 1766 switch (ev.button)
1409 { 1767 {
1410 case Button1: 1768 case Button1:
1769 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */
1771#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask);
1773#else
1774 selection.rect = false;
1775#endif
1776
1411 /* allow shift+left click to extend selection */ 1777 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1779 {
1414 if (MEvent.button == Button1 && clickintime) 1780 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1781 selection_rotate (ev.x, ev.y);
1416 else 1782 else
1417 selection_extend (ev.x, ev.y, 1); 1783 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1798 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1799 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1800 selection_rotate (ev.x, ev.y);
1435 else 1801 else
1436 selection_extend (ev.x, ev.y, 1); 1802 selection_extend (ev.x, ev.y, 1);
1803
1437 MEvent.button = Button3; 1804 MEvent.button = Button3;
1438 break; 1805 break;
1439 } 1806 }
1440 } 1807 }
1808
1441 MEvent.time = ev.time; 1809 MEvent.time = ev.time;
1442 return; 1810 return;
1443 } 1811 }
1444 1812
1445 /* 1813 /*
… …
1511 upordown = 1; /* down */ 1879 upordown = 1; /* down */
1512 } 1880 }
1513 if (upordown) 1881 if (upordown)
1514 { 1882 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1883#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1884 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1885#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1886 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1887 {
1520 if (upordown < 0) 1888 if (upordown < 0)
1521 scrollBar.setUp (); 1889 scrollBar.setUp ();
… …
1537 break; 1905 break;
1538 case R_SB_ALIGN_BOTTOM: 1906 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1907 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1908 break;
1541 } 1909 }
1910
1542 if (scrollBar.style == R_SB_XTERM 1911 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1912 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1913 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1914 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1915
1547 scrollBar.setMotion (); 1916 scrollBar.setMotion ();
1548 break; 1917 break;
1549 1918
1550 case Button1: 1919 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1920 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1944 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1945 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1946 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1947 / scrollbar_size ()));
1579 } 1948 }
1949
1580 break; 1950 break;
1581 } 1951 }
1582 } 1952 }
1583 return; 1953 return;
1584 } 1954 }
… …
1596{ 1966{
1597 int reportmode = 0; 1967 int reportmode = 0;
1598 1968
1599 csrO = 0; /* reset csr Offset */ 1969 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1970 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1971 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1972
1603 if (scrollbar_isUpDn ()) 1973 if (scrollbar_isUpDn ())
1604 { 1974 {
1605 scrollBar.setIdle (); 1975 scrollBar.setIdle ();
1606 scrollbar_show (0); 1976 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1978 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1979#endif
1610
1611 } 1980 }
1981
1612#ifdef SELECTION_SCROLLING 1982#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1983 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop();
1614#endif 1985#endif
1986
1615 if (ev.window == TermWin.vt) 1987 if (ev.window == TermWin.vt)
1616 { 1988 {
1989#if ISO_14755
1990 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return;
1993#endif
1617 if (reportmode) 1994 if (reportmode)
1618 { 1995 {
1619 /* mouse report from vt window */ 1996 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1997 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1998 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2012 MEvent.button = AnyButton;
1636 mouse_report (ev); 2013 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2014#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2015 return;
1639 } 2016 }
2017
1640 /* 2018 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2019 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2020 * when overriding mouse reporting
1643 */ 2021 */
1644 if (PrivateModes & PrivMode_mouse_report 2022 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2023 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2024 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2025 selection_extend (ev.x, ev.y, 0);
1648 2026
1649 switch (ev.button) 2027 switch (ev.button)
… …
1660 case Button5: 2038 case Button5:
1661 { 2039 {
1662 int i; 2040 int i;
1663 page_dirn v; 2041 page_dirn v;
1664 2042
1665 v = (ev.button == Button4) ? UP : DN; 2043 v = ev.button == Button4 ? UP : DN;
2044
1666 if (ev.state & ShiftMask) 2045 if (ev.state & ShiftMask)
1667 i = 1; 2046 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2047 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2048 i = TermWin.nrow - 1;
1670 else 2049 else
1671 i = 5; 2050 i = 5;
2051
1672# ifdef MOUSE_SLIP_WHEELING 2052# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2053 if (ev.state & ControlMask)
1674 { 2054 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2055 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2058
2059 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061
2062 slip_wheel_ev.start ();
1677 } 2063 }
2064 else
2065 {
1678# endif 2066# endif
1679# ifdef JUMP_MOUSE_WHEEL 2067# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2068 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2069 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2070 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING
1689 } 2080 }
1690# endif 2081#endif
1691
1692 } 2082 }
1693 break; 2083 break;
1694#endif 2084#endif
1695
1696 } 2085 }
1697 } 2086 }
1698#ifdef MENUBAR 2087#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2088 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2089 menubar_control (ev);
1701#endif 2090#endif
1702} 2091}
1703 2092
1704#ifdef TRANSPARENT 2093#ifdef TRANSPARENT
1705#if TINTING 2094#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2095/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2096
1709static void 2097typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2098
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2100{
1717 /* No saturation */ 2101 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2102 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i;
1721 2107
1722 b = ((uint16_t *) ptr)[x]; 2108 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2109
1724 g = (b & 0x3e0) * gm; 2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2111
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2112 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2113 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2114 mask_g = visual->green_mask;
1729 } 2115 mask_b = visual->blue_mask;
1730 ptr += bpl; 2116
1731 } 2117 /* boring lookup table pre-initialization */
2118 switch (srcImage->bits_per_pixel) {
2119 case 15:
2120 if ((mask_r != 0x7c00) ||
2121 (mask_g != 0x03e0) ||
2122 (mask_b != 0x001f))
2123 return;
2124 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2125 lookup_r = lookup;
2126 lookup_g = lookup+32;
2127 lookup_b = lookup+32+32;
2128 sh_r = 10;
2129 sh_g = 5;
2130 sh_b = 0;
2131 break;
2132 case 16:
2133 if ((mask_r != 0xf800) ||
2134 (mask_g != 0x07e0) ||
2135 (mask_b != 0x001f))
2136 return;
2137 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2138 lookup_r = lookup;
2139 lookup_g = lookup+32;
2140 lookup_b = lookup+32+64;
2141 sh_r = 11;
2142 sh_g = 5;
2143 sh_b = 0;
2144 break;
2145 case 24:
2146 if ((mask_r != 0xff0000) ||
2147 (mask_g != 0x00ff00) ||
2148 (mask_b != 0x0000ff))
2149 return;
2150 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2151 lookup_r = lookup;
2152 lookup_g = lookup+256;
2153 lookup_b = lookup+256+256;
2154 sh_r = 16;
2155 sh_g = 8;
2156 sh_b = 0;
2157 break;
2158 case 32:
2159 if ((mask_r != 0xff0000) ||
2160 (mask_g != 0x00ff00) ||
2161 (mask_b != 0x0000ff))
2162 return;
2163 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2164 lookup_r = lookup;
2165 lookup_g = lookup+256;
2166 lookup_b = lookup+256+256;
2167 sh_r = 16;
2168 sh_g = 8;
2169 sh_b = 0;
2170 break;
2171 default:
2172 return; /* we do not support this color depth */
2173 }
2174
2175 /* prepare limits for color transformation (each channel is handled separately) */
2176 if (shade < 0) {
2177 shade = -shade;
2178 if (shade < 0) shade = 0;
2179 if (shade > 100) shade = 100;
2180
2181 lower_lim_r = 65535-rm;
2182 lower_lim_g = 65535-gm;
2183 lower_lim_b = 65535-bm;
2184
2185 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2186 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2187 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2188
2189 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2190 } else {
1733 for (y = h; --y >= 0;) { 2191 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2192 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2193
1737 b = ((uint16_t *) ptr)[x]; 2194 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2195
1739 g = (b & 0x3e0) * gm; 2196 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2197 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2198 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2199 }
1743 b |= (!(b >> 5) - 1); 2200
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2201 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2202 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2203 {
1747 } 2204 unsigned int tmp;
1748 ptr += bpl; 2205
2206 tmp = lower_lim_r;
2207 lower_lim_r = lower_lim_b;
2208 lower_lim_b = tmp;
2209
2210 tmp = upper_lim_r;
2211 upper_lim_r = upper_lim_b;
2212 upper_lim_b = tmp;
2213 }
2214
2215 /* fill our lookup tables */
2216 for (i = 0; i <= mask_r>>sh_r; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2220 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2221 lookup_r[i] = (tmp/65535)<<sh_r;
2222 }
2223 for (i = 0; i <= mask_g>>sh_g; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2227 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2228 lookup_g[i] = (tmp/65535)<<sh_g;
2229 }
2230 for (i = 0; i <= mask_b>>sh_b; i++)
2231 {
2232 RUINT32T tmp;
2233 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2234 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2235 lookup_b[i] = (tmp/65535)<<sh_b;
2236 }
2237
2238 /* apply table to input image (replacing colors by newly calculated ones) */
2239 switch (srcImage->bits_per_pixel)
2240 {
2241 case 15:
2242 {
2243 unsigned short *p1, *pf, *p, *pl;
2244 p1 = (unsigned short *) srcImage->data;
2245 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2246 while (p1 < pf)
2247 {
2248 p = p1;
2249 pl = p1 + srcImage->width;
2250 for (; p < pl; p++)
1749 } 2251 {
2252 *p = lookup_r[(*p & 0x7c00)>>10] |
2253 lookup_g[(*p & 0x03e0)>> 5] |
2254 lookup_b[(*p & 0x001f)];
2255 }
2256 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2257 }
1751} 2258 break;
1752 2259 }
1753/* RGB 16 */ 2260 case 16:
1754static void 2261 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2262 unsigned short *p1, *pf, *p, *pl;
1756{ 2263 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2264 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2265 while (p1 < pf)
1759 2266 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2267 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2268 pl = p1 + srcImage->width;
1762 /* No saturation */ 2269 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2270 {
1777 } else { 2271 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2272 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2273 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2274 }
1793 ptr += bpl; 2275 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2276 }
2277 break;
2278 }
2279 case 24:
2280 {
2281 unsigned char *p1, *pf, *p, *pl;
2282 p1 = (unsigned char *) srcImage->data;
2283 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width * 3;
2288 for (; p < pl; p += 3)
1794 } 2289 {
2290 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2291 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2292 p[2] = lookup_r[(p[2] & 0x0000ff)];
2293 }
2294 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2295 }
1796} 2296 break;
2297 }
2298 case 32:
2299 {
2300 RUINT32T *p1, *pf, *p, *pl;
2301 p1 = (RUINT32T *) srcImage->data;
2302 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2303
1798/* RGB 24 */ 2304 while (p1 < pf)
1799static void 2305 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2306 p = p1;
1801{ 2307 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2308 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2309 {
1830 } else { 2310 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2311 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2312 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2313 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2314 }
1861 ptr += bpl; 2315 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2316 }
2317 break;
2318 }
1863 } 2319 }
1864}
1865 2320
1866/* RGB 32 */ 2321 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2322}
1937
1938#endif 2323#endif
1939 2324
1940/* 2325/*
1941 * Check our parents are still who we think they are. 2326 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2327 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2337 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2338 XWindowAttributes wattr, wrootattr;
1954 2339
1955 pchanged = 0; 2340 pchanged = 0;
1956 2341
1957 if (!(Options & Opt_transparent)) 2342 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
1959 2344
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2346 rootdepth = wrootattr.depth;
1962 2347
… …
1965 if (rootdepth != wattr.depth) 2350 if (rootdepth != wattr.depth)
1966 { 2351 {
1967 if (am_transparent) 2352 if (am_transparent)
1968 { 2353 {
1969 pchanged = 1; 2354 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2356 am_transparent = am_pixmap_trans = 0;
1972 } 2357 }
1973 2358
1974 return pchanged; /* Don't try any more */ 2359 return pchanged; /* Don't try any more */
1975 } 2360 }
… …
1980 /* 2365 /*
1981 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
1984 */ 2369 */
1985 i = (xa[XA_XROOTPMAPID] 2370 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2373 &nitems, &bytes_after, &prop) == Success);
1989 2374
1990 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2376 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2379 &nitems, &bytes_after, &prop) == Success);
1995 2380
1996 if (!i || prop == NULL) 2381 if (!i || prop == NULL
2382#if TINTING
2383 || !rs[Rs_color + Color_tint]
2384#endif
2385 )
1997 have_pixmap = 0; 2386 have_pixmap = 0;
1998 else 2387 else
1999 { 2388 {
2000 have_pixmap = 1; 2389 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2390 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2391 XFree (prop);
2003 } 2392 }
2004 2393
2005 if (have_pixmap) 2394 if (have_pixmap)
2006 { 2395 {
… …
2034 sy = 0; 2423 sy = 0;
2035 } 2424 }
2036 2425
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2039 allowedxerror = -1; 2430 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2432
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2434 /* XXX: may need a delay here? */
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2454 XFreePixmap (display->display, TermWin.pixmap);
2064 2455
2065#if TINTING 2456#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2457 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2458 {
2068 unsigned short shade, rm, gm, bm; 2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2461
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2463
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2464 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2465 }
2083#endif 2466#endif
2084 2467
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2469 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2472 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2473 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2474 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2476 XClearWindow (display->display, TermWin.parent[0]);
2094 2477
2095 if (!am_transparent || !am_pixmap_trans) 2478 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2479 pchanged = 1;
2097 2480
2098 am_transparent = am_pixmap_trans = 1; 2481 am_transparent = am_pixmap_trans = 1;
2099 } 2482 }
2100 } 2483 }
2101 2484
2102 if (!am_pixmap_trans) 2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2103 { 2488 {
2104 unsigned int n; 2489 unsigned int n;
2105 /* 2490 /*
2106 * InheritPixmap transparency 2491 * InheritPixmap transparency
2107 */ 2492 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2494 {
2111 oldp = TermWin.parent[i]; 2495 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2497 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2498 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2499
2117 if (TermWin.parent[i] == display->root) 2500 if (TermWin.parent[i] == display->root)
2118 { 2501 {
2119 if (oldp != None) 2502 if (oldp != None)
2120 pchanged = 1; 2503 pchanged = 1;
… …
2131 if (pchanged) 2514 if (pchanged)
2132 { 2515 {
2133 for (; n < (unsigned int)i; n++) 2516 for (; n < (unsigned int)i; n++)
2134 { 2517 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2520 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2522 break;
2141 } 2523 }
2142 } 2524 }
2143 } 2525 }
2144 2526
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2528 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2531 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2532 /* XXX: also turn off Opt_transparent? */
2152 } 2533 }
2153 else 2534 else
2154 { 2535 {
2155#if WAIT_FOR_WM 2536#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2537 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2538 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2539 sleep (1);
2159#endif 2540#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2541 for (n = 0; n < (unsigned int)i; n++)
2542 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]);
2545 }
2163 2546
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2548 am_transparent = 1;
2166 } 2549 }
2167 2550
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2552 TermWin.parent[i] = None;
2553 }
2554
2555 if (scrollBar.win)
2556 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle ();
2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2170 } 2567 }
2171 2568
2172 return pchanged; 2569 return pchanged;
2173} 2570}
2174#endif 2571#endif
… …
2191 } 2588 }
2192 2589
2193 if (ch == NOCHAR) // TODO: improve 2590 if (ch == NOCHAR) // TODO: improve
2194 break; 2591 break;
2195 2592
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 {
2595 if (!seen_input)
2197 { 2596 {
2597 seen_input = 1;
2598 // many badly-written programs (e.g. jed) contain a race condition:
2599 // they first read the screensize and then install a SIGWINCH handler.
2600 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized.
2605 if (seen_resize)
2606 kill (-cmd_pid, SIGWINCH);
2607 }
2608
2198 /* Read a text string from the input buffer */ 2609 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2610 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2611 bool refreshnow = false;
2201 int nlines = 0; 2612 int nlines = 0;
2202 unicode_t *str = buf; 2613 unicode_t *str = buf;
2203 2614
2204 *str++ = ch;
2205
2206 for (;;) 2615 for (;;)
2207 { 2616 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2618 break;
2213 2619
2214 *str++ = ch; 2620 *str++ = ch;
2215 2621
2216 if (ch == '\n') 2622 if (ch == C0_LF)
2217 { 2623 {
2218 nlines++; 2624 nlines++;
2219 refresh_count++; 2625 refresh_count++;
2220 2626
2221 if (! (Options & Opt_jumpScroll) 2627 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2629 {
2224 refreshnow = true; 2630 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2631 ch = NOCHAR;
2227 break; 2632 break;
2228 } 2633 }
2229 2634
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2636 if (nlines >= TermWin.nrow - 1)
2232 { 2637 {
2233 scr_add_lines (buf, nlines, str - buf); 2638 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2639 nlines = 0;
2235 str = buf; 2640 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2644 if (str >= buf + UBUFSIZ)
2240 { 2645 {
2241 ch = NOCHAR; 2646 ch = NOCHAR;
2242 break; 2647 break;
2243 } 2648 }
2649
2650 seq_begin = cmdbuf_ptr;
2651 ch = next_char ();
2244 } 2652 }
2245 2653
2246 scr_add_lines (buf, nlines, str - buf); 2654 scr_add_lines (buf, nlines, str - buf);
2247 2655
2248 /* 2656 /*
2249 * If there have been a lot of new lines, then update the screen 2657 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2658 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2659 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2660 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2661 */
2257 if (refreshnow) 2662 if (refreshnow)
2258 { 2663 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2665 refresh_limit++;
2261 2666 else
2667 {
2668 flag = true;
2262 scr_refresh (refresh_type); 2669 scr_refresh (refresh_type);
2670 }
2263 } 2671 }
2264 2672
2265 } 2673 }
2266 else 2674 else
2267 { 2675 {
… …
2281 } 2689 }
2282 2690
2283 return flag; 2691 return flag;
2284} 2692}
2285 2693
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2286// read the next character 2703// read the next character
2287unicode_t 2704unicode_t
2288rxvt_term::next_char () 2705rxvt_term::next_char ()
2289{ 2706{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2707 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2723 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2725
2309 // assume wchar == unicode 2726 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2727 cmdbuf_ptr += len;
2311 return wc; 2728 return wc & UNICODE_MASK;
2312 } 2729 }
2313 2730
2314 return NOCHAR; 2731 return NOCHAR;
2315} 2732}
2316 2733
… …
2321 */ 2738 */
2322unicode_t 2739unicode_t
2323rxvt_term::cmd_getc () 2740rxvt_term::cmd_getc ()
2324{ 2741{
2325 unicode_t c = next_char (); 2742 unicode_t c = next_char ();
2743
2744 if (c == NOCHAR)
2745 throw out_of_input;
2746
2747 return c;
2748}
2749
2750unicode_t
2751rxvt_term::cmd_get8 ()
2752{
2753 unicode_t c = next_octet ();
2326 2754
2327 if (c == NOCHAR) 2755 if (c == NOCHAR)
2328 throw out_of_input; 2756 throw out_of_input;
2329 2757
2330 return c; 2758 return c;
… …
2431 process_escape_seq (); 2859 process_escape_seq ();
2432 break; 2860 break;
2433 case C0_ENQ: /* terminal Status */ 2861 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2862 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2865 else
2438 tt_write ((unsigned char *)VT100_ANS, 2866 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2867 (unsigned int)strlen (VT100_ANS));
2440 break; 2868 break;
2441 case C0_BEL: /* bell */ 2869 case C0_BEL: /* bell */
2442 scr_bell (); 2870 scr_bell ();
2443 break; 2871 break;
2444 case C0_BS: /* backspace */ 2872 case C0_BS: /* backspace */
… …
2460 break; 2888 break;
2461 case C0_SI: /* shift in - acs */ 2889 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2890 scr_charset_choose (0);
2463 break; 2891 break;
2464 2892
2893#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2894 // 8-bit controls
2466 case 0x90: /* DCS */ 2895 case 0x90: /* DCS */
2467 process_dcs_seq (); 2896 process_dcs_seq ();
2468 break; 2897 break;
2469 case 0x9b: /* CSI */ 2898 case 0x9b: /* CSI */
2470 process_csi_seq (); 2899 process_csi_seq ();
2471 break; 2900 break;
2472 case 0x9d: /* CSI */ 2901 case 0x9d: /* CSI */
2473 process_osc_seq (); 2902 process_osc_seq ();
2474 break; 2903 break;
2904#endif
2475 } 2905 }
2476} 2906}
2477/*}}} */ 2907/*}}} */
2478 2908
2479 2909
… …
2541void 2971void
2542rxvt_term::process_escape_seq () 2972rxvt_term::process_escape_seq ()
2543{ 2973{
2544 unicode_t ch = cmd_getc (); 2974 unicode_t ch = cmd_getc ();
2545 2975
2546 if (PrivateModes & PrivMode_vt52) 2976 if (priv_modes & PrivMode_vt52)
2547 { 2977 {
2548 process_escape_vt52 (ch); 2978 process_escape_vt52 (ch);
2549 return; 2979 return;
2550 } 2980 }
2551 2981
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2996 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2997 break;
2568 case '+': 2998 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2999 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3000 break;
2571#ifndef NO_FRILLS 3001#if ENABLE_FRILLS
2572 case '6': 3002 case '6':
2573 scr_backindex (); 3003 scr_backindex ();
2574 break; 3004 break;
2575#endif 3005#endif
2576 case '7': 3006 case '7':
2577 scr_cursor (SAVE); 3007 scr_cursor (SAVE);
2578 break; 3008 break;
2579 case '8': 3009 case '8':
2580 scr_cursor (RESTORE); 3010 scr_cursor (RESTORE);
2581 break; 3011 break;
2582#ifndef NO_FRILLS 3012#if ENABLE_FRILLS
2583 case '9': 3013 case '9':
2584 scr_forwardindex (); 3014 scr_forwardindex ();
2585 break; 3015 break;
2586#endif 3016#endif
2587 case '=': 3017 case '=':
… …
2597 break; 3027 break;
2598 3028
2599 /* 8.3.87: NEXT LINE */ 3029 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3030 case C1_NEL: /* ESC E */
2601 { 3031 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3032 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3033 scr_add_lines (nlcr, 1, 2);
2604 } 3034 }
2605 break; 3035 break;
2606 3036
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3037 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3098
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3099/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3100/* *INDENT-OFF* */
2671enum { 3101enum {
2672 CSI_ICH = 0x40, 3102 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3103 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3104 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3105 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3106 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3107 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3108 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3317 break;
2888 3318
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3320 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3321 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3322 break;
2893 3323
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3325 process_sgr_mode (nargs, arg);
2896 break; 3326 break;
… …
2903 break; 3333 break;
2904 case 6: /* CPR requested */ 3334 case 6: /* CPR requested */
2905 scr_report_position (); 3335 scr_report_position ();
2906 break; 3336 break;
2907 case 7: /* unofficial extension */ 3337 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3338 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3339 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3340 break;
2911 case 8: /* unofficial extension */ 3341 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3343 break;
2914 } 3344 }
… …
2950 break; 3380 break;
2951 3381
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3382 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3383 if (arg[0] == 4)
2954 scr_insert_mode (0); 3384 scr_insert_mode (0);
3385 else if (arg[0] == 20)
3386 priv_modes &= ~PrivMode_LFNL;
2955 break; 3387 break;
2956 3388
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3389 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3390 if (arg[0] == 4)
2959 scr_insert_mode (1); 3391 scr_insert_mode (1);
3392 else if (arg[0] == 20)
3393 priv_modes |= PrivMode_LFNL;
2960 break; 3394 break;
2961 3395
2962 /* 3396 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3397 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3398 */
… …
2976 break; 3410 break;
2977 case CSI_75: 3411 case CSI_75:
2978 scr_cursor (RESTORE); 3412 scr_cursor (RESTORE);
2979 break; 3413 break;
2980 3414
2981#ifndef NO_FRILLS 3415#if ENABLE_FRILLS
2982 case CSI_74: 3416 case CSI_74:
2983 process_window_ops (arg, nargs); 3417 process_window_ops (arg, nargs);
2984 break; 3418 break;
2985#endif 3419#endif
2986 3420
… …
2993 break; 3427 break;
2994 } 3428 }
2995} 3429}
2996/*}}} */ 3430/*}}} */
2997 3431
2998#ifndef NO_FRILLS 3432#if ENABLE_FRILLS
2999/* ARGSUSED */ 3433/* ARGSUSED */
3000void 3434void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3435rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3436{
3003 int x, y; 3437 int x, y;
… …
3070 break; 3504 break;
3071 case 19: /* report window size (chars) */ 3505 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3507 break;
3074 case 20: /* report icon label */ 3508 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3509 {
3077 char *s; 3510 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3511 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s);
3080 } 3514 }
3081 break; 3515 break;
3082 case 21: /* report window title */ 3516 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3517 {
3085 char *s; 3518 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3519 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s);
3088 } 3522 }
3089 break; 3523 break;
3090 } 3524 }
3091} 3525}
3092#endif 3526#endif
3093 3527
3094/*----------------------------------------------------------------------*/ 3528/*----------------------------------------------------------------------*/
3095/* 3529/*
3096 * get input up until STRING TERMINATOR (or BEL) 3530 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3531 * ends_how is terminator used. returned input must be free()'d
3098 */ 3532 */
3099unsigned char * 3533unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3534rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3535{
3102 int seen_esc = 0; /* seen escape? */ 3536 unicode_t ch;
3537 bool seen_esc = false;
3103 unsigned int n = 0; 3538 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3539 wchar_t string[STRING_MAX];
3107 3540
3108 while ((ch = cmd_getc ())) 3541 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3542 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3543 if (seen_esc)
3544 {
3114 if (ch == 0x5c) /* 7bit ST */ 3545 if (ch == 0x5c) /* 7bit ST */
3115 break; 3546 break;
3116 else 3547 else
3117 return NULL; 3548 return NULL;
3118 3549 }
3119 if (ch == C0_ESC) 3550 else if (ch == C0_ESC)
3120 { 3551 {
3121 seen_esc = 1; 3552 seen_esc = true;
3122 continue; 3553 continue;
3123 } 3554 }
3124 else if (ch == '\t') 3555 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3556 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3557 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3558 return NULL; /* other control character - exit */
3559
3560 seen_esc = false;
3128 3561
3129 if (n >= sizeof (string) - 1) 3562 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3563 // stop at some sane length
3131 return NULL; 3564 return NULL;
3132 3565
3566 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 ();
3568 else
3133 string[n++] = ch; 3569 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3570 }
3136 3571
3137 string[n++] = '\0'; 3572 string[n++] = '\0';
3138 3573
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3574 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3575
3144 return s; 3576 return (unsigned char *)rxvt_wcstombs (string);
3145} 3577}
3146 3578
3147/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
3148/* 3580/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3625void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3627{
3196 if (str[0] == '?' && !str[1]) 3628 if (str[0] == '?' && !str[1])
3197 { 3629 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3630 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3631 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3633 }
3205 else 3634 else
3206 set_window_color (color, str); 3635 set_window_color (color, str);
3207} 3636}
3208 3637
… …
3236{ 3665{
3237 int changed = 0; 3666 int changed = 0;
3238 int color; 3667 int color;
3239 char *buf, *name; 3668 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3669 bool query = str[0] == '?' && !str[1];
3670 int saveop = op;
3241 3671
3242 assert (str != NULL); 3672 assert (str != NULL);
3243 switch (op) 3673 switch (op)
3244 { 3674 {
3245 case XTerm_name: 3675 case XTerm_name:
… …
3252 set_title (str); 3682 set_title (str);
3253 break; 3683 break;
3254 case XTerm_property: 3684 case XTerm_property:
3255 if (str[0] == '?') 3685 if (str[0] == '?')
3256 { 3686 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3687 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3688 Atom actual_type;
3259 int actual_format; 3689 int actual_format;
3260 unsigned long nitems; 3690 unsigned long nitems;
3261 unsigned long bytes_after; 3691 unsigned long bytes_after;
3262 unsigned char *value = 0; 3692 unsigned char *value = 0;
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3710 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3711
3282 if (eq) 3712 if (eq)
3283 { 3713 {
3284 *eq = 0; 3714 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3715 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3716 }
3290 else 3717 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3718 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str)); 3719 display->atom (str));
3293 } 3720 }
3294 break; 3721 break;
3295 3722
3296 case XTerm_Color: 3723 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3724 for (buf = (char *)str; buf && *buf;)
3298 { 3725 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3726 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3727 break;
3301 3728
3302 *name++ = '\0'; 3729 *name++ = '\0';
3303 color = atoi (buf); 3730 color = atoi (buf);
3304 3731
3305 if (color < 0 || color >= TOTAL_COLORS) 3732 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3733 break;
3307 3734
3308 if ((buf = STRCHR (name, ';')) != NULL) 3735 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3736 *buf++ = '\0';
3310 3737
3311 if (name[0] == '?' && !name[1]) 3738 if (name[0] == '?' && !name[1])
3312 { 3739 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3740 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3743 }
3320 else 3744 else
3321 set_window_color (color + minCOLOR, name); 3745 set_window_color (color + minCOLOR, name);
3322 } 3746 }
3323 break; 3747 break;
… …
3340 break; 3764 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3765#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3766 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3345 case XTerm_Color_UL: 3772 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3774 break;
3348 case XTerm_Color_RV: 3775 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break;
3778#endif
3779#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3782 check_our_parents ();
3783 if (am_transparent)
3784 want_full_refresh = want_refresh = 1;
3350 break; 3785 break;
3351#endif 3786#endif
3352 3787
3353 case XTerm_Pixmap: 3788 case XTerm_Pixmap:
3354 if (*str != ';') 3789 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3792 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3793 set_bgPixmap (str); /* change pixmap */
3359#endif 3794#endif
3360 scr_touch (true); 3795 scr_touch (true);
3361 } 3796 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3797 while ((str = strchr (str, ';')) != NULL)
3363 { 3798 {
3364 str++; 3799 str++;
3365#if XPM_BACKGROUND 3800#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3801 changed += scale_pixmap (str);
3367#endif 3802#endif
… …
3386 case XTerm_logfile: 3821 case XTerm_logfile:
3387 // TODO, when secure mode? 3822 // TODO, when secure mode?
3388 break; 3823 break;
3389 3824
3390 case XTerm_font: 3825 case XTerm_font:
3826 op = URxvt_font;
3827 case URxvt_font:
3828#if ENABLE_STYLES
3829 case URxvt_boldFont:
3830 case URxvt_italicFont:
3831 case URxvt_boldItalicFont:
3832#endif
3391 if (query) 3833 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3837 resp);
3838 else
3392 { 3839 {
3393 if (Options & Opt_insecure) 3840 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3841
3395 TermWin.fontset->fontdesc 3842 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3843 allocated.push_back ((void *)res);
3397 : "", 3844 set_fonts ();
3398 resp);
3399 } 3845 }
3400 else
3401 change_font (str);
3402 break; 3846 break;
3403 3847
3404#ifndef NO_FRILLS 3848#if ENABLE_FRILLS
3405 case XTerm_locale: 3849 case XTerm_locale:
3406 if (query) 3850 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3852 else
3412 { 3853 {
3413 set_locale (str); 3854 set_locale (str);
3414# ifdef USE_XIM 3855# ifdef USE_XIM
3415 im_cb (); 3856 im_cb ();
3416# endif 3857# endif
3417 } 3858 }
3418 break; 3859 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3860#endif
3429 3861
3430#ifdef MENUBAR 3862#ifdef MENUBAR
3431 case XTerm_Menu: 3863 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3864 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3866 break;
3435#endif 3867#endif
3436#if 0 3868#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3869 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3896{
3465 int state; 3897 int state;
3466 3898
3467 if (mode == 's') 3899 if (mode == 's')
3468 { 3900 {
3469 SavedModes |= (PrivateModes & bit); 3901 SavedModes |= (priv_modes & bit);
3470 return -1; 3902 return -1;
3471 } 3903 }
3472 else 3904 else
3473 { 3905 {
3474 if (mode == 'r') 3906 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3907 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3908 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3909 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3910 PrivMode (state, bit);
3479 } 3911 }
3480 3912
3481 return state; 3913 return state;
3482} 3914}
… …
3500 { 3, PrivMode_132 }, 3932 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3933 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3934 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3935 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3936 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3938 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3939#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3940 { menuBar_esc, PrivMode_menuBar },
3508#endif 3941#endif
3942 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3944#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3945 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3946#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3947 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3948 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3949 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3950 // 45 margin bell NYI
3519 // 46 start logging 3951 // 46 start logging
… …
3560 3992
3561 /* extra handling for values with state unkept */ 3993 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3994 switch (arg[i])
3563 { 3995 {
3564 case 1048: /* alternative cursor save */ 3996 case 1048: /* alternative cursor save */
3997 case 1049:
3565 if (Options & Opt_secondaryScreen) 3998 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3999 if (mode == 0)
3567 scr_cursor (RESTORE); 4000 scr_cursor (RESTORE);
3568 else if (mode == 1) 4001 else if (mode == 1)
3569 scr_cursor (SAVE); 4002 scr_cursor (SAVE);
3570 break; 4003 break;
… …
3581 * within VT52 mode 4014 * within VT52 mode
3582 */ 4015 */
3583 PrivMode (1, PrivMode_vt52); 4016 PrivMode (1, PrivMode_vt52);
3584 break; 4017 break;
3585 case 3: /* 80/132 */ 4018 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4019 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4021 break;
3589 case 4: /* smooth scrolling */ 4022 case 4: /* smooth scrolling */
3590 if (state) 4023 if (state)
3591 Options &= ~Opt_jumpScroll; 4024 options &= ~Opt_jumpScroll;
3592 else 4025 else
3593 Options |= Opt_jumpScroll; 4026 options |= Opt_jumpScroll;
3594 break; 4027 break;
3595 case 5: /* reverse video */ 4028 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4029 scr_rvideo_mode (state);
3597 break; 4030 break;
3598 case 6: /* relative/absolute origins */ 4031 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4035 scr_autowrap (state);
3603 break; 4036 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4037 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4038 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4039 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4040 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4041 break;
3609#ifdef menuBar_esc 4042#ifdef menuBar_esc
3610 case menuBar_esc: 4043 case menuBar_esc:
3611#ifdef MENUBAR 4044#ifdef MENUBAR
3612 map_menuBar (state); 4045 map_menuBar (state);
… …
3632 break; 4065 break;
3633 /* case 66: - application key pad */ 4066 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4067 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4068 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4070 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4071 break;
3639#if 0 4072#if 0
3640 case 1001: 4073 case 1001:
3641 break; /* X11 mouse highlighting */ 4074 break; /* X11 mouse highlighting */
3642#endif 4075#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4076 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4077 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4078 options &= ~Opt_scrollTtyOutput;
3646 else 4079 else
3647 Options |= Opt_scrollTtyOutput; 4080 options |= Opt_scrollTtyOutput;
3648 break; 4081 break;
3649 case 1011: /* scroll to bottom on key press */ 4082 case 1011: /* scroll to bottom on key press */
3650 if (state) 4083 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4084 options |= Opt_scrollTtyKeypress;
3652 else 4085 else
3653 Options &= ~Opt_scrollTtyKeypress; 4086 options &= ~Opt_scrollTtyKeypress;
3654 break; 4087 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4088 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4089 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4090 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4091 scr_erase_screen (2);
3659 scr_change_screen (state); 4092 scr_change_screen (state);
3660 break; 4093 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4094 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4095 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4096 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4097 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4098 scr_erase_screen (2);
3666 break; 4099 break;
3667 default: 4100 default:
3668 break; 4101 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4127 rendset = 0, rendstyle = ~RS_None;
3695 break; 4128 break;
3696 case 1: 4129 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4130 rendset = 1, rendstyle = RS_Bold;
3698 break; 4131 break;
4132 //case 2: // low intensity
4133 case 3:
4134 rendset = 1, rendstyle = RS_Italic;
4135 break;
3699 case 4: 4136 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4137 rendset = 1, rendstyle = RS_Uline;
3701 break; 4138 break;
3702 case 5: 4139 case 5: // slowly blinking
4140 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4141 rendset = 1, rendstyle = RS_Blink;
3704 break; 4142 break;
4143 //case 6: // scoansi light background
3705 case 7: 4144 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4145 rendset = 1, rendstyle = RS_RVid;
3707 break; 4146 break;
3708 case 8: 4147 case 8:
3709 // invisible. NYI 4148 // invisible. NYI
3710 break; 4149 break;
3711 case 22: 4150 //case 9: // crossed out
4151 //case 10: // scoansi acs off, primary font
4152 //case 11: // scoansi acs on, first alt font
4153 //case 12: // scoansi acs on, |0x80, second alt font
4154 //...
4155 //case 19: // ninth alt font
4156 //case 20: // gothic
4157 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4158 rendset = 0, rendstyle = RS_Bold;
4159 break;
4160 case 22: // normal intensity
4161 rendset = 0, rendstyle = RS_Bold;
4162 break;
4163 case 23: // disable italic
4164 rendset = 0, rendstyle = RS_Italic;
3713 break; 4165 break;
3714 case 24: 4166 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4167 rendset = 0, rendstyle = RS_Uline;
3716 break; 4168 break;
3717 case 25: 4169 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4170 rendset = 0, rendstyle = RS_Blink;
3719 break; 4171 break;
4172 case 26: // variable spacing (iso 8613)
4173 rendset = 0, rendstyle = RS_Blink;
4174 break;
3720 case 27: 4175 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4176 rendset = 0, rendstyle = RS_RVid;
3722 break; 4177 break;
3723 case 28:
3724 // visible. NYI 4178 //case 28: // visible. NYI
3725 break; 4179 //case 29: // not crossed-out
3726 } 4180 }
3727 4181
3728 if (rendset != -1) 4182 if (rendset != -1)
3729 { 4183 {
3730 scr_rendition (rendset, rendstyle); 4184 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4195 case 35:
3742 case 36: 4196 case 36:
3743 case 37: 4197 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4199 break;
3746#ifdef TTY_256COLOR 4200 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4202 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4204 i += 2;
3752 } 4205 }
3753 break; 4206 break;
3754#endif
3755 case 39: /* default fg */ 4207 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4208 scr_color (Color_fg, Color_fg);
3757 break; 4209 break;
3758 4210
3759 case 40: 4211 case 40:
… …
3764 case 45: 4216 case 45:
3765 case 46: 4217 case 46:
3766 case 47: 4218 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4220 break;
3769#ifdef TTY_256COLOR 4221 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4223 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4225 i += 2;
3775 } 4226 }
3776 break; 4227 break;
3777#endif
3778 case 49: /* default bg */ 4228 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4229 scr_color (Color_bg, Color_bg);
3780 break; 4230 break;
4231
4232 //case 50: // not variable spacing
3781 4233
3782#ifndef NO_BRIGHTCOLOR 4234#ifndef NO_BRIGHTCOLOR
3783 case 90: 4235 case 90:
3784 case 91: /* set bright fg color */ 4236 case 91: /* set bright fg color */
3785 case 92: 4237 case 92:
3786 case 93: 4238 case 93:
3787 case 94: 4239 case 94:
3788 case 95: 4240 case 95:
3789 case 96: 4241 case 96:
3790 case 97: 4242 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4243 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4244 break;
3794 case 100: 4245 case 100:
3795 case 101: /* set bright bg color */ 4246 case 101: /* set bright bg color */
3796 case 102: 4247 case 102:
3797 case 103: 4248 case 103:
3798 case 104: 4249 case 104:
3799 case 105: 4250 case 105:
3800 case 106: 4251 case 106:
3801 case 107: 4252 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4254 break;
3805#endif 4255#endif
3806 4256
3807 } 4257 }
3808 } 4258 }
3809} 4259}
3810/*}}} */ 4260/*}}} */
3811 4261
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4262/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4263void
3814rxvt_term::process_graphics () 4264rxvt_term::process_graphics ()
3815{ 4265{
3816 unicode_t ch, cmd = cmd_getc (); 4266 unicode_t ch, cmd = cmd_getc ();
3817 4267
3818 if (cmd == 'Q') 4268 if (cmd == 'Q')
3819 { /* query graphics */ 4269 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4270 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4271 return;
3822 } 4272 }
3823 /* swallow other graphics sequences until terminating ':' */ 4273 /* swallow other graphics sequences until terminating ':' */
3824 do 4274 do
3825 ch = cmd_getc (); 4275 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4290 unsigned char buf[256];
3841 4291
3842 va_start (arg_ptr, fmt); 4292 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4294 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4295 tt_write (buf, strlen (buf));
3846} 4296}
3847 4297
3848/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4300 * or generated by us in response to a query ESC sequence.
3851 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
3852void 4304void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4306{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4310
3857 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
3858 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
3859 if (v_buflen == 0) 4334 if (v_buflen == 0)
3860 { 4335 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4336 free (v_buffer);
3888 v_buffer = 0; 4337 v_buffer = 0;
3889 v_buflen = 0; 4338 v_buflen = 0;
3890 4339
3891 pty_ev.set (EVENT_READ); 4340 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4341 return;
3904 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
3906} 4349}
3907 4350
3908/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
3909 4352

Diff Legend

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