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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.178 by root, Wed Dec 15 00:53:23 2004 UTC

… …
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 {
… …
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677 } 934 }
678 935
679 display->flush (); 936 display->flush ();
680
681 flush_ev.stop ();
682} 937}
683 938
684void 939void
685rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
686{ 941{
687 SET_R (this); 942 SET_R (this);
688 SET_LOCALE (locale); 943 SET_LOCALE (locale);
689 944
690 display->flush (); 945 display->flush ();
691 946
692 if (!flush_ev.active) 947 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 948 flush_ev.start (NOW + 0.01);
694} 949}
695 950
696void 951void
697rxvt_term::flush_cb (time_watcher &w) 952rxvt_term::flush_cb (time_watcher &w)
… …
784 1039
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
788 1043
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1045
791 if (n > 0) 1046 if (n > 0)
792 { 1047 {
793 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
794 return true; 1049 return true;
… …
803rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1059{
805 SET_R (this); 1060 SET_R (this);
806 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
807 1062
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1065 while (pty_fill ())
813 if (cmd_parse ()) 1066 if (cmd_parse ())
814 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
815} 1071}
816 1072
817void 1073void
818rxvt_term::pointer_unblank () 1074rxvt_term::pointer_unblank ()
819{ 1075{
… …
821 recolour_cursor (); 1077 recolour_cursor ();
822 1078
823#ifdef POINTER_BLANK 1079#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1080 hidden_pointer = 0;
825 1081
826 if (Options & Opt_pointerBlank) 1082 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1083 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1084#endif
829} 1085}
830 1086
831#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
832void 1088void
833rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
834{ 1090{
835 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
836 return; 1092 return;
837 1093
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
839 XFlush (display->display); 1095 XFlush (display->display);
840 1096
… …
860 x = ev.x; 1116 x = ev.x;
861 y = ev.y; 1117 y = ev.y;
862 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
863 1119
864 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1121 button_number = 3;
867 }
868 else 1122 else
869 { 1123 {
870 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1126 if (button_number >= 3)
873 button_number += (64 - 3); 1127 button_number += (64 - 3);
874 } 1128 }
875 1129
876 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
877 { 1131 {
878 /* 1132 /*
879 * do not report ButtonRelease 1133 * do not report ButtonRelease
880 * no state info allowed 1134 * no state info allowed
881 */ 1135 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1154#endif
901
902 } 1155 }
903 1156
904#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1159 if (key_state & 16)
907 fputc ('C', stderr); 1160 fputc ('C', stderr);
908 if (key_state & 4) 1161 if (key_state & 4)
909 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1166 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1168 button_number,
916 x + 1, 1169 x + 1,
917 y + 1); 1170 y + 1);
918#else 1171#endif
1172
919 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
921 (32 + x + 1), 1175 (32 + x + 1),
922 (32 + y + 1)); 1176 (32 + y + 1));
923#endif
924} 1177}
925 1178
926#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
927void 1180void
928rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
939{ 1192{
940 SET_R (this); 1193 SET_R (this);
941 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
942 1195
943#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1198 {
946 if (hidden_cursor) 1199 if (hidden_cursor)
947 { 1200 {
948 hidden_cursor = 0; 1201 hidden_cursor = 0;
949 want_refresh = 1; 1202 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1206 }
954#endif 1207#endif
955 1208
956#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1211 {
959 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1215 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1219 pointer_blank ();
967 } 1220 }
968#endif 1221#endif
969 1222
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1225 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1226
1028 switch (ev.type) 1227 switch (ev.type)
1029 { 1228 {
1030 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1031 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1234
1235 break;
1236
1237 case KeyRelease:
1238 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
1032 break; 1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
1033 1298
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1301 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
1046 } 1304#endif
1047 break; 1305 break;
1048 } 1306 }
1049#endif
1050 1307
1051 case ButtonPress: 1308 case ButtonPress:
1052 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1053 break; 1310 break;
1054 1311
… …
1078 0L, 1000000L, 1335 0L, 1000000L,
1079 False, AnyPropertyType, 1336 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1082 &data); 1339 &data);
1083 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1341 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1090 } 1344 }
1091#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1092 break; 1346 break;
1093 1347
… …
1125 { 1379 {
1126 TermWin.focus = 1; 1380 TermWin.focus = 1;
1127 want_refresh = 1; 1381 want_refresh = 1;
1128#ifdef USE_XIM 1382#ifdef USE_XIM
1129 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1130 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1131#endif 1388#endif
1132#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif 1392#endif
1136#ifdef OFF_FOCUS_FADING 1393#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade]) 1394 if (rs[Rs_fade])
1138 { 1395 {
1139 PixColors = PixColorsFocused; 1396 pix_colors = pix_colors_focused;
1140 set_colorfgbg ();
1141 scr_clear (); 1397 scr_recolour ();
1142 scr_touch (true);
1143 } 1398 }
1144#endif 1399#endif
1145 1400
1146 } 1401 }
1147 break; 1402 break;
… …
1149 case FocusOut: 1404 case FocusOut:
1150 if (TermWin.focus) 1405 if (TermWin.focus)
1151 { 1406 {
1152 TermWin.focus = 0; 1407 TermWin.focus = 0;
1153 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1154#ifdef USE_XIM 1416#ifdef USE_XIM
1155 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1157#endif 1419#endif
1158#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1160 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1161 hidden_cursor = 0; 1423 hidden_cursor = 0;
1162#endif 1424#endif
1163#ifdef OFF_FOCUS_FADING 1425#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade]) 1426 if (rs[Rs_fade])
1165 { 1427 {
1166 PixColors = PixColorsUnFocused; 1428 pix_colors = pix_colors_unfocused;
1167 set_colorfgbg ();
1168 scr_clear (); 1429 scr_recolour ();
1169 scr_touch (true);
1170 } 1430 }
1171#endif 1431#endif
1172
1173 } 1432 }
1174 break; 1433 break;
1175 1434
1176 case ConfigureNotify: 1435 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1445 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1447
1189 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1449 {
1450 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1452 }
1191 1453
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1456 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1457#endif
1200 } 1458 }
1459 break;
1460
1461 case PropertyNotify:
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1201 break; 1466 break;
1202 1467
1203 case SelectionClear: 1468 case SelectionClear:
1204 selection_clear (); 1469 selection_clear ();
1205 break; 1470 break;
1206 1471
1207 case SelectionNotify: 1472 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1475 break;
1212 1476
1213 case SelectionRequest: 1477 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1215 break; 1479 break;
… …
1287 { 1551 {
1288 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1289 break; 1553 break;
1290 } 1554 }
1291#endif 1555#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1557 break;
1294 1558
1295 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1296 { 1560 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1562 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1300 ; 1564 ;
1301 1565
1302 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1303 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1570 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1574 {
1311#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1314#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1590 {
1318 int dist; 1591 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1598
1326 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1328 */ 1601 */
1329 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1605
1334 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1608 {
1337 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1611 }
1340 else 1612 else
1341 { 1613 {
1342 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1616 }
1617
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1348 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1350 } 1623 }
1351 else 1624 else
1352 { 1625 {
1353 /* we are within the text window, so we 1626 /* we are within the text window, so we
1354 * shouldn't be scrolling 1627 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1629 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1358 } 1631 }
1359#endif 1632#endif
1360#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1361
1362 } 1634 }
1363#endif 1635#endif
1364
1365 } 1636 }
1366 } 1637 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1639 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1370 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1371 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1372 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1648 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1650 scrollbar_size ());
1378 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1381 } 1654 }
1382 break; 1655 break;
1383 } 1656 }
1384} 1657}
1385 1658
1659#if TRANSPARENT
1386void 1660void
1387rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1662{
1389 SET_R (this); 1663 SET_R (this);
1390 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1391 1665
1392 switch (ev.type) 1666 switch (ev.type)
1393 { 1667 {
1394 case PropertyNotify: 1668 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1669 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1670 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1671 * use the property to determine the pixmap. We use it later on.
1407 */ 1672 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1412 return; 1675 return;
1413 }
1414 1676
1415 /* FALLTHROUGH */ 1677 /* FALLTHROUGH */
1416 case ReparentNotify: 1678 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1680 want_refresh = want_full_refresh = 1;
1419 break; 1681 break;
1420#endif
1421 } 1682 }
1422} 1683}
1684#endif
1423 1685
1424void 1686void
1425rxvt_term::button_press (XButtonEvent &ev) 1687rxvt_term::button_press (XButtonEvent &ev)
1426{ 1688{
1427 int reportmode = 0, clickintime; 1689 int reportmode = 0, clickintime;
1428 1690
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1691 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1692 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1693 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694
1432 /* 1695 /*
1433 * VT window processing of button press 1696 * VT window processing of button press
1434 */ 1697 */
1435 if (ev.window == TermWin.vt) 1698 if (ev.window == TermWin.vt)
1436 { 1699 {
1700#if ISO_14755
1701 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 {
1704 iso14755_54 (ev.x, ev.y);
1705 return;
1706 }
1707#endif
1708
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1709 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1710
1438 if (reportmode) 1711 if (reportmode)
1439 { 1712 {
1440 /* mouse report from vt window */ 1713 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1714 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1715 MEvent.state = ev.state;
… …
1471 } 1744 }
1472 else 1745 else
1473 { 1746 {
1474 if (ev.button != MEvent.button) 1747 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1748 MEvent.clicks = 0;
1749
1476 switch (ev.button) 1750 switch (ev.button)
1477 { 1751 {
1478 case Button1: 1752 case Button1:
1753 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */
1755#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask);
1757#else
1758 selection.rect = false;
1759#endif
1760
1479 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1763 {
1482 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1484 else 1766 else
1485 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1782 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1503 else 1785 else
1504 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1505 MEvent.button = Button3; 1788 MEvent.button = Button3;
1506 break; 1789 break;
1507 } 1790 }
1508 } 1791 }
1792
1509 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1510 return; 1794 return;
1511 } 1795 }
1512 1796
1513 /* 1797 /*
… …
1605 break; 1889 break;
1606 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1892 break;
1609 } 1893 }
1894
1610 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1899
1615 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1616 break; 1901 break;
1617 1902
1618 case Button1: 1903 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1929 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1931 / scrollbar_size ()));
1647 } 1932 }
1933
1648 break; 1934 break;
1649 } 1935 }
1650 } 1936 }
1651 return; 1937 return;
1652 } 1938 }
… …
1664{ 1950{
1665 int reportmode = 0; 1951 int reportmode = 0;
1666 1952
1667 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1954 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 1956
1671 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1672 { 1958 {
1673 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1674 scrollbar_show (0); 1960 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 1963#endif
1678
1679 } 1964 }
1965
1680#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 1967 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 1968 sel_scroll_ev.stop();
1683#endif 1969#endif
1970
1684 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1685 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1686 if (reportmode) 1978 if (reportmode)
1687 { 1979 {
1688 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1705 mouse_report (ev); 1997 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 1999 return;
1708 } 2000 }
2001
1709 /* 2002 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2004 * when overriding mouse reporting
1712 */ 2005 */
1713 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2007 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1717 2010
1718 switch (ev.button) 2011 switch (ev.button)
… …
1733 2026
1734 v = ev.button == Button4 ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
1735 2028
1736 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1737 i = 1; 2030 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2031 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1740 else 2033 else
1741 i = 5; 2034 i = 5;
1742 2035
1743# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
… …
2028 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
2030 2323
2031 pchanged = 0; 2324 pchanged = 0;
2032 2325
2033 if (!(Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
2035 2328
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
2038 2331
… …
2041 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
2042 { 2335 {
2043 if (am_transparent) 2336 if (am_transparent)
2044 { 2337 {
2045 pchanged = 1; 2338 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
2048 } 2341 }
2049 2342
2050 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2051 } 2344 }
… …
2056 /* 2349 /*
2057 * Make the frame window set by the window manager have 2350 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2351 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2352 * windows for each client, so we have to take care about that.
2060 */ 2353 */
2061 i = (xa[XA_XROOTPMAPID] 2354 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2357 &nitems, &bytes_after, &prop) == Success);
2065 2358
2066 if (!i || prop == NULL) 2359 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2360 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2363 &nitems, &bytes_after, &prop) == Success);
2071 2364
2072 if (!i || prop == NULL 2365 if (!i || prop == NULL
2073#if TINTING 2366#if TINTING
… …
2114 sy = 0; 2407 sy = 0;
2115 } 2408 }
2116 2409
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412
2413 XSync (display->display, False);
2119 allowedxerror = -1; 2414 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2416
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2418 /* XXX: may need a delay here? */
… …
2146 if (ISSET_PIXCOLOR (Color_tint)) 2441 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2442 {
2148 unsigned short rm, gm, bm; 2443 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2444 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2445
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2446 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2447
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2448 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2449 }
2155#endif 2450#endif
2156 2451
… …
2169 2464
2170 am_transparent = am_pixmap_trans = 1; 2465 am_transparent = am_pixmap_trans = 1;
2171 } 2466 }
2172 } 2467 }
2173 2468
2174 if (!am_pixmap_trans) 2469 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2471 else
2175 { 2472 {
2176 unsigned int n; 2473 unsigned int n;
2177 /* 2474 /*
2178 * InheritPixmap transparency 2475 * InheritPixmap transparency
2179 */ 2476 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2478 {
2183 oldp = TermWin.parent[i]; 2479 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2480 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2481 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2482 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2483
2189 if (TermWin.parent[i] == display->root) 2484 if (TermWin.parent[i] == display->root)
2190 { 2485 {
2191 if (oldp != None) 2486 if (oldp != None)
2192 pchanged = 1; 2487 pchanged = 1;
… …
2203 if (pchanged) 2498 if (pchanged)
2204 { 2499 {
2205 for (; n < (unsigned int)i; n++) 2500 for (; n < (unsigned int)i; n++)
2206 { 2501 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2504 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2506 break;
2213 } 2507 }
2214 } 2508 }
2215 } 2509 }
2216 2510
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2512 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2515 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2516 /* XXX: also turn off Opt_transparent? */
2224 } 2517 }
2225 else 2518 else
2226 { 2519 {
2227#if WAIT_FOR_WM 2520#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2521 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2522 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2523 sleep (1);
2231#endif 2524#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2525 for (n = 0; n < (unsigned int)i; n++)
2234 { 2526 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2528 XClearWindow (display->display, TermWin.parent[n]);
2237 } 2529 }
… …
2242 2534
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2536 TermWin.parent[i] = None;
2245 } 2537 }
2246 2538
2247 // this is experimental
2248 if (scrollBar.win) 2539 if (scrollBar.win)
2249 { 2540 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2542 scrollBar.setIdle ();
2253 scrollbar_show (0); 2543 scrollbar_show (0);
2544 }
2545
2546 if (am_transparent)
2547 {
2548 want_refresh = want_full_refresh = 1;
2549 if (am_pixmap_trans)
2550 flush ();
2254 } 2551 }
2255 2552
2256 return pchanged; 2553 return pchanged;
2257} 2554}
2258#endif 2555#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2574 if (ch == NOCHAR) // TODO: improve
2278 break; 2575 break;
2279 2576
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2577 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2578 {
2579 if (!seen_input)
2580 {
2581 seen_input = 1;
2582 // many badly-written programs (e.g. jed) contain a race condition:
2583 // they first read the screensize and then install a SIGWINCH handler.
2584 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized.
2589 if (seen_resize)
2590 kill (-cmd_pid, SIGWINCH);
2591 }
2592
2282 /* Read a text string from the input buffer */ 2593 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2594 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2595 bool refreshnow = false;
2285 int nlines = 0; 2596 int nlines = 0;
2286 unicode_t *str = buf; 2597 unicode_t *str = buf;
2287 2598
2288 *str++ = ch;
2289
2290 for (;;) 2599 for (;;)
2291 { 2600 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2602 break;
2297 2603
2298 *str++ = ch; 2604 *str++ = ch;
2299 2605
2300 if (ch == C0_LF) 2606 if (ch == C0_LF)
2301 { 2607 {
2302 nlines++; 2608 nlines++;
2303 refresh_count++; 2609 refresh_count++;
2304 2610
2305 if (! (Options & Opt_jumpScroll) 2611 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2613 {
2308 refreshnow = true; 2614 refreshnow = true;
2309 ch = NOCHAR; 2615 ch = NOCHAR;
2310 break; 2616 break;
2311 } 2617 }
2312 2618
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2620 if (nlines >= TermWin.nrow - 1)
2315 { 2621 {
2316 scr_add_lines (buf, nlines, str - buf); 2622 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2623 nlines = 0;
2318 str = buf; 2624 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2628 if (str >= buf + UBUFSIZ)
2323 { 2629 {
2324 ch = NOCHAR; 2630 ch = NOCHAR;
2325 break; 2631 break;
2326 } 2632 }
2633
2634 seq_begin = cmdbuf_ptr;
2635 ch = next_char ();
2327 } 2636 }
2328 2637
2329 scr_add_lines (buf, nlines, str - buf); 2638 scr_add_lines (buf, nlines, str - buf);
2330 2639
2331 /* 2640 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2643 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2644 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2645 */
2337 if (refreshnow) 2646 if (refreshnow)
2338 { 2647 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2648 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2649 refresh_limit++;
2341 else 2650 else
2342 { 2651 {
2343 flag = true; 2652 flag = true;
2344 scr_refresh (refresh_type); 2653 scr_refresh (refresh_type);
… …
2534 process_escape_seq (); 2843 process_escape_seq ();
2535 break; 2844 break;
2536 case C0_ENQ: /* terminal Status */ 2845 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2846 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2847 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2848 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2849 else
2541 tt_write ((unsigned char *)VT100_ANS, 2850 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2851 (unsigned int)strlen (VT100_ANS));
2543 break; 2852 break;
2544 case C0_BEL: /* bell */ 2853 case C0_BEL: /* bell */
2545 scr_bell (); 2854 scr_bell ();
2546 break; 2855 break;
2547 case C0_BS: /* backspace */ 2856 case C0_BS: /* backspace */
… …
2646void 2955void
2647rxvt_term::process_escape_seq () 2956rxvt_term::process_escape_seq ()
2648{ 2957{
2649 unicode_t ch = cmd_getc (); 2958 unicode_t ch = cmd_getc ();
2650 2959
2651 if (PrivateModes & PrivMode_vt52) 2960 if (priv_modes & PrivMode_vt52)
2652 { 2961 {
2653 process_escape_vt52 (ch); 2962 process_escape_vt52 (ch);
2654 return; 2963 return;
2655 } 2964 }
2656 2965
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2980 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2981 break;
2673 case '+': 2982 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2983 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2984 break;
2676#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2677 case '6': 2986 case '6':
2678 scr_backindex (); 2987 scr_backindex ();
2679 break; 2988 break;
2680#endif 2989#endif
2681 case '7': 2990 case '7':
2682 scr_cursor (SAVE); 2991 scr_cursor (SAVE);
2683 break; 2992 break;
2684 case '8': 2993 case '8':
2685 scr_cursor (RESTORE); 2994 scr_cursor (RESTORE);
2686 break; 2995 break;
2687#ifndef NO_FRILLS 2996#if ENABLE_FRILLS
2688 case '9': 2997 case '9':
2689 scr_forwardindex (); 2998 scr_forwardindex ();
2690 break; 2999 break;
2691#endif 3000#endif
2692 case '=': 3001 case '=':
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3300 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3301 break;
2993 3302
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3303 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3304 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3305 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3306 break;
2998 3307
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3308 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3309 process_sgr_mode (nargs, arg);
3001 break; 3310 break;
… …
3008 break; 3317 break;
3009 case 6: /* CPR requested */ 3318 case 6: /* CPR requested */
3010 scr_report_position (); 3319 scr_report_position ();
3011 break; 3320 break;
3012 case 7: /* unofficial extension */ 3321 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3322 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3323 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3324 break;
3016 case 8: /* unofficial extension */ 3325 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3326 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3327 break;
3019 } 3328 }
… …
3055 break; 3364 break;
3056 3365
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3366 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3367 if (arg[0] == 4)
3059 scr_insert_mode (0); 3368 scr_insert_mode (0);
3369 else if (arg[0] == 20)
3370 priv_modes &= ~PrivMode_LFNL;
3060 break; 3371 break;
3061 3372
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3373 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3374 if (arg[0] == 4)
3064 scr_insert_mode (1); 3375 scr_insert_mode (1);
3376 else if (arg[0] == 20)
3377 priv_modes |= PrivMode_LFNL;
3065 break; 3378 break;
3066 3379
3067 /* 3380 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3381 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3382 */
… …
3081 break; 3394 break;
3082 case CSI_75: 3395 case CSI_75:
3083 scr_cursor (RESTORE); 3396 scr_cursor (RESTORE);
3084 break; 3397 break;
3085 3398
3086#ifndef NO_FRILLS 3399#if ENABLE_FRILLS
3087 case CSI_74: 3400 case CSI_74:
3088 process_window_ops (arg, nargs); 3401 process_window_ops (arg, nargs);
3089 break; 3402 break;
3090#endif 3403#endif
3091 3404
… …
3098 break; 3411 break;
3099 } 3412 }
3100} 3413}
3101/*}}} */ 3414/*}}} */
3102 3415
3103#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
3104/* ARGSUSED */ 3417/* ARGSUSED */
3105void 3418void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3419rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3420{
3108 int x, y; 3421 int x, y;
… …
3175 break; 3488 break;
3176 case 19: /* report window size (chars) */ 3489 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3491 break;
3179 case 20: /* report icon label */ 3492 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3493 {
3182 char *s; 3494 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3495 XGetIconName (display->display, TermWin.parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s);
3185 } 3498 }
3186 break; 3499 break;
3187 case 21: /* report window title */ 3500 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3501 {
3190 char *s; 3502 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3503 XFetchName (display->display, TermWin.parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s);
3193 } 3506 }
3194 break; 3507 break;
3195 } 3508 }
3196} 3509}
3197#endif 3510#endif
3198 3511
… …
3202 * ends_how is terminator used. returned input must be free()'d 3515 * ends_how is terminator used. returned input must be free()'d
3203 */ 3516 */
3204unsigned char * 3517unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3518rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3519{
3207 unicode_t prev = 0, ch; 3520 unicode_t ch;
3521 bool seen_esc = false;
3208 unsigned int n = 0; 3522 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3523 wchar_t string[STRING_MAX];
3211 3524
3212 while ((ch = cmd_getc ()) != NOCHAR) 3525 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3526 {
3214 if (prev == C0_ESC) 3527 if (seen_esc)
3215 { 3528 {
3216 if (ch == 0x5c) /* 7bit ST */ 3529 if (ch == 0x5c) /* 7bit ST */
3217 break; 3530 break;
3218 else 3531 else
3219 return NULL; 3532 return NULL;
3220 } 3533 }
3534 else if (ch == C0_ESC)
3535 {
3536 seen_esc = true;
3537 continue;
3538 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3539 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3540 break;
3223 else if (ch < 0x20) 3541 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3542 return NULL; /* other control character - exit */
3543
3544 seen_esc = false;
3225 3545
3226 if (n >= sizeof (string) - 1) 3546 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3547 // stop at some sane length
3228 return NULL; 3548 return NULL;
3229 3549
3230 if (ch == C0_SYN) 3550 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3551 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3552 else
3236 string[n++] = prev = ch; 3553 string[n++] = ch;
3237 } 3554 }
3238 3555
3239 string[n++] = '\0'; 3556 string[n++] = '\0';
3240 3557
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3558 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3559
3246 return s; 3560 return (unsigned char *)rxvt_wcstombs (string);
3247} 3561}
3248 3562
3249/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
3250/* 3564/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3609void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3611{
3298 if (str[0] == '?' && !str[1]) 3612 if (str[0] == '?' && !str[1])
3299 { 3613 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3614 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3615 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3617 }
3307 else 3618 else
3308 set_window_color (color, str); 3619 set_window_color (color, str);
3309} 3620}
3310 3621
… …
3338{ 3649{
3339 int changed = 0; 3650 int changed = 0;
3340 int color; 3651 int color;
3341 char *buf, *name; 3652 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3653 bool query = str[0] == '?' && !str[1];
3654 int saveop = op;
3343 3655
3344 assert (str != NULL); 3656 assert (str != NULL);
3345 switch (op) 3657 switch (op)
3346 { 3658 {
3347 case XTerm_name: 3659 case XTerm_name:
… …
3354 set_title (str); 3666 set_title (str);
3355 break; 3667 break;
3356 case XTerm_property: 3668 case XTerm_property:
3357 if (str[0] == '?') 3669 if (str[0] == '?')
3358 { 3670 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3671 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3672 Atom actual_type;
3361 int actual_format; 3673 int actual_format;
3362 unsigned long nitems; 3674 unsigned long nitems;
3363 unsigned long bytes_after; 3675 unsigned long bytes_after;
3364 unsigned char *value = 0; 3676 unsigned char *value = 0;
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3695
3384 if (eq) 3696 if (eq)
3385 { 3697 {
3386 *eq = 0; 3698 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3699 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3700 }
3392 else 3701 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3702 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str)); 3703 display->atom (str));
3395 } 3704 }
3396 break; 3705 break;
3397 3706
3398 case XTerm_Color: 3707 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3708 for (buf = (char *)str; buf && *buf;)
3400 { 3709 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3710 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3711 break;
3403 3712
3404 *name++ = '\0'; 3713 *name++ = '\0';
3405 color = atoi (buf); 3714 color = atoi (buf);
3406 3715
3407 if (color < 0 || color >= TOTAL_COLORS) 3716 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3717 break;
3409 3718
3410 if ((buf = STRCHR (name, ';')) != NULL) 3719 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3720 *buf++ = '\0';
3412 3721
3413 if (name[0] == '?' && !name[1]) 3722 if (name[0] == '?' && !name[1])
3414 { 3723 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3724 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3725 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3726 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3727 }
3422 else 3728 else
3423 set_window_color (color + minCOLOR, name); 3729 set_window_color (color + minCOLOR, name);
3424 } 3730 }
3425 break; 3731 break;
… …
3442 break; 3748 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3749#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD: 3750 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break; 3752 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3447 case XTerm_Color_UL: 3756 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3758 break;
3450 case XTerm_Color_RV: 3759 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 break;
3762#endif
3763#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3766 check_our_parents ();
3767 if (am_transparent)
3768 want_full_refresh = want_refresh = 1;
3452 break; 3769 break;
3453#endif 3770#endif
3454 3771
3455 case XTerm_Pixmap: 3772 case XTerm_Pixmap:
3456 if (*str != ';') 3773 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3776 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3777 set_bgPixmap (str); /* change pixmap */
3461#endif 3778#endif
3462 scr_touch (true); 3779 scr_touch (true);
3463 } 3780 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3781 while ((str = strchr (str, ';')) != NULL)
3465 { 3782 {
3466 str++; 3783 str++;
3467#if XPM_BACKGROUND 3784#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3785 changed += scale_pixmap (str);
3469#endif 3786#endif
… …
3488 case XTerm_logfile: 3805 case XTerm_logfile:
3489 // TODO, when secure mode? 3806 // TODO, when secure mode?
3490 break; 3807 break;
3491 3808
3492 case XTerm_font: 3809 case XTerm_font:
3810 op = URxvt_font;
3811 case URxvt_font:
3812#if ENABLE_STYLES
3813 case URxvt_boldFont:
3814 case URxvt_italicFont:
3815 case URxvt_boldItalicFont:
3816#endif
3493 if (query) 3817 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3821 resp);
3822 else
3494 { 3823 {
3495 if (Options & Opt_insecure) 3824 const char *&res = rs[Rs_font + (op - URxvt_font)];
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3825
3497 TermWin.fontset->fontdesc 3826 res = strdup (str);
3498 ? TermWin.fontset->fontdesc 3827 allocated.push_back ((void *)res);
3499 : "", 3828 set_fonts ();
3500 resp);
3501 } 3829 }
3502 else
3503 change_font (str);
3504 break; 3830 break;
3505 3831
3506#ifndef NO_FRILLS 3832#if ENABLE_FRILLS
3507 case XTerm_locale: 3833 case XTerm_locale:
3508 if (query) 3834 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3512 }
3513 else 3836 else
3514 { 3837 {
3515 set_locale (str); 3838 set_locale (str);
3516# ifdef USE_XIM 3839# ifdef USE_XIM
3517 im_cb (); 3840 im_cb ();
3518# endif 3841# endif
3519 } 3842 }
3520 break; 3843 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif 3844#endif
3531 3845
3532#ifdef MENUBAR 3846#ifdef MENUBAR
3533 case XTerm_Menu: 3847 case XTerm_Menu:
3534 if (Options & Opt_insecure) 3848 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3850 break;
3537#endif 3851#endif
3538#if 0 3852#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3853 case XTerm_dumpscreen: /* no error notices */
… …
3566{ 3880{
3567 int state; 3881 int state;
3568 3882
3569 if (mode == 's') 3883 if (mode == 's')
3570 { 3884 {
3571 SavedModes |= (PrivateModes & bit); 3885 SavedModes |= (priv_modes & bit);
3572 return -1; 3886 return -1;
3573 } 3887 }
3574 else 3888 else
3575 { 3889 {
3576 if (mode == 'r') 3890 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3891 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3892 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3893 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3894 PrivMode (state, bit);
3581 } 3895 }
3582 3896
3583 return state; 3897 return state;
3584} 3898}
… …
3602 { 3, PrivMode_132 }, 3916 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3917 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3918 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3919 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3920 { 7, PrivMode_Autowrap },
3921 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3922 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3923#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3924 { menuBar_esc, PrivMode_menuBar },
3610#endif 3925#endif
3926 // 18, 19 printing-related
3927 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3928#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3929 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3930#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3931 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3932 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3933 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3934 // 45 margin bell NYI
3621 // 46 start logging 3935 // 46 start logging
… …
3662 3976
3663 /* extra handling for values with state unkept */ 3977 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3978 switch (arg[i])
3665 { 3979 {
3666 case 1048: /* alternative cursor save */ 3980 case 1048: /* alternative cursor save */
3981 case 1049:
3667 if (Options & Opt_secondaryScreen) 3982 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 3983 if (mode == 0)
3669 scr_cursor (RESTORE); 3984 scr_cursor (RESTORE);
3670 else if (mode == 1) 3985 else if (mode == 1)
3671 scr_cursor (SAVE); 3986 scr_cursor (SAVE);
3672 break; 3987 break;
… …
3683 * within VT52 mode 3998 * within VT52 mode
3684 */ 3999 */
3685 PrivMode (1, PrivMode_vt52); 4000 PrivMode (1, PrivMode_vt52);
3686 break; 4001 break;
3687 case 3: /* 80/132 */ 4002 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4003 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4005 break;
3691 case 4: /* smooth scrolling */ 4006 case 4: /* smooth scrolling */
3692 if (state) 4007 if (state)
3693 Options &= ~Opt_jumpScroll; 4008 options &= ~Opt_jumpScroll;
3694 else 4009 else
3695 Options |= Opt_jumpScroll; 4010 options |= Opt_jumpScroll;
3696 break; 4011 break;
3697 case 5: /* reverse video */ 4012 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4013 scr_rvideo_mode (state);
3699 break; 4014 break;
3700 case 6: /* relative/absolute origins */ 4015 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4019 scr_autowrap (state);
3705 break; 4020 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4021 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4022 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4023 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4024 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4025 break;
3711#ifdef menuBar_esc 4026#ifdef menuBar_esc
3712 case menuBar_esc: 4027 case menuBar_esc:
3713#ifdef MENUBAR 4028#ifdef MENUBAR
3714 map_menuBar (state); 4029 map_menuBar (state);
… …
3734 break; 4049 break;
3735 /* case 66: - application key pad */ 4050 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4051 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4052 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4053 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4054 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4055 break;
3741#if 0 4056#if 0
3742 case 1001: 4057 case 1001:
3743 break; /* X11 mouse highlighting */ 4058 break; /* X11 mouse highlighting */
3744#endif 4059#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4060 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4061 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4062 options &= ~Opt_scrollTtyOutput;
3748 else 4063 else
3749 Options |= Opt_scrollTtyOutput; 4064 options |= Opt_scrollTtyOutput;
3750 break; 4065 break;
3751 case 1011: /* scroll to bottom on key press */ 4066 case 1011: /* scroll to bottom on key press */
3752 if (state) 4067 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4068 options |= Opt_scrollTtyKeypress;
3754 else 4069 else
3755 Options &= ~Opt_scrollTtyKeypress; 4070 options &= ~Opt_scrollTtyKeypress;
3756 break; 4071 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4072 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4073 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4074 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4075 scr_erase_screen (2);
3761 scr_change_screen (state); 4076 scr_change_screen (state);
3762 break; 4077 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4078 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4079 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4080 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4081 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4082 scr_erase_screen (2);
3768 break; 4083 break;
3769 default: 4084 default:
3770 break; 4085 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4111 rendset = 0, rendstyle = ~RS_None;
3797 break; 4112 break;
3798 case 1: 4113 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4114 rendset = 1, rendstyle = RS_Bold;
3800 break; 4115 break;
3801 //case 2: // faint or second colour 4116 //case 2: // low intensity
4117 case 3:
4118 rendset = 1, rendstyle = RS_Italic;
4119 break;
3802 case 4: 4120 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4121 rendset = 1, rendstyle = RS_Uline;
3804 break; 4122 break;
3805 case 5: // slowly blinking 4123 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4124 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4136 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4137 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4138 //...
3821 //case 19: // ninth alt font 4139 //case 19: // ninth alt font
3822 //case 20: // gothic 4140 //case 20: // gothic
3823 case 21: // disable bold, faint 4141 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4142 rendset = 0, rendstyle = RS_Bold;
3825 break; 4143 break;
3826 case 22: 4144 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4145 rendset = 0, rendstyle = RS_Bold;
3828 break; 4146 break;
3829 //case 23: disable italic 4147 case 23: // disable italic
4148 rendset = 0, rendstyle = RS_Italic;
4149 break;
3830 case 24: 4150 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4151 rendset = 0, rendstyle = RS_Uline;
3832 break; 4152 break;
3833 case 25: 4153 case 25:
4154 rendset = 0, rendstyle = RS_Blink;
4155 break;
4156 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4157 rendset = 0, rendstyle = RS_Blink;
3835 break; 4158 break;
3836 case 27: 4159 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4160 rendset = 0, rendstyle = RS_RVid;
3838 break; 4161 break;
… …
3856 case 35: 4179 case 35:
3857 case 36: 4180 case 36:
3858 case 37: 4181 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4183 break;
3861#ifdef TTY_256COLOR 4184 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4185 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4186 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4187 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4188 i += 2;
3867 } 4189 }
3868 break; 4190 break;
3869#endif
3870 case 39: /* default fg */ 4191 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4192 scr_color (Color_fg, Color_fg);
3872 break; 4193 break;
3873 4194
3874 case 40: 4195 case 40:
… …
3879 case 45: 4200 case 45:
3880 case 46: 4201 case 46:
3881 case 47: 4202 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4204 break;
3884#ifdef TTY_256COLOR 4205 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4206 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4207 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4208 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4209 i += 2;
3890 } 4210 }
3891 break; 4211 break;
3892#endif
3893 case 49: /* default bg */ 4212 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4213 scr_color (Color_bg, Color_bg);
3895 break; 4214 break;
4215
4216 //case 50: // not variable spacing
3896 4217
3897#ifndef NO_BRIGHTCOLOR 4218#ifndef NO_BRIGHTCOLOR
3898 case 90: 4219 case 90:
3899 case 91: /* set bright fg color */ 4220 case 91: /* set bright fg color */
3900 case 92: 4221 case 92:
3901 case 93: 4222 case 93:
3902 case 94: 4223 case 94:
3903 case 95: 4224 case 95:
3904 case 96: 4225 case 96:
3905 case 97: 4226 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4227 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4228 break;
3909 case 100: 4229 case 100:
3910 case 101: /* set bright bg color */ 4230 case 101: /* set bright bg color */
3911 case 102: 4231 case 102:
3912 case 103: 4232 case 103:
3913 case 104: 4233 case 104:
3914 case 105: 4234 case 105:
3915 case 106: 4235 case 106:
3916 case 107: 4236 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4237 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4238 break;
3920#endif 4239#endif
3921 4240
3922 } 4241 }
3923 } 4242 }
… …
3930{ 4249{
3931 unicode_t ch, cmd = cmd_getc (); 4250 unicode_t ch, cmd = cmd_getc ();
3932 4251
3933 if (cmd == 'Q') 4252 if (cmd == 'Q')
3934 { /* query graphics */ 4253 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4254 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4255 return;
3937 } 4256 }
3938 /* swallow other graphics sequences until terminating ':' */ 4257 /* swallow other graphics sequences until terminating ':' */
3939 do 4258 do
3940 ch = cmd_getc (); 4259 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4274 unsigned char buf[256];
3956 4275
3957 va_start (arg_ptr, fmt); 4276 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4277 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4278 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4279 tt_write (buf, strlen (buf));
3961} 4280}
3962 4281
3963/* ---------------------------------------------------------------------- */ 4282/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4283/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4284 * or generated by us in response to a query ESC sequence.
3966 */ 4285 */
4286const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4287
3967void 4288void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4289rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4290{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4291 if (v_buflen == 0)
4292 {
4293 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4294
3972 if (len) 4295 if ((unsigned int)written == len)
4296 return;
4297
4298 data += written;
4299 len -= written;
3973 { 4300 }
4301
4302 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4303
4304 memcpy (v_buffer + v_buflen, data, len);
4305 v_buflen += len;
4306
4307 pty_ev.set (EVENT_READ | EVENT_WRITE);
4308}
4309
4310void rxvt_term::pty_write ()
4311{
4312 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4313
4314 if (written > 0)
4315 {
4316 v_buflen -= written;
4317
3974 if (v_buflen == 0) 4318 if (v_buflen == 0)
3975 { 4319 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4320 free (v_buffer);
4003 v_buffer = 0; 4321 v_buffer = 0;
4004 v_buflen = 0; 4322 v_buflen = 0;
4005 4323
4006 pty_ev.set (EVENT_READ); 4324 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4325 return;
4019 } 4326 }
4327
4328 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4329 }
4330 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331 // original code just ignores this...
4332 destroy ();
4021} 4333}
4022 4334
4023/*----------------------- end-of-file (C source) -----------------------*/ 4335/*----------------------- end-of-file (C source) -----------------------*/
4024 4336

Diff Legend

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