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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 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 {
… …
683rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
684{ 941{
685 SET_R (this); 942 SET_R (this);
686 SET_LOCALE (locale); 943 SET_LOCALE (locale);
687 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;
688 flush (); 959 flush ();
689} 960}
690 961
691#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
692void 963void
… …
768 1039
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
772 1043
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1045
775 if (n > 0) 1046 if (n > 0)
776 { 1047 {
777 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
778 return true; 1049 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1059{
789 SET_R (this); 1060 SET_R (this);
790 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
791 1062
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1065 while (pty_fill ())
797 if (cmd_parse ()) 1066 if (cmd_parse ())
798 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
1071}
1072
1073void
1074rxvt_term::pointer_unblank ()
1075{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1077 recolour_cursor ();
1078
1079#ifdef POINTER_BLANK
1080 hidden_pointer = 0;
1081
1082 if (options & Opt_pointerBlank)
1083 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif
799} 1085}
800 1086
801#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
802void 1088void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
816{ 1090{
817 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
818 return; 1092 return;
819 1093
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
821 XFlush (display->display); 1095 XFlush (display->display);
822 1096
… …
842 x = ev.x; 1116 x = ev.x;
843 y = ev.y; 1117 y = ev.y;
844 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
845 1119
846 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1121 button_number = 3;
849 }
850 else 1122 else
851 { 1123 {
852 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1126 if (button_number >= 3)
855 button_number += (64 - 3); 1127 button_number += (64 - 3);
856 } 1128 }
857 1129
858 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
859 { 1131 {
860 /* 1132 /*
861 * do not report ButtonRelease 1133 * do not report ButtonRelease
862 * no state info allowed 1134 * no state info allowed
863 */ 1135 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1154#endif
883
884 } 1155 }
885 1156
886#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1159 if (key_state & 16)
889 fputc ('C', stderr); 1160 fputc ('C', stderr);
890 if (key_state & 4) 1161 if (key_state & 4)
891 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1166 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1168 button_number,
898 x + 1, 1169 x + 1,
899 y + 1); 1170 y + 1);
900#else 1171#endif
1172
901 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
903 (32 + x + 1), 1175 (32 + x + 1),
904 (32 + y + 1)); 1176 (32 + y + 1));
905#endif
906} 1177}
907 1178
908#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
909void 1180void
910rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
921{ 1192{
922 SET_R (this); 1193 SET_R (this);
923 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
924 1195
925#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
927 { 1198 {
928 if (hidden_cursor) 1199 if (hidden_cursor)
929 { 1200 {
930 hidden_cursor = 0; 1201 hidden_cursor = 0;
931 want_refresh = 1; 1202 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1206 }
936#endif 1207#endif
937 1208
938#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1211 {
941 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1215 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1219 pointer_blank ();
949 } 1220 }
950#endif 1221#endif
951 1222
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1225 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1226
1010 switch (ev.type) 1227 switch (ev.type)
1011 { 1228 {
1012 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1013 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;
1014 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
1015 1298
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1301 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
1028 } 1304#endif
1029 break; 1305 break;
1030 } 1306 }
1031#endif
1032 1307
1033 case ButtonPress: 1308 case ButtonPress:
1034 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1035 break; 1310 break;
1036 1311
… …
1060 0L, 1000000L, 1335 0L, 1000000L,
1061 False, AnyPropertyType, 1336 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1064 &data); 1339 &data);
1065 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1341 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1072 } 1344 }
1073#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1074 break; 1346 break;
1075 1347
1076 case MappingNotify: 1348 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1349 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1350 break;
1079 1351
1080 /* 1352 /*
1081 * XXX: this is not the _current_ arrangement 1353 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1354 * Here's my conclusion:
… …
1107 { 1379 {
1108 TermWin.focus = 1; 1380 TermWin.focus = 1;
1109 want_refresh = 1; 1381 want_refresh = 1;
1110#ifdef USE_XIM 1382#ifdef USE_XIM
1111 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1112 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1113#endif 1388#endif
1114#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1117#endif 1399#endif
1118 1400
1119 } 1401 }
1120 break; 1402 break;
1121 1403
1122 case FocusOut: 1404 case FocusOut:
1123 if (TermWin.focus) 1405 if (TermWin.focus)
1124 { 1406 {
1125 TermWin.focus = 0; 1407 TermWin.focus = 0;
1126 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
1127#ifdef USE_XIM 1416#ifdef USE_XIM
1128 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1130#endif 1419#endif
1131#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1134 hidden_cursor = 0; 1423 hidden_cursor = 0;
1135#endif 1424#endif
1136 1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1137 } 1432 }
1138 break; 1433 break;
1139 1434
1140 case ConfigureNotify: 1435 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1150 } 1445 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152 1447
1153 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1154 { 1449 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1450 seen_resize = 1;
1156 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1157 } 1452 }
1158#ifdef DEBUG_SIZE 1453
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1166 {
1167 check_our_parents (); 1456 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif 1457#endif
1172 } 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
1173 break; 1466 break;
1174 1467
1175 case SelectionClear: 1468 case SelectionClear:
1176 selection_clear (); 1469 selection_clear ();
1177 break; 1470 break;
1178 1471
1179 case SelectionNotify: 1472 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1475 break;
1184 1476
1185 case SelectionRequest: 1477 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1187 break; 1479 break;
… …
1208 1500
1209 case GraphicsExpose: 1501 case GraphicsExpose:
1210 case Expose: 1502 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == TermWin.vt)
1212 { 1504 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1505 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1506 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1507 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1509
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1515
1221 // ev.xexpose.width, TermWin.height, False); 1516 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1517 }
1225 else 1518 else
1226 { 1519 {
1227 XEvent unused_event; 1520 XEvent unused_event;
1228 1521
… …
1238 } 1531 }
1239#ifdef MENUBAR 1532#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1534 menubar_expose ();
1242#endif 1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1243 } 1541 }
1244 break; 1542 break;
1245 1543
1246 case MotionNotify: 1544 case MotionNotify:
1247#ifdef POINTER_BLANK 1545#ifdef POINTER_BLANK
… …
1253 { 1551 {
1254 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1255 break; 1553 break;
1256 } 1554 }
1257#endif 1555#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1557 break;
1260 1558
1261 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1262 { 1560 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1562 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1266 ; 1564 ;
1267 1565
1268 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1269 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1570 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1574 {
1277#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
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1280#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1283 { 1590 {
1284 int dist; 1591 int dist;
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1598
1292 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1294 */ 1601 */
1295 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1605
1300 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1302 { 1608 {
1303 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1305 } 1611 }
1306 else 1612 else
1307 { 1613 {
1308 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y -
1310 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1311 } 1616 }
1617
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1314 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1316 } 1623 }
1317 else 1624 else
1318 { 1625 {
1319 /* we are within the text window, so we 1626 /* we are within the text window, so we
1320 * shouldn't be scrolling 1627 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1629 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1324 } 1631 }
1325#endif 1632#endif
1326#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1327
1328 } 1634 }
1329#endif 1635#endif
1330
1331 } 1636 }
1332 } 1637 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1639 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1336 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1337 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1338 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1648 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1650 scrollbar_size ());
1344 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1347 } 1654 }
1348 break; 1655 break;
1349 } 1656 }
1350} 1657}
1351 1658
1659#if TRANSPARENT
1352void 1660void
1353rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1662{
1355 SET_R (this); 1663 SET_R (this);
1356 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1357 1665
1358 switch (ev.type) 1666 switch (ev.type)
1359 { 1667 {
1360 case PropertyNotify: 1668 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1669 /*
1371 * 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,
1372 * 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.
1373 */ 1672 */
1374 if (xa[XA_XROOTPMAPID] == 0) 1673 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376 1675
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1378 return; 1677 return;
1379 }
1380 1678
1381 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1382 case ReparentNotify: 1680 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1385 break; 1683 break;
1386#endif
1387 } 1684 }
1388} 1685}
1686#endif
1389 1687
1390void 1688void
1391rxvt_term::button_press (XButtonEvent &ev) 1689rxvt_term::button_press (XButtonEvent &ev)
1392{ 1690{
1393 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1394 1692
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1396 if (!bypass_keystate) 1694 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1398 /* 1697 /*
1399 * VT window processing of button press 1698 * VT window processing of button press
1400 */ 1699 */
1401 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1402 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1404 if (reportmode) 1713 if (reportmode)
1405 { 1714 {
1406 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1437 } 1746 }
1438 else 1747 else
1439 { 1748 {
1440 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1442 switch (ev.button) 1752 switch (ev.button)
1443 { 1753 {
1444 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1445 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1765 {
1448 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1450 else 1768 else
1451 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1784 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1469 else 1787 else
1470 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1471 MEvent.button = Button3; 1790 MEvent.button = Button3;
1472 break; 1791 break;
1473 } 1792 }
1474 } 1793 }
1794
1475 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1476 return; 1796 return;
1477 } 1797 }
1478 1798
1479 /* 1799 /*
… …
1571 break; 1891 break;
1572 case R_SB_ALIGN_BOTTOM: 1892 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1893 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1894 break;
1575 } 1895 }
1896
1576 if (scrollBar.style == R_SB_XTERM 1897 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1898 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1899 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1901
1581 scrollBar.setMotion (); 1902 scrollBar.setMotion ();
1582 break; 1903 break;
1583 1904
1584 case Button1: 1905 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1906 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 scr_page ((ev.button == Button1 ? DN : UP), 1930 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 1931 (TermWin.nrow
1611 * scrollbar_position (ev.y) 1932 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 1933 / scrollbar_size ()));
1613 } 1934 }
1935
1614 break; 1936 break;
1615 } 1937 }
1616 } 1938 }
1617 return; 1939 return;
1618 } 1940 }
… …
1630{ 1952{
1631 int reportmode = 0; 1953 int reportmode = 0;
1632 1954
1633 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 1956 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 1958
1637 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1638 { 1960 {
1639 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1640 scrollbar_show (0); 1962 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 1965#endif
1644
1645 } 1966 }
1967
1646#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 1969 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1970 sel_scroll_ev.stop();
1649#endif 1971#endif
1972
1650 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1651 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1652 if (reportmode) 1980 if (reportmode)
1653 { 1981 {
1654 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1671 mouse_report (ev); 1999 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2001 return;
1674 } 2002 }
2003
1675 /* 2004 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2006 * when overriding mouse reporting
1678 */ 2007 */
1679 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2009 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1683 2012
1684 switch (ev.button) 2013 switch (ev.button)
… …
1699 2028
1700 v = ev.button == Button4 ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
1701 2030
1702 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1703 i = 1; 2032 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2033 else if (options & Opt_mouseWheelScrollPage)
1705 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1706 else 2035 else
1707 i = 5; 2036 i = 5;
1708 2037
1709# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2039 if (ev.state & ControlMask)
1711 { 2040 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2041 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2044
2045 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047
2048 slip_wheel_ev.start ();
1714 } 2049 }
2050 else
2051 {
1715# endif 2052# endif
1716# ifdef JUMP_MOUSE_WHEEL 2053# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2054 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2055 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2056 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING
1726 } 2066 }
1727# endif 2067#endif
1728
1729 } 2068 }
1730 break; 2069 break;
1731#endif 2070#endif
1732
1733 } 2071 }
1734 } 2072 }
1735#ifdef MENUBAR 2073#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2074 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2075 menubar_control (ev);
1738#endif 2076#endif
1739} 2077}
1740 2078
1741#ifdef TRANSPARENT 2079#ifdef TRANSPARENT
1742#if TINTING 2080#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2081/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2082
1746static void 2083typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2084
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2086{
1754 /* No saturation */ 2087 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2088 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
1758 2093
1759 b = ((uint16_t *) ptr)[x]; 2094 Visual* visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2095
1761 g = (b & 0x3e0) * gm; 2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2097
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2098 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2099 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2100 mask_g = visual->green_mask;
1766 } 2101 mask_b = visual->blue_mask;
1767 ptr += bpl; 2102
1768 } 2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2176 } else {
1770 for (y = h; --y >= 0;) { 2177 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2178 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2179
1774 b = ((uint16_t *) ptr)[x]; 2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2181
1776 g = (b & 0x3e0) * gm; 2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2185 }
1780 b |= (!(b >> 5) - 1); 2186
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2189 {
1784 } 2190 unsigned int tmp;
1785 ptr += bpl; 2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
1786 } 2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2243 }
1788} 2244 break;
1789 2245 }
1790/* RGB 16 */ 2246 case 16:
1791static void 2247 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2248 unsigned short *p1, *pf, *p, *pl;
1793{ 2249 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2251 while (p1 < pf)
1796 2252 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2253 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2254 pl = p1 + srcImage->width;
1799 /* No saturation */ 2255 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2256 {
1814 } else { 2257 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2258 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2259 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2260 }
1830 ptr += bpl; 2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
1831 } 2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2281 }
1833} 2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2289
1835/* RGB 24 */ 2290 while (p1 < pf)
1836static void 2291 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2292 p = p1;
1838{ 2293 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2294 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2295 {
1867 } else { 2296 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2297 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2298 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2299 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2300 }
1898 ptr += bpl; 2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2302 }
2303 break;
2304 }
1900 } 2305 }
1901}
1902 2306
1903/* RGB 32 */ 2307 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2308}
1974
1975#endif 2309#endif
1976 2310
1977/* 2311/*
1978 * Check our parents are still who we think they are. 2312 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2313 * Do transparency updates if required
… …
1989 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
1991 2325
1992 pchanged = 0; 2326 pchanged = 0;
1993 2327
1994 if (!(Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
1996 2330
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
1999 2333
… …
2002 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
2003 { 2337 {
2004 if (am_transparent) 2338 if (am_transparent)
2005 { 2339 {
2006 pchanged = 1; 2340 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
2009 } 2343 }
2010 2344
2011 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2012 } 2346 }
… …
2028 i = (xa[XA_XSETROOTID] 2362 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2365 &nitems, &bytes_after, &prop) == Success);
2032 2366
2033 if (!i || prop == NULL) 2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
2034 have_pixmap = 0; 2372 have_pixmap = 0;
2035 else 2373 else
2036 { 2374 {
2037 have_pixmap = 1; 2375 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2376 rootpixmap = *(Pixmap *)prop;
… …
2071 sy = 0; 2409 sy = 0;
2072 } 2410 }
2073 2411
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2076 allowedxerror = -1; 2416 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2418
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2100 XFreePixmap (display->display, TermWin.pixmap); 2440 XFreePixmap (display->display, TermWin.pixmap);
2101 2441
2102#if TINTING 2442#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2443 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2444 {
2105 unsigned short shade, rm, gm, bm; 2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2447
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2449
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2450 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2451 }
2120#endif 2452#endif
2121 2453
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2123 szHint.width, szHint.height, image->depth); 2455 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2458 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2459 XFreeGC (display->display, gc);
2128 XDestroyImage (image); 2460 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2130 TermWin.pixmap); 2462 XClearWindow (display->display, TermWin.parent[0]);
2131 2463
2132 if (!am_transparent || !am_pixmap_trans) 2464 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2465 pchanged = 1;
2134 2466
2135 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2136 } 2468 }
2137 } 2469 }
2138 2470
2139 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2140 { 2474 {
2141 unsigned int n; 2475 unsigned int n;
2142 /* 2476 /*
2143 * InheritPixmap transparency 2477 * InheritPixmap transparency
2144 */ 2478 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 { 2480 {
2148 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2484 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2485
2154 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2155 { 2487 {
2156 if (oldp != None) 2488 if (oldp != None)
2157 pchanged = 1; 2489 pchanged = 1;
… …
2168 if (pchanged) 2500 if (pchanged)
2169 { 2501 {
2170 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2171 { 2503 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2506 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break; 2508 break;
2178 } 2509 }
2179 } 2510 }
2180 } 2511 }
2181 2512
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 { 2514 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2517 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2189 } 2519 }
2190 else 2520 else
2191 { 2521 {
2192#if WAIT_FOR_WM 2522#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2524 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2525 sleep (1);
2196#endif 2526#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2200 2532
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2202 am_transparent = 1; 2534 am_transparent = 1;
2203 } 2535 }
2204 2536
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2207 } 2553 }
2208 2554
2209 return pchanged; 2555 return pchanged;
2210} 2556}
2211#endif 2557#endif
… …
2230 if (ch == NOCHAR) // TODO: improve 2576 if (ch == NOCHAR) // TODO: improve
2231 break; 2577 break;
2232 2578
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2580 {
2581 if (!seen_input)
2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2235 /* Read a text string from the input buffer */ 2595 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2596 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2597 bool refreshnow = false;
2238 int nlines = 0; 2598 int nlines = 0;
2239 unicode_t *str = buf; 2599 unicode_t *str = buf;
2240 2600
2241 *str++ = ch;
2242
2243 for (;;) 2601 for (;;)
2244 { 2602 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2604 break;
2250 2605
2251 *str++ = ch; 2606 *str++ = ch;
2252 2607
2253 if (ch == C0_LF) 2608 if (ch == C0_LF)
2254 { 2609 {
2255 nlines++; 2610 nlines++;
2256 refresh_count++; 2611 refresh_count++;
2257 2612
2258 if (! (Options & Opt_jumpScroll) 2613 if (!(options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2260 { 2615 {
2261 refreshnow = true; 2616 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR; 2617 ch = NOCHAR;
2264 break; 2618 break;
2265 } 2619 }
2266 2620
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2622 if (nlines >= TermWin.nrow - 1)
2269 { 2623 {
2270 scr_add_lines (buf, nlines, str - buf); 2624 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0; 2625 nlines = 0;
2272 str = buf; 2626 str = buf;
… …
2276 if (str >= buf + UBUFSIZ) 2630 if (str >= buf + UBUFSIZ)
2277 { 2631 {
2278 ch = NOCHAR; 2632 ch = NOCHAR;
2279 break; 2633 break;
2280 } 2634 }
2635
2636 seq_begin = cmdbuf_ptr;
2637 ch = next_char ();
2281 } 2638 }
2282 2639
2283 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2284 2641
2285 /* 2642 /*
2286 * If there have been a lot of new lines, then update the screen 2643 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2644 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2645 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2646 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2647 */
2294 if (refreshnow) 2648 if (refreshnow)
2295 { 2649 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2651 refresh_limit++;
2298 else 2652 else
2653 {
2654 flag = true;
2299 scr_refresh (refresh_type); 2655 scr_refresh (refresh_type);
2656 }
2300 } 2657 }
2301 2658
2302 } 2659 }
2303 else 2660 else
2304 { 2661 {
… …
2488 process_escape_seq (); 2845 process_escape_seq ();
2489 break; 2846 break;
2490 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2494 else 2851 else
2495 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2496 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2497 break; 2854 break;
2498 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2499 scr_bell (); 2856 scr_bell ();
2500 break; 2857 break;
2501 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2600void 2957void
2601rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2602{ 2959{
2603 unicode_t ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2604 2961
2605 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2606 { 2963 {
2607 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2608 return; 2965 return;
2609 } 2966 }
2610 2967
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2983 break;
2627 case '+': 2984 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 2986 break;
2630#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2631 case '6': 2988 case '6':
2632 scr_backindex (); 2989 scr_backindex ();
2633 break; 2990 break;
2634#endif 2991#endif
2635 case '7': 2992 case '7':
2636 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2637 break; 2994 break;
2638 case '8': 2995 case '8':
2639 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2640 break; 2997 break;
2641#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2642 case '9': 2999 case '9':
2643 scr_forwardindex (); 3000 scr_forwardindex ();
2644 break; 3001 break;
2645#endif 3002#endif
2646 case '=': 3003 case '=':
… …
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2946 break; 3303 break;
2947 3304
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
2950 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3308 break;
2952 3309
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
2955 break; 3312 break;
… …
2962 break; 3319 break;
2963 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
2964 scr_report_position (); 3321 scr_report_position ();
2965 break; 3322 break;
2966 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3324 if (options & Opt_insecure)
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3326 break;
2970 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3329 break;
2973 } 3330 }
… …
3009 break; 3366 break;
3010 3367
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3369 if (arg[0] == 4)
3013 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
3014 break; 3373 break;
3015 3374
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3376 if (arg[0] == 4)
3018 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
3019 break; 3380 break;
3020 3381
3021 /* 3382 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3384 */
… …
3035 break; 3396 break;
3036 case CSI_75: 3397 case CSI_75:
3037 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
3038 break; 3399 break;
3039 3400
3040#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
3041 case CSI_74: 3402 case CSI_74:
3042 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
3043 break; 3404 break;
3044#endif 3405#endif
3045 3406
… …
3052 break; 3413 break;
3053 } 3414 }
3054} 3415}
3055/*}}} */ 3416/*}}} */
3056 3417
3057#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
3058/* ARGSUSED */ 3419/* ARGSUSED */
3059void 3420void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3422{
3062 int x, y; 3423 int x, y;
… …
3129 break; 3490 break;
3130 case 19: /* report window size (chars) */ 3491 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break; 3493 break;
3133 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3495 {
3136 char *s; 3496 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3139 } 3500 }
3140 break; 3501 break;
3141 case 21: /* report window title */ 3502 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3503 {
3144 char *s; 3504 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s);
3147 } 3508 }
3148 break; 3509 break;
3149 } 3510 }
3150} 3511}
3151#endif 3512#endif
3152 3513
… …
3156 * ends_how is terminator used. returned input must be free()'d 3517 * ends_how is terminator used. returned input must be free()'d
3157 */ 3518 */
3158unsigned char * 3519unsigned char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3521{
3161 unicode_t prev = 0, ch; 3522 unicode_t ch;
3523 bool seen_esc = false;
3162 unsigned int n = 0; 3524 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3165 3526
3166 while ((ch = cmd_getc ()) != NOCHAR) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3528 {
3168 if (prev == C0_ESC) 3529 if (seen_esc)
3169 { 3530 {
3170 if (ch == 0x5c) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
3171 break; 3532 break;
3172 else 3533 else
3173 return NULL; 3534 return NULL;
3174 } 3535 }
3536 else if (ch == C0_ESC)
3537 {
3538 seen_esc = true;
3539 continue;
3540 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3541 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3542 break;
3177 else if (ch < 0x20) 3543 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3179 3547
3180 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3181 // stop at some sane length 3549 // stop at some sane length
3182 return NULL; 3550 return NULL;
3183 3551
3184 if (ch == C0_SYN) 3552 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3553 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3554 else
3190 string[n++] = prev = ch; 3555 string[n++] = ch;
3191 } 3556 }
3192 3557
3193 string[n++] = '\0'; 3558 string[n++] = '\0';
3194 3559
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3561
3200 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3201} 3563}
3202 3564
3203/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3204/* 3566/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3249void 3611void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{ 3613{
3252 if (str[0] == '?' && !str[1]) 3614 if (str[0] == '?' && !str[1])
3253 { 3615 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3616 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3617 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3619 }
3261 else 3620 else
3262 set_window_color (color, str); 3621 set_window_color (color, str);
3263} 3622}
3264 3623
… …
3292{ 3651{
3293 int changed = 0; 3652 int changed = 0;
3294 int color; 3653 int color;
3295 char *buf, *name; 3654 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
3297 3657
3298 assert (str != NULL); 3658 assert (str != NULL);
3299 switch (op) 3659 switch (op)
3300 { 3660 {
3301 case XTerm_name: 3661 case XTerm_name:
… …
3308 set_title (str); 3668 set_title (str);
3309 break; 3669 break;
3310 case XTerm_property: 3670 case XTerm_property:
3311 if (str[0] == '?') 3671 if (str[0] == '?')
3312 { 3672 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3674 Atom actual_type;
3315 int actual_format; 3675 int actual_format;
3316 unsigned long nitems; 3676 unsigned long nitems;
3317 unsigned long bytes_after; 3677 unsigned long bytes_after;
3318 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3697
3338 if (eq) 3698 if (eq)
3339 { 3699 {
3340 *eq = 0; 3700 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3701 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3702 }
3346 else 3703 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3348 display->atom (str)); 3705 display->atom (str));
3349 } 3706 }
3350 break; 3707 break;
3351 3708
3352 case XTerm_Color: 3709 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
3354 { 3711 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3713 break;
3357 3714
3358 *name++ = '\0'; 3715 *name++ = '\0';
3359 color = atoi (buf); 3716 color = atoi (buf);
3360 3717
3361 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3719 break;
3363 3720
3364 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3722 *buf++ = '\0';
3366 3723
3367 if (name[0] == '?' && !name[1]) 3724 if (name[0] == '?' && !name[1])
3368 { 3725 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3726 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3729 }
3376 else 3730 else
3377 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
3378 } 3732 }
3379 break; 3733 break;
… …
3396 break; 3750 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break; 3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3401 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3760 break;
3404 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break;
3764#endif
3765#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3768 check_our_parents ();
3769 if (am_transparent)
3770 want_full_refresh = want_refresh = 1;
3406 break; 3771 break;
3407#endif 3772#endif
3408 3773
3409 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3410 if (*str != ';') 3775 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3415#endif 3780#endif
3416 scr_touch (true); 3781 scr_touch (true);
3417 } 3782 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3419 { 3784 {
3420 str++; 3785 str++;
3421#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3423#endif 3788#endif
… …
3442 case XTerm_logfile: 3807 case XTerm_logfile:
3443 // TODO, when secure mode? 3808 // TODO, when secure mode?
3444 break; 3809 break;
3445 3810
3446 case XTerm_font: 3811 case XTerm_font:
3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3447 if (query) 3819 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3823 resp);
3824 else
3448 { 3825 {
3449 if (Options & Opt_insecure) 3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3827
3451 TermWin.fontset->fontdesc 3828 res = strdup (str);
3452 ? TermWin.fontset->fontdesc 3829 allocated.push_back ((void *)res);
3453 : "", 3830 set_fonts ();
3454 resp);
3455 } 3831 }
3456 else
3457 change_font (str);
3458 break; 3832 break;
3459 3833
3460#ifndef NO_FRILLS 3834#if ENABLE_FRILLS
3461 case XTerm_locale: 3835 case XTerm_locale:
3462 if (query) 3836 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3466 }
3467 else 3838 else
3468 { 3839 {
3469 set_locale (str); 3840 set_locale (str);
3470# ifdef USE_XIM 3841# ifdef USE_XIM
3471 im_cb (); 3842 im_cb ();
3472# endif 3843# endif
3473 } 3844 }
3474 break; 3845 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif 3846#endif
3485 3847
3486#ifdef MENUBAR 3848#ifdef MENUBAR
3487 case XTerm_Menu: 3849 case XTerm_Menu:
3488 if (Options & Opt_insecure) 3850 if (options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3852 break;
3491#endif 3853#endif
3492#if 0 3854#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
… …
3520{ 3882{
3521 int state; 3883 int state;
3522 3884
3523 if (mode == 's') 3885 if (mode == 's')
3524 { 3886 {
3525 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3526 return -1; 3888 return -1;
3527 } 3889 }
3528 else 3890 else
3529 { 3891 {
3530 if (mode == 'r') 3892 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3894 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3896 PrivMode (state, bit);
3535 } 3897 }
3536 3898
3537 return state; 3899 return state;
3538} 3900}
… …
3556 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3925#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3564#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3932#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3935 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3936 // 45 margin bell NYI
3575 // 46 start logging 3937 // 46 start logging
… …
3616 3978
3617 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3980 switch (arg[i])
3619 { 3981 {
3620 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3621 if (Options & Opt_secondaryScreen) 3984 if (options & Opt_secondaryScreen)
3622 if (mode == 0) 3985 if (mode == 0)
3623 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3624 else if (mode == 1) 3987 else if (mode == 1)
3625 scr_cursor (SAVE); 3988 scr_cursor (SAVE);
3626 break; 3989 break;
… …
3637 * within VT52 mode 4000 * within VT52 mode
3638 */ 4001 */
3639 PrivMode (1, PrivMode_vt52); 4002 PrivMode (1, PrivMode_vt52);
3640 break; 4003 break;
3641 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3644 break; 4007 break;
3645 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3646 if (state) 4009 if (state)
3647 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3648 else 4011 else
3649 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3650 break; 4013 break;
3651 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3653 break; 4016 break;
3654 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4021 scr_autowrap (state);
3659 break; 4022 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4026 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4027 break;
3665#ifdef menuBar_esc 4028#ifdef menuBar_esc
3666 case menuBar_esc: 4029 case menuBar_esc:
3667#ifdef MENUBAR 4030#ifdef MENUBAR
3668 map_menuBar (state); 4031 map_menuBar (state);
… …
3688 break; 4051 break;
3689 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4056 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4057 break;
3695#if 0 4058#if 0
3696 case 1001: 4059 case 1001:
3697 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3698#endif 4061#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4063 if (state)
3701 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3702 else 4065 else
3703 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3704 break; 4067 break;
3705 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3706 if (state) 4069 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3708 else 4071 else
3709 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3710 break; 4073 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4074 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3713 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4077 scr_erase_screen (2);
3715 scr_change_screen (state); 4078 scr_change_screen (state);
3716 break; 4079 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4080 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4081 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4082 if (options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY) 4083 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4084 scr_erase_screen (2);
3722 break; 4085 break;
3723 default: 4086 default:
3724 break; 4087 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3751 break; 4114 break;
3752 case 1: 4115 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3754 break; 4117 break;
4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3755 case 4: 4122 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3757 break; 4124 break;
3758 case 5: 4125 case 5: // slowly blinking
4126 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4127 rendset = 1, rendstyle = RS_Blink;
3760 break; 4128 break;
3761 //case 6: // scoansi light background 4129 //case 6: // scoansi light background
3762 case 7: 4130 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4131 rendset = 1, rendstyle = RS_RVid;
3764 break; 4132 break;
3765 case 8: 4133 case 8:
3766 // invisible. NYI 4134 // invisible. NYI
3767 break; 4135 break;
4136 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4137 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4138 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4139 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4140 //...
4141 //case 19: // ninth alt font
4142 //case 20: // gothic
4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4144 rendset = 0, rendstyle = RS_Bold;
3773 break; 4145 break;
3774 case 22: 4146 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4147 rendset = 0, rendstyle = RS_Bold;
4148 break;
4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
3776 break; 4151 break;
3777 case 24: 4152 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3779 break; 4154 break;
3780 case 25: 4155 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4156 rendset = 0, rendstyle = RS_Blink;
3782 break; 4157 break;
4158 case 26: // variable spacing (iso 8613)
4159 rendset = 0, rendstyle = RS_Blink;
4160 break;
3783 case 27: 4161 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3785 break; 4163 break;
3786 case 28:
3787 // visible. NYI 4164 //case 28: // visible. NYI
3788 break; 4165 //case 29: // not crossed-out
3789 } 4166 }
3790 4167
3791 if (rendset != -1) 4168 if (rendset != -1)
3792 { 4169 {
3793 scr_rendition (rendset, rendstyle); 4170 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4181 case 35:
3805 case 36: 4182 case 36:
3806 case 37: 4183 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4185 break;
3809#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4188 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4190 i += 2;
3815 } 4191 }
3816 break; 4192 break;
3817#endif
3818 case 39: /* default fg */ 4193 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
3820 break; 4195 break;
3821 4196
3822 case 40: 4197 case 40:
… …
3827 case 45: 4202 case 45:
3828 case 46: 4203 case 46:
3829 case 47: 4204 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4206 break;
3832#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4209 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4211 i += 2;
3838 } 4212 }
3839 break; 4213 break;
3840#endif
3841 case 49: /* default bg */ 4214 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
3843 break; 4216 break;
4217
4218 //case 50: // not variable spacing
3844 4219
3845#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
3846 case 90: 4221 case 90:
3847 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
3848 case 92: 4223 case 92:
3849 case 93: 4224 case 93:
3850 case 94: 4225 case 94:
3851 case 95: 4226 case 95:
3852 case 96: 4227 case 96:
3853 case 97: 4228 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4230 break;
3857 case 100: 4231 case 100:
3858 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
3859 case 102: 4233 case 102:
3860 case 103: 4234 case 103:
3861 case 104: 4235 case 104:
3862 case 105: 4236 case 105:
3863 case 106: 4237 case 106:
3864 case 107: 4238 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4240 break;
3868#endif 4241#endif
3869 4242
3870 } 4243 }
3871 } 4244 }
… …
3878{ 4251{
3879 unicode_t ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
3880 4253
3881 if (cmd == 'Q') 4254 if (cmd == 'Q')
3882 { /* query graphics */ 4255 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4257 return;
3885 } 4258 }
3886 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
3887 do 4260 do
3888 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
3903 unsigned char buf[256]; 4276 unsigned char buf[256];
3904 4277
3905 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4280 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
3909} 4282}
3910 4283
3911/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
3914 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
3915void 4290void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3917{ 4292{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3919 4296
3920 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
3921 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
3922 if (v_buflen == 0) 4320 if (v_buflen == 0)
3923 { 4321 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4322 free (v_buffer);
3951 v_buffer = 0; 4323 v_buffer = 0;
3952 v_buflen = 0; 4324 v_buflen = 0;
3953 4325
3954 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4327 return;
3967 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
3969} 4335}
3970 4336
3971/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
3972 4338

Diff Legend

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