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.176 by root, Mon Dec 13 01:29:03 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
… …
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 <wchar.h>
54#include <signal.h>
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;
… …
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
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
672 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
673 scrollbar_show (1); 930 scrollbar_show (1);
674#ifdef USE_XIM 931#ifdef USE_XIM
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677
678 } 934 }
679 935
680 display->flush (); 936 display->flush ();
681} 937}
682 938
… …
684rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
685{ 941{
686 SET_R (this); 942 SET_R (this);
687 SET_LOCALE (locale); 943 SET_LOCALE (locale);
688 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
689 flush (); 959 flush ();
690} 960}
691 961
692#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
693void 963void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 982 }
713} 983}
714#endif 984#endif
715 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
716bool 1029bool
717rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
718{ 1031{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
720 1039
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
724 1043
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1045
727 if (n > 0) 1046 if (n > 0)
728 { 1047 {
729 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
730 return true; 1049 return true;
… …
742 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
743 1062
744 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1064 tt_write (0, 0);
746 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1066 // 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 ()) 1067 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
760 if (cmd_parse ()) 1068 if (cmd_parse ())
761 break; 1069 break;
762 } 1070}
763 } 1071
1072void
1073rxvt_term::pointer_unblank ()
1074{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1076 recolour_cursor ();
1077
1078#ifdef POINTER_BLANK
1079 hidden_pointer = 0;
1080
1081 if (options & Opt_pointerBlank)
1082 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif
764} 1084}
765 1085
766#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
767void 1087void
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 () 1088rxvt_term::pointer_blank ()
781{ 1089{
782 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
783 return; 1091 return;
784 1092
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1094 XFlush (display->display);
787 1095
… …
807 x = ev.x; 1115 x = ev.x;
808 y = ev.y; 1116 y = ev.y;
809 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
810 1118
811 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1120 button_number = 3;
814 }
815 else 1121 else
816 { 1122 {
817 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1125 if (button_number >= 3)
820 button_number += (64 - 3); 1126 button_number += (64 - 3);
821 } 1127 }
822 1128
823 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
824 { 1130 {
825 /* 1131 /*
826 * do not report ButtonRelease 1132 * do not report ButtonRelease
827 * no state info allowed 1133 * no state info allowed
828 */ 1134 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1153#endif
848
849 } 1154 }
850 1155
851#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1158 if (key_state & 16)
854 fputc ('C', stderr); 1159 fputc ('C', stderr);
855 if (key_state & 4) 1160 if (key_state & 4)
856 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1165 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1167 button_number,
863 x + 1, 1168 x + 1,
864 y + 1); 1169 y + 1);
865#else 1170#endif
1171
866 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
868 (32 + x + 1), 1174 (32 + x + 1),
869 (32 + y + 1)); 1175 (32 + y + 1));
870#endif
871} 1176}
872 1177
873#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
874void 1179void
875rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1191{
887 SET_R (this); 1192 SET_R (this);
888 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
889 1194
890#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1197 {
893 if (hidden_cursor) 1198 if (hidden_cursor)
894 { 1199 {
895 hidden_cursor = 0; 1200 hidden_cursor = 0;
896 want_refresh = 1; 1201 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1205 }
901#endif 1206#endif
902 1207
903#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1210 {
906 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1214 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1218 pointer_blank ();
914 } 1219 }
915#endif 1220#endif
916 1221
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1224 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 1225
975 switch (ev.type) 1226 switch (ev.type)
976 { 1227 {
977 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
978 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
979 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
980 1297
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
986 else 1303#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; 1304 break;
995 } 1305 }
996#endif
997 1306
998 case ButtonPress: 1307 case ButtonPress:
999 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1000 break; 1309 break;
1001 1310
… …
1013 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1016 { 1325 {
1017 /* Get Dnd data */ 1326 /* Get Dnd data */
1018 Atom ActualType; 1327 Atom ActualType;
1019 int ActualFormat; 1328 int ActualFormat;
1020 unsigned char *data; 1329 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1022 1331
1023 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1334 0L, 1000000L,
1026 False, AnyPropertyType, 1335 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1029 &data); 1338 &data);
1030 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1340 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1343 }
1037#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1038 break; 1345 break;
1039 1346
1040 case MappingNotify: 1347 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1348 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1349 break;
1043 1350
1044 /* 1351 /*
1045 * XXX: this is not the _current_ arrangement 1352 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1353 * Here's my conclusion:
… …
1071 { 1378 {
1072 TermWin.focus = 1; 1379 TermWin.focus = 1;
1073 want_refresh = 1; 1380 want_refresh = 1;
1074#ifdef USE_XIM 1381#ifdef USE_XIM
1075 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1077#endif 1387#endif
1078#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1081#endif 1398#endif
1082 1399
1083 } 1400 }
1084 break; 1401 break;
1085 1402
1086 case FocusOut: 1403 case FocusOut:
1087 if (TermWin.focus) 1404 if (TermWin.focus)
1088 { 1405 {
1089 TermWin.focus = 0; 1406 TermWin.focus = 0;
1090 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1091#ifdef USE_XIM 1415#ifdef USE_XIM
1092 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1094#endif 1418#endif
1095#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1422 hidden_cursor = 0;
1099#endif 1423#endif
1100 1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1101 } 1431 }
1102 break; 1432 break;
1103 1433
1104 case ConfigureNotify: 1434 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1444 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1446
1117 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1118 { 1448 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1449 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1121 } 1451 }
1122#ifdef DEBUG_SIZE 1452
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1455 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1456#endif
1136 } 1457 }
1458 break;
1459
1460 case PropertyNotify:
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1137 break; 1465 break;
1138 1466
1139 case SelectionClear: 1467 case SelectionClear:
1140 selection_clear (); 1468 selection_clear ();
1141 break; 1469 break;
1142 1470
1143 case SelectionNotify: 1471 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1474 break;
1148 1475
1149 case SelectionRequest: 1476 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1151 break; 1478 break;
… …
1172 1499
1173 case GraphicsExpose: 1500 case GraphicsExpose:
1174 case Expose: 1501 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == TermWin.vt)
1176 { 1503 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1508
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1514
1185 // ev.xexpose.width, TermWin.height, False); 1515 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1516 }
1189 else 1517 else
1190 { 1518 {
1191 XEvent unused_event; 1519 XEvent unused_event;
1192 1520
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1522 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1524 ;
1198 &unused_event)) ; 1525
1199 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1200 { 1527 {
1201 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1202 scrollbar_show (0); 1529 scrollbar_show (0);
1203 } 1530 }
1204#ifdef MENUBAR 1531#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1533 menubar_expose ();
1207#endif 1534#endif
1535
1536#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0])
1538 XClearWindow (display->display, ev.xany.window);
1539#endif
1208 } 1540 }
1209 break; 1541 break;
1210 1542
1211 case MotionNotify: 1543 case MotionNotify:
1212#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
… …
1218 { 1550 {
1219 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1220 break; 1552 break;
1221 } 1553 }
1222#endif 1554#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1556 break;
1225 1557
1226 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1227 { 1559 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1561 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1563 ;
1232 1564
1233 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1569 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1573 {
1242#endif 1574#endif
1575#if ISO_14755
1576 // 5.4
1577 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1578 {
1579 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1580 break;
1581 }
1582#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1245#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1589 {
1249 int dist; 1590 int dist;
1250 1591
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1592 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1593 * already in the middle of scrolling.
1255 */ 1594 */
1256 if (scroll_selection_delay<=0) 1595 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1597
1259 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1261 */ 1600 */
1262 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1604
1267 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1607 {
1270 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1610 }
1273 else 1611 else
1274 { 1612 {
1275 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1615 }
1616
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1281 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1283 } 1622 }
1284 else 1623 else
1285 { 1624 {
1286 /* we are within the text window, so we 1625 /* we are within the text window, so we
1287 * shouldn't be scrolling 1626 * shouldn't be scrolling
1288 */ 1627 */
1289 pending_scroll_selection = 0; 1628 if (sel_scroll_ev.active)
1629 sel_scroll_ev.stop();
1290 } 1630 }
1291#endif 1631#endif
1292#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1293
1294 } 1633 }
1295#endif 1634#endif
1296
1297 } 1635 }
1298 } 1636 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1638 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1303 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1647 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1649 scrollbar_size ());
1310 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1313 } 1653 }
1314 break; 1654 break;
1315 } 1655 }
1316} 1656}
1317 1657
1658#if TRANSPARENT
1318void 1659void
1319rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1661{
1321 SET_R (this); 1662 SET_R (this);
1322 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1323 1664
1324 switch (ev.type) 1665 switch (ev.type)
1325 { 1666 {
1326 case PropertyNotify: 1667 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 /* 1668 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1669 * 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. 1670 * use the property to determine the pixmap. We use it later on.
1339 */ 1671 */
1340 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342 1674
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return; 1676 return;
1345 }
1346 1677
1347 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1348 case ReparentNotify: 1679 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1351 break; 1682 break;
1352#endif
1353 } 1683 }
1354} 1684}
1685#endif
1355 1686
1356void 1687void
1357rxvt_term::button_press (XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1358{ 1689{
1359 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1360 1691
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1693 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1364 /* 1696 /*
1365 * VT window processing of button press 1697 * VT window processing of button press
1366 */ 1698 */
1367 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1368 { 1700 {
1701#if ISO_14755
1702 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 {
1705 iso14755_54 (ev.x, ev.y);
1706 return;
1707 }
1708#endif
1709
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1370 if (reportmode) 1712 if (reportmode)
1371 { 1713 {
1372 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1403 } 1745 }
1404 else 1746 else
1405 { 1747 {
1406 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1408 switch (ev.button) 1751 switch (ev.button)
1409 { 1752 {
1410 case Button1: 1753 case Button1:
1754 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */
1756#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask);
1758#else
1759 selection.rect = false;
1760#endif
1761
1411 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1764 {
1414 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1416 else 1767 else
1417 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1783 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1435 else 1786 else
1436 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1437 MEvent.button = Button3; 1789 MEvent.button = Button3;
1438 break; 1790 break;
1439 } 1791 }
1440 } 1792 }
1793
1441 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1442 return; 1795 return;
1443 } 1796 }
1444 1797
1445 /* 1798 /*
… …
1511 upordown = 1; /* down */ 1864 upordown = 1; /* down */
1512 } 1865 }
1513 if (upordown) 1866 if (upordown)
1514 { 1867 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1868#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1869 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1870#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1871 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1872 {
1520 if (upordown < 0) 1873 if (upordown < 0)
1521 scrollBar.setUp (); 1874 scrollBar.setUp ();
… …
1537 break; 1890 break;
1538 case R_SB_ALIGN_BOTTOM: 1891 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1892 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1893 break;
1541 } 1894 }
1895
1542 if (scrollBar.style == R_SB_XTERM 1896 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1897 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1898 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1899 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1900
1547 scrollBar.setMotion (); 1901 scrollBar.setMotion ();
1548 break; 1902 break;
1549 1903
1550 case Button1: 1904 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1905 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1929 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1930 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1931 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1932 / scrollbar_size ()));
1579 } 1933 }
1934
1580 break; 1935 break;
1581 } 1936 }
1582 } 1937 }
1583 return; 1938 return;
1584 } 1939 }
… …
1596{ 1951{
1597 int reportmode = 0; 1952 int reportmode = 0;
1598 1953
1599 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1955 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1957
1603 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1604 { 1959 {
1605 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1606 scrollbar_show (0); 1961 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1964#endif
1610
1611 } 1965 }
1966
1612#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1968 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop();
1614#endif 1970#endif
1971
1615 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1616 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1617 if (reportmode) 1979 if (reportmode)
1618 { 1980 {
1619 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1636 mouse_report (ev); 1998 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2000 return;
1639 } 2001 }
2002
1640 /* 2003 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2005 * when overriding mouse reporting
1643 */ 2006 */
1644 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2008 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1648 2011
1649 switch (ev.button) 2012 switch (ev.button)
… …
1660 case Button5: 2023 case Button5:
1661 { 2024 {
1662 int i; 2025 int i;
1663 page_dirn v; 2026 page_dirn v;
1664 2027
1665 v = (ev.button == Button4) ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
2029
1666 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1667 i = 1; 2031 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2032 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1670 else 2034 else
1671 i = 5; 2035 i = 5;
2036
1672# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2038 if (ev.state & ControlMask)
1674 { 2039 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2040 mouse_slip_wheel_speed += v ? -1 : 1;
2041 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2042 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2043
2044 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046
2047 slip_wheel_ev.start ();
1677 } 2048 }
2049 else
2050 {
1678# endif 2051# endif
1679# ifdef JUMP_MOUSE_WHEEL 2052# 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); 2053 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2054 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2055 scrollbar_show (1);
2056# else
2057 while (i--)
2058 {
2059 scr_page (v, 1);
2060 scr_refresh (SMOOTH_REFRESH);
2061 scrollbar_show (1);
2062 }
2063# endif
2064# ifdef MOUSE_SLIP_WHEELING
1689 } 2065 }
1690# endif 2066#endif
1691
1692 } 2067 }
1693 break; 2068 break;
1694#endif 2069#endif
1695
1696 } 2070 }
1697 } 2071 }
1698#ifdef MENUBAR 2072#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2073 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2074 menubar_control (ev);
1701#endif 2075#endif
1702} 2076}
1703 2077
1704#ifdef TRANSPARENT 2078#ifdef TRANSPARENT
1705#if TINTING 2079#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2080/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2081
1709static void 2082typedef 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 2083
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2084void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2085{
1717 /* No saturation */ 2086 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2087 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i;
1721 2092
1722 b = ((uint16_t *) ptr)[x]; 2093 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2094
1724 g = (b & 0x3e0) * gm; 2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2096
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2097 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2098 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2099 mask_g = visual->green_mask;
1729 } 2100 mask_b = visual->blue_mask;
1730 ptr += bpl; 2101
1731 } 2102 /* boring lookup table pre-initialization */
2103 switch (srcImage->bits_per_pixel) {
2104 case 15:
2105 if ((mask_r != 0x7c00) ||
2106 (mask_g != 0x03e0) ||
2107 (mask_b != 0x001f))
2108 return;
2109 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2110 lookup_r = lookup;
2111 lookup_g = lookup+32;
2112 lookup_b = lookup+32+32;
2113 sh_r = 10;
2114 sh_g = 5;
2115 sh_b = 0;
2116 break;
2117 case 16:
2118 if ((mask_r != 0xf800) ||
2119 (mask_g != 0x07e0) ||
2120 (mask_b != 0x001f))
2121 return;
2122 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2123 lookup_r = lookup;
2124 lookup_g = lookup+32;
2125 lookup_b = lookup+32+64;
2126 sh_r = 11;
2127 sh_g = 5;
2128 sh_b = 0;
2129 break;
2130 case 24:
2131 if ((mask_r != 0xff0000) ||
2132 (mask_g != 0x00ff00) ||
2133 (mask_b != 0x0000ff))
2134 return;
2135 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2136 lookup_r = lookup;
2137 lookup_g = lookup+256;
2138 lookup_b = lookup+256+256;
2139 sh_r = 16;
2140 sh_g = 8;
2141 sh_b = 0;
2142 break;
2143 case 32:
2144 if ((mask_r != 0xff0000) ||
2145 (mask_g != 0x00ff00) ||
2146 (mask_b != 0x0000ff))
2147 return;
2148 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2149 lookup_r = lookup;
2150 lookup_g = lookup+256;
2151 lookup_b = lookup+256+256;
2152 sh_r = 16;
2153 sh_g = 8;
2154 sh_b = 0;
2155 break;
2156 default:
2157 return; /* we do not support this color depth */
2158 }
2159
2160 /* prepare limits for color transformation (each channel is handled separately) */
2161 if (shade < 0) {
2162 shade = -shade;
2163 if (shade < 0) shade = 0;
2164 if (shade > 100) shade = 100;
2165
2166 lower_lim_r = 65535-rm;
2167 lower_lim_g = 65535-gm;
2168 lower_lim_b = 65535-bm;
2169
2170 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2171 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2172 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2173
2174 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2175 } else {
1733 for (y = h; --y >= 0;) { 2176 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2177 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2178
1737 b = ((uint16_t *) ptr)[x]; 2179 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2180
1739 g = (b & 0x3e0) * gm; 2181 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2182 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2183 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2184 }
1743 b |= (!(b >> 5) - 1); 2185
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2186 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2187 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2188 {
1747 } 2189 unsigned int tmp;
1748 ptr += bpl; 2190
2191 tmp = lower_lim_r;
2192 lower_lim_r = lower_lim_b;
2193 lower_lim_b = tmp;
2194
2195 tmp = upper_lim_r;
2196 upper_lim_r = upper_lim_b;
2197 upper_lim_b = tmp;
2198 }
2199
2200 /* fill our lookup tables */
2201 for (i = 0; i <= mask_r>>sh_r; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2205 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2206 lookup_r[i] = (tmp/65535)<<sh_r;
2207 }
2208 for (i = 0; i <= mask_g>>sh_g; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2212 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2213 lookup_g[i] = (tmp/65535)<<sh_g;
2214 }
2215 for (i = 0; i <= mask_b>>sh_b; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2219 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2220 lookup_b[i] = (tmp/65535)<<sh_b;
2221 }
2222
2223 /* apply table to input image (replacing colors by newly calculated ones) */
2224 switch (srcImage->bits_per_pixel)
2225 {
2226 case 15:
2227 {
2228 unsigned short *p1, *pf, *p, *pl;
2229 p1 = (unsigned short *) srcImage->data;
2230 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2231 while (p1 < pf)
2232 {
2233 p = p1;
2234 pl = p1 + srcImage->width;
2235 for (; p < pl; p++)
1749 } 2236 {
2237 *p = lookup_r[(*p & 0x7c00)>>10] |
2238 lookup_g[(*p & 0x03e0)>> 5] |
2239 lookup_b[(*p & 0x001f)];
2240 }
2241 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2242 }
1751} 2243 break;
1752 2244 }
1753/* RGB 16 */ 2245 case 16:
1754static void 2246 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2247 unsigned short *p1, *pf, *p, *pl;
1756{ 2248 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2249 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2250 while (p1 < pf)
1759 2251 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2252 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2253 pl = p1 + srcImage->width;
1762 /* No saturation */ 2254 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 } 2255 {
1777 } else { 2256 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2257 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2258 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 } 2259 }
1793 ptr += bpl; 2260 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2261 }
2262 break;
2263 }
2264 case 24:
2265 {
2266 unsigned char *p1, *pf, *p, *pl;
2267 p1 = (unsigned char *) srcImage->data;
2268 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width * 3;
2273 for (; p < pl; p += 3)
1794 } 2274 {
2275 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2276 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2277 p[2] = lookup_r[(p[2] & 0x0000ff)];
2278 }
2279 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2280 }
1796} 2281 break;
2282 }
2283 case 32:
2284 {
2285 RUINT32T *p1, *pf, *p, *pl;
2286 p1 = (RUINT32T *) srcImage->data;
2287 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2288
1798/* RGB 24 */ 2289 while (p1 < pf)
1799static void 2290 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2291 p = p1;
1801{ 2292 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2293 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 } 2294 {
1830 } else { 2295 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2296 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2297 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2298 (*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 } 2299 }
1861 ptr += bpl; 2300 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2301 }
2302 break;
2303 }
1863 } 2304 }
1864}
1865 2305
1866/* RGB 32 */ 2306 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} 2307}
1937
1938#endif 2308#endif
1939 2309
1940/* 2310/*
1941 * Check our parents are still who we think they are. 2311 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2312 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
1954 2324
1955 pchanged = 0; 2325 pchanged = 0;
1956 2326
1957 if (!(Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1959 2329
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
1962 2332
… …
1965 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
1966 { 2336 {
1967 if (am_transparent) 2337 if (am_transparent)
1968 { 2338 {
1969 pchanged = 1; 2339 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
1972 } 2342 }
1973 2343
1974 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
1975 } 2345 }
… …
1991 i = (xa[XA_XSETROOTID] 2361 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2364 &nitems, &bytes_after, &prop) == Success);
1995 2365
1996 if (!i || prop == NULL) 2366 if (!i || prop == NULL
2367#if TINTING
2368 || !rs[Rs_color + Color_tint]
2369#endif
2370 )
1997 have_pixmap = 0; 2371 have_pixmap = 0;
1998 else 2372 else
1999 { 2373 {
2000 have_pixmap = 1; 2374 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2375 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2376 XFree (prop);
2003 } 2377 }
2004 2378
2005 if (have_pixmap) 2379 if (have_pixmap)
2006 { 2380 {
… …
2034 sy = 0; 2408 sy = 0;
2035 } 2409 }
2036 2410
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2039 allowedxerror = -1; 2415 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2417
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2439 XFreePixmap (display->display, TermWin.pixmap);
2064 2440
2065#if TINTING 2441#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2442 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2443 {
2068 unsigned short shade, rm, gm, bm; 2444 unsigned short rm, gm, bm;
2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2446
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2448
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2449 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 } 2450 }
2083#endif 2451#endif
2084 2452
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2454 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2457 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2458 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2459 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2461 XClearWindow (display->display, TermWin.parent[0]);
2094 2462
2095 if (!am_transparent || !am_pixmap_trans) 2463 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2464 pchanged = 1;
2097 2465
2098 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2099 } 2467 }
2100 } 2468 }
2101 2469
2102 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2103 { 2473 {
2104 unsigned int n; 2474 unsigned int n;
2105 /* 2475 /*
2106 * InheritPixmap transparency 2476 * InheritPixmap transparency
2107 */ 2477 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2479 {
2111 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2483 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2484
2117 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2118 { 2486 {
2119 if (oldp != None) 2487 if (oldp != None)
2120 pchanged = 1; 2488 pchanged = 1;
… …
2131 if (pchanged) 2499 if (pchanged)
2132 { 2500 {
2133 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2134 { 2502 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 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) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2505 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2507 break;
2141 } 2508 }
2142 } 2509 }
2143 } 2510 }
2144 2511
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2513 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2516 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2152 } 2518 }
2153 else 2519 else
2154 { 2520 {
2155#if WAIT_FOR_WM 2521#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2524 sleep (1);
2159#endif 2525#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2527 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]);
2530 }
2163 2531
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2533 am_transparent = 1;
2166 } 2534 }
2167 2535
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2538 }
2539
2540 if (scrollBar.win)
2541 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle ();
2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2170 } 2552 }
2171 2553
2172 return pchanged; 2554 return pchanged;
2173} 2555}
2174#endif 2556#endif
… …
2191 } 2573 }
2192 2574
2193 if (ch == NOCHAR) // TODO: improve 2575 if (ch == NOCHAR) // TODO: improve
2194 break; 2576 break;
2195 2577
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2579 {
2580 if (!seen_input)
2197 { 2581 {
2582 seen_input = 1;
2583 // many badly-written programs (e.g. jed) contain a race condition:
2584 // they first read the screensize and then install a SIGWINCH handler.
2585 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized.
2590 if (seen_resize)
2591 kill (-cmd_pid, SIGWINCH);
2592 }
2593
2198 /* Read a text string from the input buffer */ 2594 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2595 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2596 bool refreshnow = false;
2201 int nlines = 0; 2597 int nlines = 0;
2202 unicode_t *str = buf; 2598 unicode_t *str = buf;
2203 2599
2204 *str++ = ch;
2205
2206 for (;;) 2600 for (;;)
2207 { 2601 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2602 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2603 break;
2213 2604
2214 *str++ = ch; 2605 *str++ = ch;
2215 2606
2216 if (ch == '\n') 2607 if (ch == C0_LF)
2217 { 2608 {
2218 nlines++; 2609 nlines++;
2219 refresh_count++; 2610 refresh_count++;
2220 2611
2221 if (! (Options & Opt_jumpScroll) 2612 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2614 {
2224 refreshnow = true; 2615 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2616 ch = NOCHAR;
2227 break; 2617 break;
2228 } 2618 }
2229 2619
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2621 if (nlines >= TermWin.nrow - 1)
2232 { 2622 {
2233 scr_add_lines (buf, nlines, str - buf); 2623 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2624 nlines = 0;
2235 str = buf; 2625 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2629 if (str >= buf + UBUFSIZ)
2240 { 2630 {
2241 ch = NOCHAR; 2631 ch = NOCHAR;
2242 break; 2632 break;
2243 } 2633 }
2634
2635 seq_begin = cmdbuf_ptr;
2636 ch = next_char ();
2244 } 2637 }
2245 2638
2246 scr_add_lines (buf, nlines, str - buf); 2639 scr_add_lines (buf, nlines, str - buf);
2247 2640
2248 /* 2641 /*
2249 * If there have been a lot of new lines, then update the screen 2642 * 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. 2643 * 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 2644 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2645 * 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 */ 2646 */
2257 if (refreshnow) 2647 if (refreshnow)
2258 { 2648 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2650 refresh_limit++;
2261 2651 else
2652 {
2653 flag = true;
2262 scr_refresh (refresh_type); 2654 scr_refresh (refresh_type);
2655 }
2263 } 2656 }
2264 2657
2265 } 2658 }
2266 else 2659 else
2267 { 2660 {
… …
2281 } 2674 }
2282 2675
2283 return flag; 2676 return flag;
2284} 2677}
2285 2678
2679// read the next octet
2680unicode_t
2681rxvt_term::next_octet ()
2682{
2683 return cmdbuf_ptr < cmdbuf_endp
2684 ? *cmdbuf_ptr++
2685 : NOCHAR;
2686}
2687
2286// read the next character 2688// read the next character
2287unicode_t 2689unicode_t
2288rxvt_term::next_char () 2690rxvt_term::next_char ()
2289{ 2691{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2692 while (cmdbuf_ptr < cmdbuf_endp)
… …
2321 */ 2723 */
2322unicode_t 2724unicode_t
2323rxvt_term::cmd_getc () 2725rxvt_term::cmd_getc ()
2324{ 2726{
2325 unicode_t c = next_char (); 2727 unicode_t c = next_char ();
2728
2729 if (c == NOCHAR)
2730 throw out_of_input;
2731
2732 return c;
2733}
2734
2735unicode_t
2736rxvt_term::cmd_get8 ()
2737{
2738 unicode_t c = next_octet ();
2326 2739
2327 if (c == NOCHAR) 2740 if (c == NOCHAR)
2328 throw out_of_input; 2741 throw out_of_input;
2329 2742
2330 return c; 2743 return c;
… …
2431 process_escape_seq (); 2844 process_escape_seq ();
2432 break; 2845 break;
2433 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2850 else
2438 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2440 break; 2853 break;
2441 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2442 scr_bell (); 2855 scr_bell ();
2443 break; 2856 break;
2444 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2460 break; 2873 break;
2461 case C0_SI: /* shift in - acs */ 2874 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2875 scr_charset_choose (0);
2463 break; 2876 break;
2464 2877
2878#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2879 // 8-bit controls
2466 case 0x90: /* DCS */ 2880 case 0x90: /* DCS */
2467 process_dcs_seq (); 2881 process_dcs_seq ();
2468 break; 2882 break;
2469 case 0x9b: /* CSI */ 2883 case 0x9b: /* CSI */
2470 process_csi_seq (); 2884 process_csi_seq ();
2471 break; 2885 break;
2472 case 0x9d: /* CSI */ 2886 case 0x9d: /* CSI */
2473 process_osc_seq (); 2887 process_osc_seq ();
2474 break; 2888 break;
2889#endif
2475 } 2890 }
2476} 2891}
2477/*}}} */ 2892/*}}} */
2478 2893
2479 2894
… …
2541void 2956void
2542rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2543{ 2958{
2544 unicode_t ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2545 2960
2546 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2547 { 2962 {
2548 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2549 return; 2964 return;
2550 } 2965 }
2551 2966
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2982 break;
2568 case '+': 2983 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2985 break;
2571#ifndef NO_FRILLS 2986#if ENABLE_FRILLS
2572 case '6': 2987 case '6':
2573 scr_backindex (); 2988 scr_backindex ();
2574 break; 2989 break;
2575#endif 2990#endif
2576 case '7': 2991 case '7':
2577 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2578 break; 2993 break;
2579 case '8': 2994 case '8':
2580 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2581 break; 2996 break;
2582#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2583 case '9': 2998 case '9':
2584 scr_forwardindex (); 2999 scr_forwardindex ();
2585 break; 3000 break;
2586#endif 3001#endif
2587 case '=': 3002 case '=':
… …
2597 break; 3012 break;
2598 3013
2599 /* 8.3.87: NEXT LINE */ 3014 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3015 case C1_NEL: /* ESC E */
2601 { 3016 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3017 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3018 scr_add_lines (nlcr, 1, 2);
2604 } 3019 }
2605 break; 3020 break;
2606 3021
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3022 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3083
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3084/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3085/* *INDENT-OFF* */
2671enum { 3086enum {
2672 CSI_ICH = 0x40, 3087 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3088 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 , 3089 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, 3090 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, 3091 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, 3092 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, 3093 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); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3302 break;
2888 3303
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3307 break;
2893 3308
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
2896 break; 3311 break;
… …
2903 break; 3318 break;
2904 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
2905 scr_report_position (); 3320 scr_report_position ();
2906 break; 3321 break;
2907 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3323 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3325 break;
2911 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3328 break;
2914 } 3329 }
… …
2950 break; 3365 break;
2951 3366
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3368 if (arg[0] == 4)
2954 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
2955 break; 3372 break;
2956 3373
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3375 if (arg[0] == 4)
2959 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
2960 break; 3379 break;
2961 3380
2962 /* 3381 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3383 */
… …
2976 break; 3395 break;
2977 case CSI_75: 3396 case CSI_75:
2978 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
2979 break; 3398 break;
2980 3399
2981#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
2982 case CSI_74: 3401 case CSI_74:
2983 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
2984 break; 3403 break;
2985#endif 3404#endif
2986 3405
… …
2993 break; 3412 break;
2994 } 3413 }
2995} 3414}
2996/*}}} */ 3415/*}}} */
2997 3416
2998#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2999/* ARGSUSED */ 3418/* ARGSUSED */
3000void 3419void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3421{
3003 int x, y; 3422 int x, y;
… …
3070 break; 3489 break;
3071 case 19: /* report window size (chars) */ 3490 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3492 break;
3074 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3494 {
3077 char *s; 3495 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s);
3080 } 3499 }
3081 break; 3500 break;
3082 case 21: /* report window title */ 3501 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3502 {
3085 char *s; 3503 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s);
3088 } 3507 }
3089 break; 3508 break;
3090 } 3509 }
3091} 3510}
3092#endif 3511#endif
3093 3512
3094/*----------------------------------------------------------------------*/ 3513/*----------------------------------------------------------------------*/
3095/* 3514/*
3096 * get input up until STRING TERMINATOR (or BEL) 3515 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3516 * ends_how is terminator used. returned input must be free()'d
3098 */ 3517 */
3099unsigned char * 3518unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3520{
3102 int seen_esc = 0; /* seen escape? */ 3521 unicode_t ch;
3522 bool seen_esc = false;
3103 unsigned int n = 0; 3523 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3107 3525
3108 while ((ch = cmd_getc ())) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3527 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3528 if (seen_esc)
3529 {
3114 if (ch == 0x5c) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
3115 break; 3531 break;
3116 else 3532 else
3117 return NULL; 3533 return NULL;
3118 3534 }
3119 if (ch == C0_ESC) 3535 else if (ch == C0_ESC)
3120 { 3536 {
3121 seen_esc = 1; 3537 seen_esc = true;
3122 continue; 3538 continue;
3123 } 3539 }
3124 else if (ch == '\t') 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3541 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3542 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3128 3546
3129 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3548 // stop at some sane length
3131 return NULL; 3549 return NULL;
3132 3550
3551 if (ch == C0_SYN)
3552 string[n++] = cmd_get8 ();
3553 else
3133 string[n++] = ch; 3554 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3555 }
3136 3556
3137 string[n++] = '\0'; 3557 string[n++] = '\0';
3138 3558
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3560
3144 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3145} 3562}
3146 3563
3147/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3148/* 3565/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3610void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3612{
3196 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3197 { 3614 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3615 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3618 }
3205 else 3619 else
3206 set_window_color (color, str); 3620 set_window_color (color, str);
3207} 3621}
3208 3622
… …
3236{ 3650{
3237 int changed = 0; 3651 int changed = 0;
3238 int color; 3652 int color;
3239 char *buf, *name; 3653 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3241 3656
3242 assert (str != NULL); 3657 assert (str != NULL);
3243 switch (op) 3658 switch (op)
3244 { 3659 {
3245 case XTerm_name: 3660 case XTerm_name:
… …
3252 set_title (str); 3667 set_title (str);
3253 break; 3668 break;
3254 case XTerm_property: 3669 case XTerm_property:
3255 if (str[0] == '?') 3670 if (str[0] == '?')
3256 { 3671 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3673 Atom actual_type;
3259 int actual_format; 3674 int actual_format;
3260 unsigned long nitems; 3675 unsigned long nitems;
3261 unsigned long bytes_after; 3676 unsigned long bytes_after;
3262 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3696
3282 if (eq) 3697 if (eq)
3283 { 3698 {
3284 *eq = 0; 3699 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3700 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 } 3701 }
3290 else 3702 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str)); 3704 display->atom (str));
3293 } 3705 }
3294 break; 3706 break;
3295 3707
3296 case XTerm_Color: 3708 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3298 { 3710 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3712 break;
3301 3713
3302 *name++ = '\0'; 3714 *name++ = '\0';
3303 color = atoi (buf); 3715 color = atoi (buf);
3304 3716
3305 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3718 break;
3307 3719
3308 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3721 *buf++ = '\0';
3310 3722
3311 if (name[0] == '?' && !name[1]) 3723 if (name[0] == '?' && !name[1])
3312 { 3724 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3725 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3726 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); 3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3728 }
3320 else 3729 else
3321 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3322 } 3731 }
3323 break; 3732 break;
… …
3340 break; 3749 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3345 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3759 break;
3348 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break;
3763#endif
3764#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3767 check_our_parents ();
3768 if (am_transparent)
3769 want_full_refresh = want_refresh = 1;
3350 break; 3770 break;
3351#endif 3771#endif
3352 3772
3353 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3354 if (*str != ';') 3774 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3359#endif 3779#endif
3360 scr_touch (true); 3780 scr_touch (true);
3361 } 3781 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3363 { 3783 {
3364 str++; 3784 str++;
3365#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3367#endif 3787#endif
… …
3386 case XTerm_logfile: 3806 case XTerm_logfile:
3387 // TODO, when secure mode? 3807 // TODO, when secure mode?
3388 break; 3808 break;
3389 3809
3390 case XTerm_font: 3810 case XTerm_font:
3811 op = URxvt_font;
3812 case URxvt_font:
3813#if ENABLE_STYLES
3814 case URxvt_boldFont:
3815 case URxvt_italicFont:
3816 case URxvt_boldItalicFont:
3817#endif
3391 if (query) 3818 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3822 resp);
3823 else
3392 { 3824 {
3393 if (Options & Opt_insecure) 3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3826
3395 TermWin.fontset->fontdesc 3827 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3828 allocated.push_back ((void *)res);
3397 : "", 3829 set_fonts ();
3398 resp);
3399 } 3830 }
3400 else
3401 change_font (str);
3402 break; 3831 break;
3403 3832
3404#ifndef NO_FRILLS 3833#if ENABLE_FRILLS
3405 case XTerm_locale: 3834 case XTerm_locale:
3406 if (query) 3835 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3837 else
3412 { 3838 {
3413 set_locale (str); 3839 set_locale (str);
3414# ifdef USE_XIM 3840# ifdef USE_XIM
3415 im_cb (); 3841 im_cb ();
3416# endif 3842# endif
3417 } 3843 }
3418 break; 3844 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 3845#endif
3429 3846
3430#ifdef MENUBAR 3847#ifdef MENUBAR
3431 case XTerm_Menu: 3848 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3849 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3851 break;
3435#endif 3852#endif
3436#if 0 3853#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3881{
3465 int state; 3882 int state;
3466 3883
3467 if (mode == 's') 3884 if (mode == 's')
3468 { 3885 {
3469 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3470 return -1; 3887 return -1;
3471 } 3888 }
3472 else 3889 else
3473 { 3890 {
3474 if (mode == 'r') 3891 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3893 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3895 PrivMode (state, bit);
3479 } 3896 }
3480 3897
3481 return state; 3898 return state;
3482} 3899}
… …
3500 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3924#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3508#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3931#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3934 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3935 // 45 margin bell NYI
3519 // 46 start logging 3936 // 46 start logging
… …
3560 3977
3561 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3979 switch (arg[i])
3563 { 3980 {
3564 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3565 if (Options & Opt_secondaryScreen) 3983 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3984 if (mode == 0)
3567 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3568 else if (mode == 1) 3986 else if (mode == 1)
3569 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3570 break; 3988 break;
… …
3581 * within VT52 mode 3999 * within VT52 mode
3582 */ 4000 */
3583 PrivMode (1, PrivMode_vt52); 4001 PrivMode (1, PrivMode_vt52);
3584 break; 4002 break;
3585 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4006 break;
3589 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3590 if (state) 4008 if (state)
3591 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3592 else 4010 else
3593 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3594 break; 4012 break;
3595 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3597 break; 4015 break;
3598 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4020 scr_autowrap (state);
3603 break; 4021 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4022 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4025 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4026 break;
3609#ifdef menuBar_esc 4027#ifdef menuBar_esc
3610 case menuBar_esc: 4028 case menuBar_esc:
3611#ifdef MENUBAR 4029#ifdef MENUBAR
3612 map_menuBar (state); 4030 map_menuBar (state);
… …
3632 break; 4050 break;
3633 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4055 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4056 break;
3639#if 0 4057#if 0
3640 case 1001: 4058 case 1001:
3641 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3642#endif 4060#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4062 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3646 else 4064 else
3647 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3648 break; 4066 break;
3649 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3650 if (state) 4068 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3652 else 4070 else
3653 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3654 break; 4072 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4073 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4074 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4076 scr_erase_screen (2);
3659 scr_change_screen (state); 4077 scr_change_screen (state);
3660 break; 4078 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4079 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4080 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4081 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4082 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4083 scr_erase_screen (2);
3666 break; 4084 break;
3667 default: 4085 default:
3668 break; 4086 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3695 break; 4113 break;
3696 case 1: 4114 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3698 break; 4116 break;
4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3699 case 4: 4121 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3701 break; 4123 break;
3702 case 5: 4124 case 5: // slowly blinking
4125 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4126 rendset = 1, rendstyle = RS_Blink;
3704 break; 4127 break;
4128 //case 6: // scoansi light background
3705 case 7: 4129 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4130 rendset = 1, rendstyle = RS_RVid;
3707 break; 4131 break;
3708 case 8: 4132 case 8:
3709 // invisible. NYI 4133 // invisible. NYI
3710 break; 4134 break;
3711 case 22: 4135 //case 9: // crossed out
4136 //case 10: // scoansi acs off, primary font
4137 //case 11: // scoansi acs on, first alt font
4138 //case 12: // scoansi acs on, |0x80, second alt font
4139 //...
4140 //case 19: // ninth alt font
4141 //case 20: // gothic
4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 22: // normal intensity
4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
3713 break; 4150 break;
3714 case 24: 4151 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3716 break; 4153 break;
3717 case 25: 4154 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4155 rendset = 0, rendstyle = RS_Blink;
3719 break; 4156 break;
4157 case 26: // variable spacing (iso 8613)
4158 rendset = 0, rendstyle = RS_Blink;
4159 break;
3720 case 27: 4160 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3722 break; 4162 break;
3723 case 28:
3724 // visible. NYI 4163 //case 28: // visible. NYI
3725 break; 4164 //case 29: // not crossed-out
3726 } 4165 }
3727 4166
3728 if (rendset != -1) 4167 if (rendset != -1)
3729 { 4168 {
3730 scr_rendition (rendset, rendstyle); 4169 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4180 case 35:
3742 case 36: 4181 case 36:
3743 case 37: 4182 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4184 break;
3746#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4187 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4189 i += 2;
3752 } 4190 }
3753 break; 4191 break;
3754#endif
3755 case 39: /* default fg */ 4192 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3757 break; 4194 break;
3758 4195
3759 case 40: 4196 case 40:
… …
3764 case 45: 4201 case 45:
3765 case 46: 4202 case 46:
3766 case 47: 4203 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4205 break;
3769#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4208 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4210 i += 2;
3775 } 4211 }
3776 break; 4212 break;
3777#endif
3778 case 49: /* default bg */ 4213 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3780 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3781 4218
3782#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3783 case 90: 4220 case 90:
3784 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3785 case 92: 4222 case 92:
3786 case 93: 4223 case 93:
3787 case 94: 4224 case 94:
3788 case 95: 4225 case 95:
3789 case 96: 4226 case 96:
3790 case 97: 4227 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4229 break;
3794 case 100: 4230 case 100:
3795 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3796 case 102: 4232 case 102:
3797 case 103: 4233 case 103:
3798 case 104: 4234 case 104:
3799 case 105: 4235 case 105:
3800 case 106: 4236 case 106:
3801 case 107: 4237 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4239 break;
3805#endif 4240#endif
3806 4241
3807 } 4242 }
3808 } 4243 }
3809} 4244}
3810/*}}} */ 4245/*}}} */
3811 4246
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4247/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4248void
3814rxvt_term::process_graphics () 4249rxvt_term::process_graphics ()
3815{ 4250{
3816 unicode_t ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3817 4252
3818 if (cmd == 'Q') 4253 if (cmd == 'Q')
3819 { /* query graphics */ 4254 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4256 return;
3822 } 4257 }
3823 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3824 do 4259 do
3825 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4275 unsigned char buf[256];
3841 4276
3842 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4279 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3846} 4281}
3847 4282
3848/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4284/* 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. 4285 * or generated by us in response to a query ESC sequence.
3851 */ 4286 */
3852void 4287void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4289{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3856 4291
3857 if (len) 4292 if (len)
3858 { 4293 {
3859 if (v_buflen == 0) 4294 if (v_buflen == 0)
3860 { 4295 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4297
3863 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3864 return; 4299 return;
3865 4300
3866 data += written; 4301 data += written;
… …
3874 v_buflen += len; 4309 v_buflen += len;
3875 } 4310 }
3876 4311
3877 for (;;) 4312 for (;;)
3878 { 4313 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3880 4315
3881 if (written > 0) 4316 if (written > 0)
3882 { 4317 {
3883 v_buflen -= written; 4318 v_buflen -= written;
3884 4319

Diff Legend

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