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.52 by pcg, Sun Feb 22 10:37:54 2004 UTC vs.
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
57
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
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
56 258
57/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
58void 260void
59rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
60{ 262{
… …
88#ifdef USE_XIM 290#ifdef USE_XIM
89 if (Input_Context) 291 if (Input_Context)
90 { 292 {
91 Status status_return; 293 Status status_return;
92 294
295#if 0
93#ifdef X_HAVE_UTF8_STRING 296#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 299 KBUFSZ, &keysym, &status_return);
97 else 300 else
301#endif
98#endif 302#endif
99 { 303 {
100 wchar_t wkbuf[KBUFSZ + 1]; 304 wchar_t wkbuf[KBUFSZ + 1];
101 305
102 // the XOpenIM manpage lies about hardcoding the locale 306 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 314 SET_LOCALE (locale);
111 315
112 if (status_return == XLookupChars 316 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 317 || status_return == XLookupBoth)
114 { 318 {
319 /* make sure the user can type ctrl-@, i.e. NUL */
320 if (len == 1 && *wkbuf == 0)
321 {
322 kbuf[0] = 0;
323 len = 1;
324 }
325 else
326 {
115 wkbuf[len] = 0; 327 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 328 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 329 if (len < 0)
118 len = 0; 330 len = 0;
331 }
119 } 332 }
120 else 333 else
121 len = 0; 334 len = 0;
122 } 335 }
123 336
… …
131 valid_keysym = keysym != NoSymbol; 344 valid_keysym = keysym != NoSymbol;
132 } 345 }
133 346
134 if (valid_keysym) 347 if (valid_keysym)
135 { 348 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 349 if (TermWin.saveLines)
158 { 350 {
159#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 352 if (!ctrl && !meta)
161 {
162#else 353#else
163 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
164 { 356 {
165#endif
166 int lnsppg; 357 int lnsppg;
167 358
168#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 361#else
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 411 {
221 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
223 } 414 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 416 {
226 switch (keysym) 417 switch (keysym)
227 { 418 {
228 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
231 return; 422 return;
423#if TODO
232 /* rxvt extras */ 424 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (FONT_UP); 426 change_font (FONT_UP);
235 return; 427 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (FONT_DN); 429 change_font (FONT_DN);
238 return; 430 return;
431#endif
239 } 432 }
240 } 433 }
241 } 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
242#ifdef PRINTPIPE 482#ifdef PRINTPIPE
243 if (keysym == XK_Print) 483 if (keysym == XK_Print)
244 { 484 {
245 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
246 return; 486 return;
… …
252#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
254 { 494 {
255 unsigned int l; 495 unsigned int l;
256 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
257 const unsigned char ch = C0_ESC;
258 497
259 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
260 l = (unsigned int)*kbuf0++; 499 l = (unsigned int)*kbuf0++;
261 500
262 /* escape prefix */ 501 /* escape prefix */
263 if (meta) 502 if (meta
264# ifdef META8_OPTION 503# ifdef META8_OPTION
265 if (meta_char == C0_ESC) 504 && meta_char == C0_ESC
266# endif 505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
267 tt_write (&ch, 1); 509 tt_write (&ch, 1);
510 }
511
268 tt_write (kbuf0, l); 512 tt_write (kbuf0, l);
269 return; 513 return;
270 } 514 }
271 else 515 else
272#endif 516#endif
… …
274 newlen = 1; 518 newlen = 1;
275 switch (keysym) 519 switch (keysym)
276 { 520 {
277#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
278 case XK_BackSpace: 522 case XK_BackSpace:
279 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
280 { 524 {
281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
282 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
283 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
284 } 528 }
285 else 529 else
286 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
287# ifdef MULTICHAR_SET
288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
289 {
290 int col, row;
291
292 newlen = STRLEN (kbuf);
293 col = screen.cur.col - 1;
294 row = screen.cur.row + TermWin.saveLines;
295 if (IS_MULTI2 (screen.rend[row][col]))
296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
297 }
298# endif
299 break; 531 break;
300#endif 532#endif
301#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
302 case XK_Delete: 534 case XK_Delete:
303 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
304# ifdef MULTICHAR_SET
305 if (Options & Opt_mc_hack)
306 {
307 int col, row;
308
309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
311 row = screen.cur.row + TermWin.saveLines;
312 if (IS_MULTI1 (screen.rend[row][col]))
313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
314 }
315# endif
316 break; 536 break;
317#endif 537#endif
318 case XK_Tab: 538 case XK_Tab:
319 if (shft) 539 if (shft)
320 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
321 else 541 else
322 { 542 {
323#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
324 if (ctrl) 544 if (ctrl)
325 meta = 1; 545 meta = 1;
… …
331 newlen = 0; 551 newlen = 0;
332 } 552 }
333 break; 553 break;
334 554
335#ifdef XK_KP_Left 555#ifdef XK_KP_Left
336 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
337 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
338 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
339 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
341 { 561 {
342 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
343 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
344 break; 564 break;
345 } 565 }
346 else 566 else
347 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
350#endif 570#endif
351 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
352 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
353 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
354 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
355 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
356 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
357 /* do Shift first */ 577 /* do Shift first */
358 if (shft) 578 if (shft)
359 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
360 else if (ctrl) 580 else if (ctrl)
361 { 581 {
362 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
364 } 584 }
365 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
366 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
367#ifdef MULTICHAR_SET
368 //TODO: ??
369 if (Options & Opt_mc_hack)
370 {
371 int col, row, m;
372
373 col = screen.cur.col;
374 row = screen.cur.row + TermWin.saveLines;
375 m = 0;
376 if (keysym == XK_Right
377 && IS_MULTI1 (screen.rend[row][col]))
378 m = 1;
379 else if (keysym == XK_Left)
380 {
381 if (col > 0)
382 {
383 if (IS_MULTI2 (screen.rend[row][col - 1]))
384 m = 1;
385 }
386 else if (screen.cur.row > 0)
387 {
388 col = screen.tlen[--row];
389 if (col == -1)
390 col = TermWin.ncol - 1;
391 else
392 col--;
393 if (col > 0
394 && IS_MULTI2 (screen.rend[row][col]))
395 m = 1;
396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
401#endif
402 break; 587 break;
403 588
404#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
405# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
406 case XK_KP_Prior: 591 case XK_KP_Prior:
407 /* allow shift to override */ 592 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
409 { 594 {
410 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
411 break; 596 break;
412 } 597 }
413 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
414# endif 599# endif
415 case XK_Prior: 600 case XK_Prior:
416 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
417 break; 602 break;
418# ifdef XK_KP_Next 603# ifdef XK_KP_Next
419 case XK_KP_Next: 604 case XK_KP_Next:
420 /* allow shift to override */ 605 /* allow shift to override */
421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
422 { 607 {
423 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
424 break; 609 break;
425 } 610 }
426 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
427# endif 612# endif
428 case XK_Next: 613 case XK_Next:
429 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
430 break; 615 break;
431#endif 616#endif
432 case XK_KP_Enter: 617 case XK_KP_Enter:
433 /* allow shift to override */ 618 /* allow shift to override */
434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
435 { 620 {
436 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';
437 } 633 }
438 else 634 else
439 { 635 {
440 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
441 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
442 } 638 }
443 break; 639 break;
444 640
445#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
446 case XK_KP_Begin: 642 case XK_KP_Begin:
447 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
448 break; 644 break;
449 645
450 case XK_KP_Insert: 646 case XK_KP_Insert:
451 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
452 break; 648 break;
453 649
454 case XK_KP_Delete: 650 case XK_KP_Delete:
455 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
456 break; 652 break;
457#endif 653#endif
458 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
459 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
460 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
461 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
462 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
463 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
464 break; 660 break;
465 661
466 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
467 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
478 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
479 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
480 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
481 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
482 /* allow shift to override */ 678 /* allow shift to override */
483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
484 { 680 {
485 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
486 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
487 } 683 }
488 else 684 else
489 { 685 {
490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
491 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
492 } 688 }
493 break; 689 break;
494 690
495 case XK_Find: 691 case XK_Find:
496 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
497 break; 693 break;
498 case XK_Insert: 694 case XK_Insert:
499 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
500 break; 696 break;
501#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
502 case DXK_Remove: 698 case DXK_Remove:
503 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
504#endif 700#endif
505 case XK_Execute: 701 case XK_Execute:
506 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
507 break; 703 break;
508 case XK_Select: 704 case XK_Select:
509 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
510 break; 706 break;
511#ifdef XK_KP_End 707#ifdef XK_KP_End
512 case XK_KP_End: 708 case XK_KP_End:
513 /* allow shift to override */ 709 /* allow shift to override */
514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
515 { 711 {
516 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
517 break; 713 break;
518 } 714 }
519 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
520#endif 716#endif
521 case XK_End: 717 case XK_End:
522 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
523 break; 719 break;
524#ifdef XK_KP_Home 720#ifdef XK_KP_Home
525 case XK_KP_Home: 721 case XK_KP_Home:
526 /* allow shift to override */ 722 /* allow shift to override */
527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
528 { 724 {
529 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
530 break; 726 break;
531 } 727 }
532 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
533#endif 729#endif
534 case XK_Home: 730 case XK_Home:
535 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
536 break; 732 break;
537 733
538#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
540 736
… …
593 default: 789 default:
594 newlen = 0; 790 newlen = 0;
595 break; 791 break;
596 } 792 }
597 if (newlen) 793 if (newlen)
598 len = STRLEN (kbuf); 794 len = strlen (kbuf);
599 } 795 }
796
600 /* 797 /*
601 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
602 */ 799 */
603#ifdef META8_OPTION 800#ifdef META8_OPTION
604 if (meta && (meta_char == 0x80) && len > 0) 801 if (meta && (meta_char == 0x80) && len > 0)
… …
619 { 816 {
620 unsigned char *ch; 817 unsigned char *ch;
621 818
622 for (ch = kbuf; ch < kbuf + len; ch++) 819 for (ch = kbuf; ch < kbuf + len; ch++)
623 *ch |= 0x80; 820 *ch |= 0x80;
821
624 meta = 0; 822 meta = 0;
625 } 823 }
626#endif 824#endif
627 /* nil */ ; 825 /* nil */ ;
628 } 826 }
629 } 827 }
630 828
631 if (len <= 0) 829 if (len <= 0)
632 return; /* not mapped */ 830 return; /* not mapped */
633 831
634 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
635 if (TermWin.view_start) 833 if (TermWin.view_start)
636 { 834 {
637 TermWin.view_start = 0; 835 TermWin.view_start = 0;
638 want_refresh = 1; 836 want_refresh = 1;
639 } 837 }
… …
653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 851 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
654 852
655 /* escape prefix */ 853 /* escape prefix */
656 if (meta 854 if (meta
657#ifdef META8_OPTION 855#ifdef META8_OPTION
658 && (meta_char == C0_ESC) 856 && meta_char == C0_ESC
659#endif 857#endif
660 ) 858 )
661 { 859 {
662 const unsigned char ch = C0_ESC; 860 const unsigned char ch = C0_ESC;
663
664 tt_write (&ch, 1); 861 tt_write (&ch, 1);
665 } 862 }
863
666#ifdef DEBUG_CMD 864#if defined(DEBUG_CMD)
667 if (debug_key)
668 { /* Display keyboard buffer contents */ 865 /* Display keyboard buffer contents */
669 char *p; 866 unsigned char *p;
670 int i; 867 int i;
671 868
672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
673 for (i = 0, p = kbuf; i < len; i++, p++) 870 for (i = 0, p = kbuf; i < len; i++, p++)
674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
675 fprintf (stderr, "'\n"); 872 fprintf (stderr, "'\n");
676 }
677#endif /* DEBUG_CMD */ 873#endif /* DEBUG_CMD */
678 tt_write (kbuf, (unsigned int)len); 874 tt_write (kbuf, (unsigned int)len);
679} 875}
680/*}}} */ 876/*}}} */
681 877
… …
683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
684/* attempt to `write' count to the input buffer */ 880/* attempt to `write' count to the input buffer */
685unsigned int 881unsigned int
686rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 882rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
687{ 883{
688 unsigned int n, s; 884 unsigned int n, s;
689 885
690 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
888
692 if (n > 0 && s < count) 889 if (n > 0 && s < count)
693 { 890 {
694 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
696 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
697 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
698 s += n; 895 s += n;
699 } 896 }
897
700 if (count > s) 898 if (count > s)
701 { 899 {
702 rxvt_print_error ("data loss: cmd_write too large"); 900 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
703 count = s; 901 count = s;
704 } 902 }
903
705 for (; count--;) 904 for (; count--;)
706 *cmdbuf_endp++ = *str++; 905 *cmdbuf_endp++ = *str++;
906
907 cmd_parse ();
908
707 return 0; 909 return 0;
708} 910}
709#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
710 912
711void 913void
712rxvt_term::flush () 914rxvt_term::flush ()
713{ 915{
916 flush_ev.stop ();
917
714#ifdef TRANSPARENT 918#ifdef TRANSPARENT
715 if (want_full_refresh) 919 if (want_full_refresh)
716 { 920 {
717 want_full_refresh = 0; 921 want_full_refresh = 0;
718 scr_clear (); 922 scr_clear ();
719 scr_touch (false); 923 scr_touch (false);
720 want_refresh = 1;
721 } 924 }
722#endif 925#endif
723 926
724 if (want_refresh) 927 if (want_refresh)
725 { 928 {
726 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
727 scrollbar_show (1); 930 scrollbar_show (1);
728#ifdef USE_XIM 931#ifdef USE_XIM
729 IMSendSpot (); 932 IMSendSpot ();
730#endif 933#endif
731
732 } 934 }
733 935
734 display->flush (); 936 display->flush ();
735} 937}
736 938
… …
738rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
739{ 941{
740 SET_R (this); 942 SET_R (this);
741 SET_LOCALE (locale); 943 SET_LOCALE (locale);
742 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;
743 flush (); 959 flush ();
744} 960}
745 961
746#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
747void 963void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 982 }
767} 983}
768#endif 984#endif
769 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
770bool 1029bool
771rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
772{ 1031{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
774 1039
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
778 1043
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
780 1045
781 if (n > 0) 1046 if (n > 0)
782 { 1047 {
783 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
784 return true; 1049 return true;
785 } 1050 }
786 else if (n < 0 && errno != EAGAIN) 1051 else if (n < 0 && errno != EAGAIN)
787 destroy (); 1052 destroy ();
788 1053
789 return false; 1054 return false;
790} 1055}
791 1056
792void 1057void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
… …
796 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
797 1062
798 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1064 tt_write (0, 0);
800 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
801 {
802 bool flag = true;
803
804 // loop, but don't allow a single term to monopolize us 1066 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 while (flag && pty_fill ()) 1067 while (pty_fill ())
807 { 1068 if (cmd_parse ())
808 if (!seen_input)
809 {
810 seen_input = 1;
811 /* once we know the shell is running, send the screen size. Again! */
812 tt_winch ();
813 }
814
815 uint32_t ch = NOCHAR;
816
817 for (;;)
818 {
819 if (ch == NOCHAR)
820 ch = next_char ();
821
822 if (ch == NOCHAR) // TODO: improve
823 break; 1069 break;
824
825 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
826 {
827 /* Read a text string from the input buffer */
828 uint32_t buf[BUFSIZ];
829 bool refreshnow = false;
830 int nlines = 0;
831 uint32_t *str = buf;
832
833 *str++ = ch;
834
835 for (;;)
836 {
837 ch = next_char ();
838
839 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
840 break;
841 else
842 {
843 *str++ = ch;
844
845 if (ch == '\n')
846 {
847 nlines++;
848 refresh_count++;
849
850 if (! (Options & Opt_jumpScroll)
851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 {
853 refreshnow = true;
854 flag = false;
855 ch = NOCHAR;
856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 scr_add_lines (buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 scr_refresh (refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 process_nonprinting (ch);
902 break;
903 case C0_ESC: /* escape char */
904 process_escape_seq ();
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* process_csi_seq (); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
915} 1070}
916 1071
917// read the next character, currently handles UTF-8 1072void
918// will probably handle all sorts of other stuff in the future 1073rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1074{
922 while (cmdbuf_ptr < cmdbuf_endp) 1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 1076 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1077
927 wchar_t wc; 1078#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1079 hidden_pointer = 0;
929 1080
930 if (len == (size_t)-2) 1081 if (options & Opt_pointerBlank)
931 return NOCHAR; 1082 pointer_ev.start (NOW + pointerBlankDelay);
932 1083#endif
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
942}
943
944/* rxvt_cmd_getc () - Return next input character */
945/*
946 * Return the next input character after first passing any keyboard input
947 * to the command.
948 */
949uint32_t
950rxvt_term::cmd_getc ()
951{
952 for (;;)
953 {
954 uint32_t c = next_char ();
955 if (c != NOCHAR)
956 return c;
957
958 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (cmd_fd, F_SETFL, 0);
961 pty_fill ();
962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964} 1084}
965 1085
966#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
967void 1087void
968rxvt_term::pointer_unblank ()
969{
970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
971 recolour_cursor ();
972
973 hidden_pointer = 0;
974
975 if (Options & Opt_pointerBlank)
976 pointer_ev.start (NOW + pointerBlankDelay);
977}
978
979void
980rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
981{ 1089{
982 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
983 return; 1091 return;
984 1092
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
986 XFlush (display->display); 1094 XFlush (display->display);
987 1095
… …
997 pointer_blank (); 1105 pointer_blank ();
998} 1106}
999#endif 1107#endif
1000 1108
1001void 1109void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1110rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1111{
1004 int button_number, key_state = 0; 1112 int button_number, key_state = 0;
1005 int x, y; 1113 int x, y;
1006 1114
1007 x = ev.x; 1115 x = ev.x;
1008 y = ev.y; 1116 y = ev.y;
1009 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
1010 1118
1011 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1120 button_number = 3;
1014 }
1015 else 1121 else
1016 { 1122 {
1017 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1125 if (button_number >= 3)
1020 button_number += (64 - 3); 1126 button_number += (64 - 3);
1021 } 1127 }
1022 1128
1023 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
1024 { 1130 {
1025 /* 1131 /*
1026 * do not report ButtonRelease 1132 * do not report ButtonRelease
1027 * no state info allowed 1133 * no state info allowed
1028 */ 1134 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1153#endif
1048
1049 } 1154 }
1050 1155
1051#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1158 if (key_state & 16)
1054 fputc ('C', stderr); 1159 fputc ('C', stderr);
1055 if (key_state & 4) 1160 if (key_state & 4)
1056 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1165 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1167 button_number,
1063 x + 1, 1168 x + 1,
1064 y + 1); 1169 y + 1);
1065#else 1170#endif
1171
1066 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
1068 (32 + x + 1), 1174 (32 + x + 1),
1069 (32 + y + 1)); 1175 (32 + y + 1));
1070#endif
1071} 1176}
1072 1177
1073#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
1074void 1179void
1075rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
1086{ 1191{
1087 SET_R (this); 1192 SET_R (this);
1088 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
1089 1194
1090#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1092 { 1197 {
1093 if (hidden_cursor) 1198 if (hidden_cursor)
1094 { 1199 {
1095 hidden_cursor = 0; 1200 hidden_cursor = 0;
1096 want_refresh = 1; 1201 want_refresh = 1;
… …
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 } 1205 }
1101#endif 1206#endif
1102 1207
1103#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 { 1210 {
1106 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
1109 if (hidden_pointer) 1214 if (hidden_pointer)
… …
1112 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank (); 1218 pointer_blank ();
1114 } 1219 }
1115#endif 1220#endif
1116 1221
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1122 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1224 unsigned int unused_mask;
1125 1225
1126#ifdef DEBUG_X
1127 const char *const eventnames[] =
1128 { /* mason - this matches my system */
1129 "",
1130 "",
1131 "KeyPress",
1132 "KeyRelease",
1133 "ButtonPress",
1134 "ButtonRelease",
1135 "MotionNotify",
1136 "EnterNotify",
1137 "LeaveNotify",
1138 "FocusIn",
1139 "FocusOut",
1140 "KeymapNotify",
1141 "Expose",
1142 "GraphicsExpose",
1143 "NoExpose",
1144 "VisibilityNotify",
1145 "CreateNotify",
1146 "DestroyNotify",
1147 "UnmapNotify",
1148 "MapNotify",
1149 "MapRequest",
1150 "ReparentNotify",
1151 "ConfigureNotify",
1152 "ConfigureRequest",
1153 "GravityNotify",
1154 "ResizeRequest",
1155 "CirculateNotify",
1156 "CirculateRequest",
1157 "PropertyNotify",
1158 "SelectionClear",
1159 "SelectionRequest",
1160 "SelectionNotify",
1161 "ColormapNotify",
1162 "ClientMessage",
1163 "MappingNotify"
1164 };
1165#endif
1166
1167#ifdef DEBUG_X
1168 struct timeval tp;
1169 struct tm *ltt;
1170 (void)gettimeofday (&tp, NULL);
1171 ltt = localtime (& (tp.tv_sec));
1172 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));
1173#endif
1174
1175 switch (ev.type) 1226 switch (ev.type)
1176 { 1227 {
1177 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1178 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1179 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1180 1297
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1186 else 1303#endif
1187 {
1188 KeySym ks;
1189
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0;
1193 }
1194 break; 1304 break;
1195 } 1305 }
1196#endif
1197 1306
1198 case ButtonPress: 1307 case ButtonPress:
1199 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1200 break; 1309 break;
1201 1310
… …
1213 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1216 { 1325 {
1217 /* Get Dnd data */ 1326 /* Get Dnd data */
1218 Atom ActualType; 1327 Atom ActualType;
1219 int ActualFormat; 1328 int ActualFormat;
1220 unsigned char *data; 1329 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1222 1331
1223 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1224 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1334 0L, 1000000L,
1226 False, AnyPropertyType, 1335 False, AnyPropertyType,
… …
1228 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1229 &data); 1338 &data);
1230 XChangeProperty (display->display, display->root, 1339 XChangeProperty (display->display, display->root,
1231 XA_CUT_BUFFER0, XA_STRING, 1340 XA_CUT_BUFFER0, XA_STRING,
1232 8, PropModeReplace, 1341 8, PropModeReplace,
1233 data, STRLEN (data)); 1342 data, strlen (data));
1343 XFree (data);
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1344 selection_paste (display->root, XA_CUT_BUFFER0, True);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1236 } 1346 }
1237#endif /* OFFIX_DND */ 1347#endif /* OFFIX_DND */
1238 break; 1348 break;
1239 1349
1240 case MappingNotify: 1350 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1351 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1352 break;
1243 1353
1244 /* 1354 /*
1245 * XXX: this is not the _current_ arrangement 1355 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1356 * Here's my conclusion:
… …
1271 { 1381 {
1272 TermWin.focus = 1; 1382 TermWin.focus = 1;
1273 want_refresh = 1; 1383 want_refresh = 1;
1274#ifdef USE_XIM 1384#ifdef USE_XIM
1275 if (Input_Context != NULL) 1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1276 XSetICFocus (Input_Context); 1388 XSetICFocus (Input_Context);
1389 }
1277#endif 1390#endif
1278#ifdef CURSOR_BLINK 1391#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1392 if (options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1281#endif 1401#endif
1282 1402
1283 } 1403 }
1284 break; 1404 break;
1285 1405
1286 case FocusOut: 1406 case FocusOut:
1287 if (TermWin.focus) 1407 if (TermWin.focus)
1288 { 1408 {
1289 TermWin.focus = 0; 1409 TermWin.focus = 0;
1290 want_refresh = 1; 1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1291#ifdef USE_XIM 1418#ifdef USE_XIM
1292 if (Input_Context != NULL) 1419 if (Input_Context != NULL)
1293 XUnsetICFocus (Input_Context); 1420 XUnsetICFocus (Input_Context);
1294#endif 1421#endif
1295#ifdef CURSOR_BLINK 1422#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1423 if (options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1424 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1425 hidden_cursor = 0;
1299#endif 1426#endif
1300 1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1301 } 1434 }
1302 break; 1435 break;
1303 1436
1304 case ConfigureNotify: 1437 case ConfigureNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == TermWin.parent[0])
… …
1314 } 1447 }
1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1316 1449
1317 if (szHint.width != width || szHint.height != height) 1450 if (szHint.width != width || szHint.height != height)
1318 { 1451 {
1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1452 seen_resize = 1;
1320 resize_all_windows (width, height, 1); 1453 resize_all_windows (width, height, 1);
1321 } 1454 }
1322#ifdef DEBUG_SIZE 1455
1323 else
1324 {
1325 D_SIZE ((stderr, "Size: Not resizing"));
1326 }
1327#endif
1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1329 if (Options & Opt_transparent) 1457 if (options & Opt_transparent)
1330 { 1458 {
1331 check_our_parents (); 1459 check_our_parents ();
1332 if (am_transparent) 1460 if (am_transparent)
1333 want_full_refresh = 1; 1461 want_refresh = want_full_refresh = 1;
1334 } 1462 }
1335#endif 1463#endif
1336
1337 } 1464 }
1338 break; 1465 break;
1339 1466
1467 case PropertyNotify:
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break;
1473
1340 case SelectionClear: 1474 case SelectionClear:
1341 display->set_selection_owner (0); 1475 selection_clear ();
1342 break; 1476 break;
1343 1477
1344 case SelectionNotify: 1478 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1480 selection_paste (ev.xselection.requestor,
… …
1373 1507
1374 case GraphicsExpose: 1508 case GraphicsExpose:
1375 case Expose: 1509 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1510 if (ev.xany.window == TermWin.vt)
1377 { 1511 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1512 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1516
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1522
1386 // ev.xexpose.width, TermWin.height, False); 1523 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1524 }
1390 else 1525 else
1391 { 1526 {
1392 XEvent unused_event; 1527 XEvent unused_event;
1393 1528
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1395 Expose, 1530 ;
1396 &unused_event)) ;
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1398 GraphicsExpose, 1532 ;
1399 &unused_event)) ; 1533
1400 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1401 { 1535 {
1402 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1403 scrollbar_show (0); 1537 scrollbar_show (0);
1404 } 1538 }
1405#ifdef MENUBAR 1539#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1541 menubar_expose ();
1408#endif 1542#endif
1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1409 } 1548 }
1410 break; 1549 break;
1411 1550
1412 case MotionNotify: 1551 case MotionNotify:
1413#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1554 pointer_unblank ();
1416#endif 1555#endif
1417#if MENUBAR 1556#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1557 if (isMenuBarWindow (ev.xany.window))
1419 { 1558 {
1420 menubar_control (& (ev.xbutton)); 1559 menubar_control (ev.xbutton);
1421 break; 1560 break;
1422 } 1561 }
1423#endif 1562#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1564 break;
1426 1565
1427 if (ev.xany.window == TermWin.vt) 1566 if (ev.xany.window == TermWin.vt)
1428 { 1567 {
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1568 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1569 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1432 ; 1571 ;
1433 1572
1434 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (display->display, TermWin.vt,
1435 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1577 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1581 {
1443#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1446#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1597 {
1450 int dist; 1598 int dist;
1451 1599
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
1456 */ 1602 */
1457 if (scroll_selection_delay<=0) 1603 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1605
1460 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1462 */ 1608 */
1463 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1612
1468 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < TermWin.int_bwidth)
1470 { 1615 {
1471 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = TermWin.int_bwidth - ev.xbutton.y;
1473 } 1618 }
1474 else 1619 else
1475 { 1620 {
1476 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y -
1478 (TermWin.int_bwidth + TermWin.height); 1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1479 } 1623 }
1624
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1482 MIN_IT (scroll_selection_lines, 1628 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1484 } 1630 }
1485 else 1631 else
1486 { 1632 {
1487 /* we are within the text window, so we 1633 /* we are within the text window, so we
1488 * shouldn't be scrolling 1634 * shouldn't be scrolling
1489 */ 1635 */
1490 pending_scroll_selection = 0; 1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop();
1491 } 1638 }
1492#endif 1639#endif
1493#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1494
1495 } 1641 }
1496#endif 1642#endif
1497
1498 } 1643 }
1499 } 1644 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1646 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1503 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1504 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (display->display, scrollBar.win,
1505 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1655 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1657 scrollbar_size ());
1511 scr_refresh (refresh_type); 1658 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1659 refresh_limit = 0;
… …
1514 } 1661 }
1515 break; 1662 break;
1516 } 1663 }
1517} 1664}
1518 1665
1666#if TRANSPARENT
1519void 1667void
1520rxvt_term::rootwin_cb (XEvent &ev) 1668rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1669{
1522 SET_R (this); 1670 SET_R (this);
1523 SET_LOCALE (locale); 1671 SET_LOCALE (locale);
1524 1672
1525 switch (ev.type) 1673 switch (ev.type)
1526 { 1674 {
1527 case PropertyNotify: 1675 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /* 1676 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1677 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on. 1678 * use the property to determine the pixmap. We use it later on.
1540 */ 1679 */
1541 if (xa[XA_XROOTPMAPID] == 0) 1680 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543 1682
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1545 return; 1684 return;
1546 }
1547 1685
1548 /* FALLTHROUGH */ 1686 /* FALLTHROUGH */
1549 case ReparentNotify: 1687 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1689 want_refresh = want_full_refresh = 1;
1553 break; 1690 break;
1554#endif
1555 } 1691 }
1556} 1692}
1693#endif
1557 1694
1558void 1695void
1559rxvt_term::button_press (const XButtonEvent &ev) 1696rxvt_term::button_press (XButtonEvent &ev)
1560{ 1697{
1561 int reportmode = 0, clickintime; 1698 int reportmode = 0, clickintime;
1562 1699
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1701 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1702 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703
1566 /* 1704 /*
1567 * VT window processing of button press 1705 * VT window processing of button press
1568 */ 1706 */
1569 if (ev.window == TermWin.vt) 1707 if (ev.window == TermWin.vt)
1570 { 1708 {
1709#if ISO_14755
1710 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 {
1713 iso14755_54 (ev.x, ev.y);
1714 return;
1715 }
1716#endif
1717
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1718 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1719
1572 if (reportmode) 1720 if (reportmode)
1573 { 1721 {
1574 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1724 MEvent.state = ev.state;
… …
1605 } 1753 }
1606 else 1754 else
1607 { 1755 {
1608 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1758
1610 switch (ev.button) 1759 switch (ev.button)
1611 { 1760 {
1612 case Button1: 1761 case Button1:
1762 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */
1764#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask);
1766#else
1767 selection.rect = false;
1768#endif
1769
1613 /* allow shift+left click to extend selection */ 1770 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1772 {
1616 if (MEvent.button == Button1 && clickintime) 1773 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1774 selection_rotate (ev.x, ev.y);
1618 else 1775 else
1619 selection_extend (ev.x, ev.y, 1); 1776 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1791 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1792 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1793 selection_rotate (ev.x, ev.y);
1637 else 1794 else
1638 selection_extend (ev.x, ev.y, 1); 1795 selection_extend (ev.x, ev.y, 1);
1796
1639 MEvent.button = Button3; 1797 MEvent.button = Button3;
1640 break; 1798 break;
1641 } 1799 }
1642 } 1800 }
1801
1643 MEvent.time = ev.time; 1802 MEvent.time = ev.time;
1644 return; 1803 return;
1645 } 1804 }
1646 1805
1647 /* 1806 /*
… …
1713 upordown = 1; /* down */ 1872 upordown = 1; /* down */
1714 } 1873 }
1715 if (upordown) 1874 if (upordown)
1716 { 1875 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1878#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1879 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1880 {
1722 if (upordown < 0) 1881 if (upordown < 0)
1723 scrollBar.setUp (); 1882 scrollBar.setUp ();
… …
1739 break; 1898 break;
1740 case R_SB_ALIGN_BOTTOM: 1899 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1900 csrO = scrollBar.bot - scrollBar.top;
1742 break; 1901 break;
1743 } 1902 }
1903
1744 if (scrollBar.style == R_SB_XTERM 1904 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 1905 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 1906 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 1907 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 1908
1749 scrollBar.setMotion (); 1909 scrollBar.setMotion ();
1750 break; 1910 break;
1751 1911
1752 case Button1: 1912 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1913 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1777 scr_page ((ev.button == Button1 ? DN : UP), 1937 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 1938 (TermWin.nrow
1779 * scrollbar_position (ev.y) 1939 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 1940 / scrollbar_size ()));
1781 } 1941 }
1942
1782 break; 1943 break;
1783 } 1944 }
1784 } 1945 }
1785 return; 1946 return;
1786 } 1947 }
… …
1792 menubar_control (ev); 1953 menubar_control (ev);
1793#endif 1954#endif
1794} 1955}
1795 1956
1796void 1957void
1797rxvt_term::button_release (const XButtonEvent &ev) 1958rxvt_term::button_release (XButtonEvent &ev)
1798{ 1959{
1799 int reportmode = 0; 1960 int reportmode = 0;
1800 1961
1801 csrO = 0; /* reset csr Offset */ 1962 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1963 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1964 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 1965
1805 if (scrollbar_isUpDn ()) 1966 if (scrollbar_isUpDn ())
1806 { 1967 {
1807 scrollBar.setIdle (); 1968 scrollBar.setIdle ();
1808 scrollbar_show (0); 1969 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 1971 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1972#endif
1812
1813 } 1973 }
1974
1814#ifdef SELECTION_SCROLLING 1975#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop();
1816#endif 1978#endif
1979
1817 if (ev.window == TermWin.vt) 1980 if (ev.window == TermWin.vt)
1818 { 1981 {
1982#if ISO_14755
1983 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return;
1986#endif
1819 if (reportmode) 1987 if (reportmode)
1820 { 1988 {
1821 /* mouse report from vt window */ 1989 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 1990 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 1991 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2005 MEvent.button = AnyButton;
1838 mouse_report (ev); 2006 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2007#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2008 return;
1841 } 2009 }
2010
1842 /* 2011 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2012 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2013 * when overriding mouse reporting
1845 */ 2014 */
1846 if (PrivateModes & PrivMode_mouse_report 2015 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2016 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2017 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2018 selection_extend (ev.x, ev.y, 0);
1850 2019
1851 switch (ev.button) 2020 switch (ev.button)
… …
1862 case Button5: 2031 case Button5:
1863 { 2032 {
1864 int i; 2033 int i;
1865 page_dirn v; 2034 page_dirn v;
1866 2035
1867 v = (ev.button == Button4) ? UP : DN; 2036 v = ev.button == Button4 ? UP : DN;
2037
1868 if (ev.state & ShiftMask) 2038 if (ev.state & ShiftMask)
1869 i = 1; 2039 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2040 else if (options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 2041 i = TermWin.nrow - 1;
1872 else 2042 else
1873 i = 5; 2043 i = 5;
2044
1874# ifdef MOUSE_SLIP_WHEELING 2045# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2046 if (ev.state & ControlMask)
1876 { 2047 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2048 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2051
2052 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054
2055 slip_wheel_ev.start ();
1879 } 2056 }
2057 else
2058 {
1880# endif 2059# endif
1881# ifdef JUMP_MOUSE_WHEEL 2060# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1888 scr_page (v, 1); 2061 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2062 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2063 scrollbar_show (1);
2064# else
2065 while (i--)
2066 {
2067 scr_page (v, 1);
2068 scr_refresh (SMOOTH_REFRESH);
2069 scrollbar_show (1);
2070 }
2071# endif
2072# ifdef MOUSE_SLIP_WHEELING
1891 } 2073 }
1892# endif 2074#endif
1893
1894 } 2075 }
1895 break; 2076 break;
1896#endif 2077#endif
1897
1898 } 2078 }
1899 } 2079 }
1900#ifdef MENUBAR 2080#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2081 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2082 menubar_control (ev);
1903#endif 2083#endif
1904} 2084}
1905 2085
1906
1907#ifdef TRANSPARENT 2086#ifdef TRANSPARENT
2087#if TINTING
2088/* taken from aterm-0.4.2 */
2089
2090typedef uint32_t RUINT32T;
2091
2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2093{
2094 int sh_r, sh_g, sh_b;
2095 RUINT32T mask_r, mask_g, mask_b;
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
2100
2101 Visual* visual = display->visual;
2102
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104
2105 /* for convenience */
2106 mask_r = visual->red_mask;
2107 mask_g = visual->green_mask;
2108 mask_b = visual->blue_mask;
2109
2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2183 } else {
2184 if (shade < 0) shade = 0;
2185 if (shade > 100) shade = 100;
2186
2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2188
2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2192 }
2193
2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2196 {
2197 unsigned int tmp;
2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2250 }
2251 break;
2252 }
2253 case 16:
2254 {
2255 unsigned short *p1, *pf, *p, *pl;
2256 p1 = (unsigned short *) srcImage->data;
2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2258 while (p1 < pf)
2259 {
2260 p = p1;
2261 pl = p1 + srcImage->width;
2262 for (; p < pl; p++)
2263 {
2264 *p = lookup_r[(*p & 0xf800)>>11] |
2265 lookup_g[(*p & 0x07e0)>> 5] |
2266 lookup_b[(*p & 0x001f)];
2267 }
2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2288 }
2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2296
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xff0000)>>16] |
2304 lookup_g[(*p & 0x00ff00)>> 8] |
2305 lookup_b[(*p & 0x0000ff)] |
2306 (*p & ~0xffffff);
2307 }
2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2309 }
2310 break;
2311 }
2312 }
2313
2314 free (lookup);
2315}
2316#endif
2317
1908/* 2318/*
1909 * Check our parents are still who we think they are. 2319 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2320 * Do transparency updates if required
1911 */ 2321 */
1912int 2322int
1913rxvt_term::check_our_parents () 2323rxvt_term::check_our_parents ()
1914{ 2324{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2325 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2326 unsigned long nitems, bytes_after;
1917 Atom atype; 2327 Atom atype;
1918 unsigned char *prop = NULL; 2328 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2329 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2330 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2331 XWindowAttributes wattr, wrootattr;
1922 2332
1923 pchanged = 0; 2333 pchanged = 0;
1924 2334
1925 if (! (Options & Opt_transparent)) 2335 if (!(options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2336 return pchanged; /* Don't try any more */
1927 2337
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2339 rootdepth = wrootattr.depth;
1930 2340
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2342
1932 if (rootdepth != wattr.depth) 2343 if (rootdepth != wattr.depth)
1933 { 2344 {
1934 if (am_transparent) 2345 if (am_transparent)
1935 { 2346 {
1936 pchanged = 1; 2347 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2349 am_transparent = am_pixmap_trans = 0;
1940 } 2350 }
2351
1941 return pchanged; /* Don't try any more */ 2352 return pchanged; /* Don't try any more */
1942 } 2353 }
1943 2354
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2355 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2356 XSync (display->display, False);
… …
1947 /* 2358 /*
1948 * Make the frame window set by the window manager have 2359 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2360 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2361 * windows for each client, so we have to take care about that.
1951 */ 2362 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2363 i = (xa[XA_XROOTPMAPID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2366 &nitems, &bytes_after, &prop) == Success);
2367
1956 if (!i || prop == NULL) 2368 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success);
2373
2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
1957 have_pixmap = 0; 2379 have_pixmap = 0;
1958 else 2380 else
1959 { 2381 {
1960 have_pixmap = 1; 2382 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2383 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2384 XFree (prop);
1963 } 2385 }
2386
1964 if (have_pixmap) 2387 if (have_pixmap)
1965 { 2388 {
1966 /* 2389 /*
1967 * Copy display->root pixmap transparency 2390 * Copy display->root pixmap transparency
1968 */ 2391 */
1969 int sx, sy, nx, ny; 2392 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2393 unsigned int nw, nh;
1971 Window cr; 2394 Window cr;
1972 XImage *image; 2395 XImage *image;
1973 GC gc; 2396 GC gc;
1974 XGCValues gcvalue; 2397 XGCValues gcvalue;
1975 2398
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2400 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2401 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2402 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2403 nx = ny = 0;
2404
1981 if (sx < 0) 2405 if (sx < 0)
1982 { 2406 {
1983 nw += sx; 2407 nw += sx;
1984 nx = -sx; 2408 nx = -sx;
1985 sx = 0; 2409 sx = 0;
1986 } 2410 }
2411
1987 if (sy < 0) 2412 if (sy < 0)
1988 { 2413 {
1989 nh += sy; 2414 nh += sy;
1990 ny = -sy; 2415 ny = -sy;
1991 sy = 0; 2416 sy = 0;
1992 } 2417 }
2418
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1995 allowedxerror = -1; 2421 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2423
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2425 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2426 allowedxerror = 0;
2427
2001 if (image == NULL) 2428 if (image == NULL)
2002 { 2429 {
2003 if (am_transparent && am_pixmap_trans) 2430 if (am_transparent && am_pixmap_trans)
2004 { 2431 {
2005 pchanged = 1; 2432 pchanged = 1;
… …
2007 { 2434 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (display->display, TermWin.pixmap);
2009 TermWin.pixmap = None; 2436 TermWin.pixmap = None;
2010 } 2437 }
2011 } 2438 }
2439
2012 am_pixmap_trans = 0; 2440 am_pixmap_trans = 0;
2013 } 2441 }
2014 else 2442 else
2015 { 2443 {
2016 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2445 XFreePixmap (display->display, TermWin.pixmap);
2446
2447#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint))
2449 {
2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2452
2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2454
2455 ShadeXImage (display, image, shade, rm, gm, bm);
2456 }
2457#endif
2458
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2460 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2463 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2464 XFreeGC (display->display, gc);
2027 XDestroyImage (image); 2465 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2029 TermWin.pixmap); 2467 XClearWindow (display->display, TermWin.parent[0]);
2468
2030 if (!am_transparent || !am_pixmap_trans) 2469 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2470 pchanged = 1;
2471
2032 am_transparent = am_pixmap_trans = 1; 2472 am_transparent = am_pixmap_trans = 1;
2033 } 2473 }
2034 } 2474 }
2475
2035 if (!am_pixmap_trans) 2476 if (!am_pixmap_trans)
2036 { 2477 {
2037 unsigned int n; 2478 unsigned int n;
2038 /* 2479 /*
2039 * InheritPixmap transparency 2480 * InheritPixmap transparency
2040 */ 2481 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2483 {
2045 oldp = TermWin.parent[i]; 2484 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2486 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2487 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2488
2050 if (TermWin.parent[i] == display->root) 2489 if (TermWin.parent[i] == display->root)
2051 { 2490 {
2052 if (oldp != None) 2491 if (oldp != None)
2053 pchanged = 1; 2492 pchanged = 1;
2493
2054 break; 2494 break;
2055 } 2495 }
2496
2056 if (oldp != TermWin.parent[i]) 2497 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2498 pchanged = 1;
2058 } 2499 }
2500
2059 n = 0; 2501 n = 0;
2502
2060 if (pchanged) 2503 if (pchanged)
2061 { 2504 {
2062 for (; n < (unsigned int)i; n++) 2505 for (; n < (unsigned int)i; n++)
2063 { 2506 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2509 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2511 break;
2070 } 2512 }
2071 } 2513 }
2072 } 2514 }
2073 if (n > (int) (sizeof (TermWin.parent) 2515
2074 / sizeof (TermWin.parent[0]))) 2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2517 {
2076 D_X ((stderr, "InheritPixmap Turning off"));
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2078 PixColors[Color_fg]);
2079 XSetWindowBackground (display->display, TermWin.vt, 2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2080 PixColors[Color_bg]);
2081 am_transparent = 0; 2520 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2521 /* XXX: also turn off Opt_transparent? */
2083 } 2522 }
2084 else 2523 else
2085 { 2524 {
2525#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2526 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2527 * needed for fvwm2.2.2 (and before?) */
2088# ifdef HAVE_NANOSLEEP
2089 struct timespec rqt;
2090
2091 rqt.tv_sec = 1;
2092 rqt.tv_nsec = 0;
2093 nanosleep (&rqt, NULL);
2094# else
2095 sleep (1); 2528 sleep (1);
2096# endif 2529#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2535
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2537 am_transparent = 1;
2104 } 2538 }
2539
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2541 TermWin.parent[i] = None;
2107 } 2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2549 }
2550
2108 return pchanged; 2551 return pchanged;
2109} 2552}
2110#endif 2553#endif
2111 2554
2112/*}}} */ 2555/*}}} */
2556
2557bool
2558rxvt_term::cmd_parse ()
2559{
2560 bool flag = false;
2561 unicode_t ch = NOCHAR;
2562 unsigned char *seq_begin; // remember start of esc-sequence here
2563
2564 for (;;)
2565 {
2566 if (ch == NOCHAR)
2567 {
2568 seq_begin = cmdbuf_ptr;
2569 ch = next_char ();
2570 }
2571
2572 if (ch == NOCHAR) // TODO: improve
2573 break;
2574
2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 {
2577 if (!seen_input)
2578 {
2579 seen_input = 1;
2580 // many badly-written programs (e.g. jed) contain a race condition:
2581 // they first read the screensize and then install a SIGWINCH handler.
2582 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized.
2587 if (seen_resize)
2588 kill (-cmd_pid, SIGWINCH);
2589 }
2590
2591 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false;
2594 int nlines = 0;
2595 unicode_t *str = buf;
2596
2597 for (;;)
2598 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break;
2601
2602 *str++ = ch;
2603
2604 if (ch == C0_LF)
2605 {
2606 nlines++;
2607 refresh_count++;
2608
2609 if (!(options & Opt_jumpScroll)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2611 {
2612 refreshnow = true;
2613 ch = NOCHAR;
2614 break;
2615 }
2616
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2618 if (nlines >= TermWin.nrow - 1)
2619 {
2620 scr_add_lines (buf, nlines, str - buf);
2621 nlines = 0;
2622 str = buf;
2623 }
2624 }
2625
2626 if (str >= buf + UBUFSIZ)
2627 {
2628 ch = NOCHAR;
2629 break;
2630 }
2631
2632 seq_begin = cmdbuf_ptr;
2633 ch = next_char ();
2634 }
2635
2636 scr_add_lines (buf, nlines, str - buf);
2637
2638 /*
2639 * If there have been a lot of new lines, then update the screen
2640 * What the heck I'll cheat and only refresh less than every page-full.
2641 * the number of pages between refreshes is refresh_limit, which
2642 * is incremented here because we must be doing flat-out scrolling.
2643 */
2644 if (refreshnow)
2645 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++;
2648 else
2649 {
2650 flag = true;
2651 scr_refresh (refresh_type);
2652 }
2653 }
2654
2655 }
2656 else
2657 {
2658 try
2659 {
2660 process_nonprinting (ch);
2661 }
2662 catch (const class out_of_input &o)
2663 {
2664 // we ran out of input, retry later
2665 cmdbuf_ptr = seq_begin;
2666 break;
2667 }
2668
2669 ch = NOCHAR;
2670 }
2671 }
2672
2673 return flag;
2674}
2675
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2685// read the next character
2686unicode_t
2687rxvt_term::next_char ()
2688{
2689 while (cmdbuf_ptr < cmdbuf_endp)
2690 {
2691 // assume 7-bit to be ascii ALWAYS
2692 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2693 return *cmdbuf_ptr++;
2694
2695 wchar_t wc;
2696 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2697
2698 if (len == (size_t)-2)
2699 {
2700 // the mbstate stores incomplete sequences. didn't know this :/
2701 cmdbuf_ptr = cmdbuf_endp;
2702 break;
2703 }
2704
2705 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707
2708 // assume wchar == unicode
2709 cmdbuf_ptr += len;
2710 return wc;
2711 }
2712
2713 return NOCHAR;
2714}
2715
2716/* rxvt_cmd_getc () - Return next input character */
2717/*
2718 * Return the next input character after first passing any keyboard input
2719 * to the command.
2720 */
2721unicode_t
2722rxvt_term::cmd_getc ()
2723{
2724 unicode_t c = next_char ();
2725
2726 if (c == NOCHAR)
2727 throw out_of_input;
2728
2729 return c;
2730}
2731
2732unicode_t
2733rxvt_term::cmd_get8 ()
2734{
2735 unicode_t c = next_octet ();
2736
2737 if (c == NOCHAR)
2738 throw out_of_input;
2739
2740 return c;
2741}
2113 2742
2114/*{{{ print pipe */ 2743/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2744/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2745#ifdef PRINTPIPE
2117FILE * 2746FILE *
2118rxvt_term::popen_printer () 2747rxvt_term::popen_printer ()
2119{ 2748{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2749 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2750
2122 if (stream == NULL) 2751 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2752 rxvt_warn ("can't open printer pipe, not printing.\n");
2753
2124 return stream; 2754 return stream;
2125} 2755}
2126 2756
2127int 2757int
2128rxvt_term::pclose_printer (FILE *stream) 2758rxvt_term::pclose_printer (FILE *stream)
2129{ 2759{
2130 fflush (stream); 2760 fflush (stream);
2131 /* pclose () reported not to work on SunOS 4.1.3 */
2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2133 /* pclose works provided SIGCHLD handler uses waitpid */
2134 return pclose (stream); /* return fclose (stream); */
2135# else
2136 return pclose (stream); 2761 return pclose (stream);
2137# endif
2138} 2762}
2139 2763
2140/* 2764/*
2141 * simulate attached vt100 printer 2765 * simulate attached vt100 printer
2142 */ 2766 */
2143void 2767void
2144rxvt_term::process_print_pipe () 2768rxvt_term::process_print_pipe ()
2145{ 2769{
2146 int done; 2770 int done;
2147 FILE *fd; 2771 FILE *fd;
2148 2772
2149 if ((fd = popen_printer ()) == NULL) 2773 if ((fd = popen_printer ()) == NULL)
2150 return; 2774 return;
2151 2775
2152 /* 2776 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2777 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2778 * is received.
2155 */ 2779 */
2156 for (done = 0; !done;) 2780 for (done = 0; !done;)
2157 { 2781 {
2158 unsigned char buf[8]; 2782 unsigned char buf[8];
2159 unsigned char ch; 2783 unicode_t ch;
2160 unsigned int i, len; 2784 unsigned int i, len;
2161 2785
2162 if ((ch = cmd_getc ()) != C0_ESC) 2786 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2787 {
2164 if (putc (ch, fd) == EOF) 2788 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2789 break; /* done = 1 */
… …
2180 { 2804 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2805 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2806 break; /* done = 1 */
2183 } 2807 }
2184 } 2808 }
2809
2185 for (i = 0; i < len; i++) 2810 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2811 if (putc (buf[i], fd) == EOF)
2187 { 2812 {
2188 done = 1; 2813 done = 1;
2189 break; 2814 break;
2190 } 2815 }
2191 } 2816 }
2192 } 2817 }
2818
2193 pclose_printer (fd); 2819 pclose_printer (fd);
2194} 2820}
2195#endif /* PRINTPIPE */ 2821#endif /* PRINTPIPE */
2196/*}}} */ 2822/*}}} */
2197 2823
2198/* *INDENT-OFF* */ 2824/* *INDENT-OFF* */
2199enum { 2825enum {
2200 C1_40 = 0x40, 2826 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2827 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2828 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2829 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2830 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2831};
2206/* *INDENT-ON* */ 2832/* *INDENT-ON* */
2207 2833
2208/*{{{ process non-printing single characters */ 2834/*{{{ process non-printing single characters */
2209void 2835void
2210rxvt_term::process_nonprinting (unsigned char ch) 2836rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2837{
2212 switch (ch) 2838 switch (ch)
2213 { 2839 {
2840 case C0_ESC:
2841 process_escape_seq ();
2842 break;
2214 case C0_ENQ: /* terminal Status */ 2843 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2844 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2219 else 2847 else
2220 tt_write ((unsigned char *)VT100_ANS, 2848 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2849 (unsigned int)strlen (VT100_ANS));
2222 break; 2850 break;
2223 case C0_BEL: /* bell */ 2851 case C0_BEL: /* bell */
2224 scr_bell (); 2852 scr_bell ();
2225 break; 2853 break;
2226 case C0_BS: /* backspace */ 2854 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2869 scr_charset_choose (1);
2242 break; 2870 break;
2243 case C0_SI: /* shift in - acs */ 2871 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2872 scr_charset_choose (0);
2245 break; 2873 break;
2874
2875#ifdef EIGHT_BIT_CONTROLS
2876 // 8-bit controls
2877 case 0x90: /* DCS */
2878 process_dcs_seq ();
2879 break;
2880 case 0x9b: /* CSI */
2881 process_csi_seq ();
2882 break;
2883 case 0x9d: /* CSI */
2884 process_osc_seq ();
2885 break;
2886#endif
2246 } 2887 }
2247} 2888}
2248/*}}} */ 2889/*}}} */
2249 2890
2250 2891
2251/*{{{ process VT52 escape sequences */ 2892/*{{{ process VT52 escape sequences */
2252void 2893void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2894rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2895{
2255 int row, col; 2896 int row, col;
2256 2897
2257 switch (ch) 2898 switch (ch)
2258 { 2899 {
… …
2310 2951
2311/*{{{ process escape sequences */ 2952/*{{{ process escape sequences */
2312void 2953void
2313rxvt_term::process_escape_seq () 2954rxvt_term::process_escape_seq ()
2314{ 2955{
2315 unsigned char ch = cmd_getc (); 2956 unicode_t ch = cmd_getc ();
2316 2957
2317 if (PrivateModes & PrivMode_vt52) 2958 if (priv_modes & PrivMode_vt52)
2318 { 2959 {
2319 process_escape_vt52 (ch); 2960 process_escape_vt52 (ch);
2320 return; 2961 return;
2321 } 2962 }
2322 2963
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2978 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2979 break;
2339 case '+': 2980 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2981 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2982 break;
2342#ifdef MULTICHAR_SET 2983#if ENABLE_FRILLS
2343 case '$':
2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2345 break;
2346#endif
2347#ifndef NO_FRILLS
2348 case '6': 2984 case '6':
2349 scr_backindex (); 2985 scr_backindex ();
2350 break; 2986 break;
2351#endif 2987#endif
2352 case '7': 2988 case '7':
2353 scr_cursor (SAVE); 2989 scr_cursor (SAVE);
2354 break; 2990 break;
2355 case '8': 2991 case '8':
2356 scr_cursor (RESTORE); 2992 scr_cursor (RESTORE);
2357 break; 2993 break;
2358#ifndef NO_FRILLS 2994#if ENABLE_FRILLS
2359 case '9': 2995 case '9':
2360 scr_forwardindex (); 2996 scr_forwardindex ();
2361 break; 2997 break;
2362#endif 2998#endif
2363 case '=': 2999 case '=':
… …
2373 break; 3009 break;
2374 3010
2375 /* 8.3.87: NEXT LINE */ 3011 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3012 case C1_NEL: /* ESC E */
2377 { 3013 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3014 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3015 scr_add_lines (nlcr, 1, 2);
2380 } 3016 }
2381 break; 3017 break;
2382 3018
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3019 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 3030 case C1_RI: /* ESC M */
2395 scr_index (DN); 3031 scr_index (DN);
2396 break; 3032 break;
2397 3033
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3034 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3035 /*case C1_SS2: scr_single_shift (2); break; */
2400 3036
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3037 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3038 /*case C1_SS3: scr_single_shift (3); break; */
2403 3039
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3040 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3041 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3042 process_dcs_seq ();
2407 break; 3043 break;
… …
2422 process_osc_seq (); 3058 process_osc_seq ();
2423 break; 3059 break;
2424 3060
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3061 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3062 case 'c':
3063 mbstate.reset ();
2427 scr_poweron (); 3064 scr_poweron ();
2428 scrollbar_show (1); 3065 scrollbar_show (1);
2429 break; 3066 break;
2430 3067
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3068 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3080
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3081/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3082/* *INDENT-OFF* */
2446enum { 3083enum {
2447 CSI_ICH = 0x40, 3084 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3085 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3086 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3087 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3088 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3089 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3090 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3105 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3106 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3107 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3108 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3109 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3110 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3111 };
2475/* *INDENT-ON* */ 3112/* *INDENT-ON* */
2476 3113
2477void 3114void
2478rxvt_term::process_csi_seq () 3115rxvt_term::process_csi_seq ()
2479{ 3116{
2480 unsigned char ch, priv, i; 3117 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3118 unsigned int nargs, p;
2482 int n, ndef; 3119 int n, ndef;
2483 int arg[ESC_ARGS]; 3120 int arg[ESC_ARGS];
2484 3121
2485 for (nargs = ESC_ARGS; nargs > 0;) 3122 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3123 arg[--nargs] = 0;
2487 3124
2488 priv = 0; 3125 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3127 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3128 { /* '<' '=' '>' '?' */
2492 priv = ch; 3129 priv = ch;
2493 ch = cmd_getc (); 3130 ch = cmd_getc ();
2494 } 3131 }
3132
2495 /* read any numerical arguments */ 3133 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3134 for (n = -1; ch < CSI_ICH; )
2497 { 3135 {
2498 if (isdigit (ch)) 3136 if (isdigit (ch))
2499 { 3137 {
… …
2506 { 3144 {
2507 if (nargs < ESC_ARGS) 3145 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3146 arg[nargs++] = n;
2509 n = -1; 3147 n = -1;
2510 } 3148 }
2511 else if (ch == '\b') 3149 else if (IS_CONTROL (ch))
2512 {
2513 scr_backspace ();
2514 }
2515 else if (ch == C0_ESC)
2516 {
2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch); 3150 process_nonprinting (ch);
2523 } 3151
2524 ch = cmd_getc (); 3152 ch = cmd_getc ();
2525 } 3153 }
2526 3154
2527 if (ch > CSI_7F) 3155 if (ch > CSI_7F)
2528 return; 3156 return;
… …
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2671 break; 3299 break;
2672 3300
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3302 tt_write ((const unsigned char *)VT100_ANS,
2675 (unsigned int) (sizeof (VT100_ANS) - 1)); 3303 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3304 break;
2677 3305
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3307 process_sgr_mode (nargs, arg);
2680 break; 3308 break;
… …
2686 tt_printf ("\033[0n"); 3314 tt_printf ("\033[0n");
2687 break; 3315 break;
2688 case 6: /* CPR requested */ 3316 case 6: /* CPR requested */
2689 scr_report_position (); 3317 scr_report_position ();
2690 break; 3318 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3319 case 7: /* unofficial extension */
3320 if (options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3321 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3322 break;
2695#endif
2696 case 8: /* unofficial extension */ 3323 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3325 break;
2699 } 3326 }
2700 break; 3327 break;
2701 3328
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3329 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3362 break;
2736 3363
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3364 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3365 if (arg[0] == 4)
2739 scr_insert_mode (0); 3366 scr_insert_mode (0);
3367 else if (arg[0] == 20)
3368 priv_modes &= ~PrivMode_LFNL;
2740 break; 3369 break;
2741 3370
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3371 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3372 if (arg[0] == 4)
2744 scr_insert_mode (1); 3373 scr_insert_mode (1);
3374 else if (arg[0] == 20)
3375 priv_modes |= PrivMode_LFNL;
2745 break; 3376 break;
2746 3377
2747 /* 3378 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3379 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3380 */
… …
2761 break; 3392 break;
2762 case CSI_75: 3393 case CSI_75:
2763 scr_cursor (RESTORE); 3394 scr_cursor (RESTORE);
2764 break; 3395 break;
2765 3396
2766#ifndef NO_FRILLS 3397#if ENABLE_FRILLS
2767 case CSI_74: 3398 case CSI_74:
2768 process_window_ops (arg, nargs); 3399 process_window_ops (arg, nargs);
2769 break; 3400 break;
2770#endif 3401#endif
2771 3402
2772 case CSI_78: /* DECREQTPARM */ 3403 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3404 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3405 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3406 break;
2776 3407
2777 default: 3408 default:
2778 break; 3409 break;
2779 } 3410 }
2780} 3411}
2781/*}}} */ 3412/*}}} */
2782 3413
2783#ifndef NO_FRILLS 3414#if ENABLE_FRILLS
2784/* ARGSUSED */ 3415/* ARGSUSED */
2785void 3416void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3417rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3418{
2788 int x, y; 3419 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3420 XWindowAttributes wattr;
2793 Window wdummy; 3421 Window wdummy;
2794 3422
2795 if (nargs == 0) 3423 if (nargs == 0)
2796 return; 3424 return;
3425
2797 switch (args[0]) 3426 switch (args[0])
2798 { 3427 {
2799 /* 3428 /*
2800 * commands 3429 * commands
2801 */ 3430 */
2802 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (display->display, TermWin.parent[0]);
2804 break; 3433 break;
2805 case 2: /* iconify window */ 3434 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (display->display, TermWin.parent[0],
… …
2823 break; 3452 break;
2824 case 8: /* set size (chars) */ 3453 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3455 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3456 break;
3457
3458 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3459 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3460 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3461 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3462 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3463 break;
3464
3465
2833 /* 3466 /*
2834 * reports - some output format copied from XTerm 3467 * reports - some output format copied from XTerm
2835 */ 3468 */
2836 case 11: /* report window state */ 3469 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3472 break;
2840 case 13: /* report window position */ 3473 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3476 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3477 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3478 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3479 break;
2847 case 14: /* report window size (pixels) */ 3480 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3483 break;
2851 case 18: /* report window size (chars) */ 3484 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3486 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3487 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break;
2855 case 20: /* report icon label */ 3490 case 20: /* report icon label */
3491 {
3492 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3493 XGetIconName (display->display, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s);
3496 }
2858 break; 3497 break;
2859 case 21: /* report window title */ 3498 case 21: /* report window title */
3499 {
3500 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3501 XFetchName (display->display, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s);
3504 }
2862 break; 3505 break;
2863#endif
2864
2865 } 3506 }
2866} 3507}
2867#endif 3508#endif
2868 3509
2869/*----------------------------------------------------------------------*/ 3510/*----------------------------------------------------------------------*/
2870/* 3511/*
2871 * get input up until STRING TERMINATOR (or BEL) 3512 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3513 * ends_how is terminator used. returned input must be free()'d
2873 */ 3514 */
2874unsigned char * 3515unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3516rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3517{
2877 int seen_esc = 0; /* seen escape? */ 3518 unicode_t seen_esc = 0, ch;
2878 unsigned int n = 0; 3519 unsigned int n = 0;
2879 unsigned char *s; 3520 unsigned char *s;
2880 unsigned char ch, string[STRING_MAX]; 3521 unsigned char string[STRING_MAX];
2881 3522
2882 for (; (ch = cmd_getc ());) 3523 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3524 {
2884 if (ch == C0_BEL 3525 if (seen_esc)
2885 || ch == CHAR_ST 3526 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3527 if (ch == 0x5c) /* 7bit ST */
2887 break; 3528 break;
3529 else
3530 return NULL;
3531 }
2888 if (ch == C0_ESC) 3532 else if (ch == C0_ESC)
2889 { 3533 {
2890 seen_esc = 1; 3534 seen_esc = 1;
2891 continue; 3535 continue;
2892 } 3536 }
2893 else if (ch == '\t') 3537 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3538 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3539 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3540 return NULL; /* other control character - exit */
3541
3542 seen_esc = 0;
3543
2897 if (n < sizeof (string) - 1) 3544 if (n >= sizeof (string) - 1)
3545 // stop at some sane length
3546 return NULL;
3547
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
2898 string[n++] = ch; 3551 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3552 }
3553
2901 string[n++] = '\0'; 3554 string[n++] = '\0';
3555
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2903 return NULL; 3557 return NULL;
3558
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3560 strncpy (s, string, n);
2906 return s; 3561 return s;
2907} 3562}
2908 3563
2909/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
2910/* 3565/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3567 */
2913void 3568void
2914rxvt_term::process_dcs_seq () 3569rxvt_term::process_dcs_seq ()
2915{ 3570{
2916 unsigned char eh, *s; 3571 unsigned char *s;
3572 unicode_t eh;
3573
2917 /* 3574 /*
2918 * Not handled yet 3575 * Not handled yet
2919 */ 3576 */
2920 s = get_to_st (&eh); 3577 s = get_to_st (eh);
2921 if (s) 3578 if (s)
2922 free (s); 3579 free (s);
3580
2923 return; 3581 return;
2924} 3582}
2925 3583
2926/*----------------------------------------------------------------------*/ 3584/*----------------------------------------------------------------------*/
2927/* 3585/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3586 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3587 */
2930void 3588void
2931rxvt_term::process_osc_seq () 3589rxvt_term::process_osc_seq ()
2932{ 3590{
2933 unsigned char ch, eh, *s; 3591 unicode_t ch, eh;
2934 int arg; 3592 int arg;
2935 3593
2936 ch = cmd_getc (); 3594 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3595 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3596 arg = arg * 10 + (ch - '0');
2939 3597
2940 if (ch == ';') 3598 if (ch == ';')
2941 { 3599 {
2942 s = get_to_st (&eh); 3600 unsigned char *s = get_to_st (eh);
3601
2943 if (s) 3602 if (s)
2944 { 3603 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3604 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3605 free (s);
2958 } 3606 }
2959 } 3607 }
2960} 3608}
3609
3610void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3612{
3613 if (str[0] == '?' && !str[1])
3614 {
3615 unsigned short r, g, b;
3616 pix_colors_focused[color].get (display, r, g, b);
3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3618 }
3619 else
3620 set_window_color (color, str);
3621}
3622
2961/* 3623/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3625 * 0 = change iconName/title
2964 * 1 = change iconName 3626 * 1 = change iconName
2965 * 2 = change title 3627 * 2 = change title
2966 * 4 = change color 3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
2967 * 12 = change text color 3631 * 12 = change text color
2968 * 13 = change mouse foreground color 3632 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3633 * 17 = change highlight character colour
2970 * 18 = change bold character color 3634 * 18 = change bold character color
2971 * 19 = change underlined character color 3635 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3636 * 46 = change logfile (not implemented)
2973 * 50 = change font 3637 * 50 = change font
2974 * 3638 *
2975 * rxvt extensions: 3639 * rxvt extensions:
2976 * 9 = change locale (NYI)
2977 * 10 = menu (may change in future)
2978 * 20 = bg pixmap 3640 * 20 = bg pixmap
2979 * 39 = change default fg color 3641 * 39 = change default fg color
2980 * 49 = change default bg color 3642 * 49 = change default bg color
2981 * 55 = dump scrollback buffer and all of screen 3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
2982 */ 3647 */
2983void 3648void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2985{ 3650{
2986 int changed = 0; 3651 int changed = 0;
2987 int color; 3652 int color;
2988 char *buf, *name; 3653 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
2989 3656
2990 assert (str != NULL); 3657 assert (str != NULL);
2991 switch (op) 3658 switch (op)
2992 { 3659 {
2993 case XTerm_name: 3660 case XTerm_name:
2994 set_title (str); 3661 set_title (str);
2995 /* FALLTHROUGH */ 3662 /* FALLTHROUGH */
2996 case XTerm_iconName: 3663 case XTerm_iconName:
2997 set_iconName (str); 3664 set_icon_name (str);
2998 break; 3665 break;
2999 case XTerm_title: 3666 case XTerm_title:
3000 set_title (str); 3667 set_title (str);
3001 break; 3668 break;
3669 case XTerm_property:
3670 if (str[0] == '?')
3671 {
3672 Atom prop = XInternAtom (display->display, str + 1, True);
3673 Atom actual_type;
3674 int actual_format;
3675 unsigned long nitems;
3676 unsigned long bytes_after;
3677 unsigned char *value = 0;
3678 const char *str = "";
3679
3680 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None
3686 && actual_format == 8)
3687 str = (const char *)(value);
3688
3689 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3690
3691 XFree (value);
3692 }
3693 else
3694 {
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696
3697 if (eq)
3698 {
3699 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0],
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 }
3705 else
3706 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str));
3708 }
3709 break;
3710
3002 case XTerm_Color: 3711 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3712 for (buf = (char *)str; buf && *buf;)
3004 { 3713 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3714 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3715 break;
3716
3007 *name++ = '\0'; 3717 *name++ = '\0';
3008 color = atoi (buf); 3718 color = atoi (buf);
3719
3009 if (color < 0 || color >= TOTAL_COLORS) 3720 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3721 break;
3722
3011 if ((buf = STRCHR (name, ';')) != NULL) 3723 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3724 *buf++ = '\0';
3725
3726 if (name[0] == '?' && !name[1])
3727 {
3728 unsigned short r, g, b;
3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3731 }
3732 else
3013 set_window_color (color + minCOLOR, name); 3733 set_window_color (color + minCOLOR, name);
3014 } 3734 }
3735 break;
3736 case XTerm_Color00:
3737 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3738 break;
3739 case XTerm_Color01:
3740 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3741 break;
3016#ifndef NO_CURSORCOLOR 3742#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3743 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3744 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3745 break;
3020#endif 3746#endif
3021 case XTerm_Color_pointer: 3747 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3748 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3749 break;
3750 case XTerm_Color_pointer_bg:
3751 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3752 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3753#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3754 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3027 break; 3759 break;
3028 case XTerm_Color_UL: 3760 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3762 break;
3031 case XTerm_Color_RV: 3763 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3765 break;
3034#endif 3766#endif
3035 3767#if TRANSPARENT && TINTING
3036 case XTerm_Menu: 3768 case XTerm_Color_tint:
3037 /* 3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3038 * rxvt_menubar_dispatch () violates the constness of the string, 3770 check_our_parents ();
3039 * so DON'T do it here 3771 if (am_transparent)
3040 */ 3772 want_full_refresh = want_refresh = 1;
3041 break; 3773 break;
3774#endif
3775
3042 case XTerm_Pixmap: 3776 case XTerm_Pixmap:
3043 if (*str != ';') 3777 if (*str != ';')
3044 { 3778 {
3045#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3780 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3781 set_bgPixmap (str); /* change pixmap */
3048#endif 3782#endif
3049 scr_touch (true); 3783 scr_touch (true);
3050 } 3784 }
3051 while ((str = STRCHR (str, ';')) != NULL) 3785 while ((str = strchr (str, ';')) != NULL)
3052 { 3786 {
3053 str++; 3787 str++;
3054#if XPM_BACKGROUND 3788#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3789 changed += scale_pixmap (str);
3056#endif 3790#endif
… …
3069 set_window_color (Color_fg, str); 3803 set_window_color (Color_fg, str);
3070 break; 3804 break;
3071 case XTerm_restoreBG: 3805 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3806 set_window_color (Color_bg, str);
3073 break; 3807 break;
3808
3074 case XTerm_logfile: 3809 case XTerm_logfile:
3810 // TODO, when secure mode?
3075 break; 3811 break;
3812
3076 case XTerm_font: 3813 case XTerm_font:
3077 change_font (str); 3814 op = URxvt_font;
3815 case URxvt_font:
3816#if ENABLE_STYLES
3817 case URxvt_boldFont:
3818 case URxvt_italicFont:
3819 case URxvt_boldItalicFont:
3820#endif
3821 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3825 resp);
3826 else
3827 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829
3830 res = strdup (str);
3831 allocated.push_back ((void *)res);
3832 set_fonts ();
3833 }
3078 break; 3834 break;
3835
3836#if ENABLE_FRILLS
3079 case XTerm_locale: 3837 case XTerm_locale:
3838 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3840 else
3841 {
3080 set_locale (str); 3842 set_locale (str);
3843# ifdef USE_XIM
3081 im_cb (); 3844 im_cb ();
3845# endif
3846 }
3847 break;
3848#endif
3849
3850#ifdef MENUBAR
3851 case XTerm_Menu:
3852 if (options & Opt_insecure)
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3082 break; 3854 break;
3855#endif
3083#if 0 3856#if 0
3084 case XTerm_dumpscreen: /* no error notices */ 3857 case XTerm_dumpscreen: /* no error notices */
3085 { 3858 {
3086 int fd; 3859 int fd;
3087 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3088 { 3861 {
3089 scr_dump (fd); 3862 scr_dump (fd);
3090 close (fd); 3863 close (fd);
3091 } 3864 }
3092 } 3865 }
3093 break; 3866 break;
3094#endif 3867#endif
3095
3096 } 3868 }
3097} 3869}
3098/*----------------------------------------------------------------------*/ 3870/*----------------------------------------------------------------------*/
3099 3871
3100/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3872/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3108 * so no need for fancy checking 3880 * so no need for fancy checking
3109 */ 3881 */
3110int 3882int
3111rxvt_term::privcases (int mode, unsigned long bit) 3883rxvt_term::privcases (int mode, unsigned long bit)
3112{ 3884{
3113 int state; 3885 int state;
3114 3886
3115 if (mode == 's') 3887 if (mode == 's')
3116 { 3888 {
3117 SavedModes |= (PrivateModes & bit); 3889 SavedModes |= (priv_modes & bit);
3118 return -1; 3890 return -1;
3119 } 3891 }
3120 else 3892 else
3121 { 3893 {
3122 if (mode == 'r') 3894 if (mode == 'r')
3123 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3895 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3124 else 3896 else
3125 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3897 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3126 PrivMode (state, bit); 3898 PrivMode (state, bit);
3127 } 3899 }
3900
3128 return state; 3901 return state;
3129} 3902}
3130 3903
3131/* we're not using priv _yet_ */ 3904/* we're not using priv _yet_ */
3132void 3905void
3133rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3906rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3134{ 3907{
3135 unsigned int i, j; 3908 unsigned int i, j;
3136 int state; 3909 int state;
3910
3137 static const struct 3911 static const struct
3138 { 3912 {
3139 const int argval; 3913 const int argval;
3140 const unsigned long bit; 3914 const unsigned long bit;
3141 } 3915 }
3916
3142 argtopriv[] = { 3917 argtopriv[] = {
3143 { 1, PrivMode_aplCUR }, 3918 { 1, PrivMode_aplCUR },
3144 { 2, PrivMode_vt52 }, 3919 { 2, PrivMode_vt52 },
3145 { 3, PrivMode_132 }, 3920 { 3, PrivMode_132 },
3146 { 4, PrivMode_smoothScroll }, 3921 { 4, PrivMode_smoothScroll },
3147 { 5, PrivMode_rVideo }, 3922 { 5, PrivMode_rVideo },
3148 { 6, PrivMode_relOrigin }, 3923 { 6, PrivMode_relOrigin },
3149 { 7, PrivMode_Autowrap }, 3924 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode
3150 { 9, PrivMode_MouseX10 }, 3926 { 9, PrivMode_MouseX10 },
3151#ifdef menuBar_esc 3927#ifdef menuBar_esc
3152 { menuBar_esc, PrivMode_menuBar }, 3928 { menuBar_esc, PrivMode_menuBar },
3153#endif 3929#endif
3930 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor },
3154#ifdef scrollBar_esc 3932#ifdef scrollBar_esc
3155 { scrollBar_esc, PrivMode_scrollBar }, 3933 { scrollBar_esc, PrivMode_scrollBar },
3156#endif 3934#endif
3157 { 25, PrivMode_VisibleCursor },
3158 { 35, PrivMode_ShiftKeys }, 3935 { 35, PrivMode_ShiftKeys }, // rxvt extension
3159 { 40, PrivMode_132OK }, 3936 { 40, PrivMode_132OK },
3937 // 41 xterm more fixes NYI
3938 // 45 margin bell NYI
3939 // 46 start logging
3160 { 47, PrivMode_Screen }, 3940 { 47, PrivMode_Screen },
3161 { 66, PrivMode_aplKP }, 3941 { 66, PrivMode_aplKP },
3162#ifndef NO_BACKSPACE_KEY 3942#ifndef NO_BACKSPACE_KEY
3163 { 67, PrivMode_BackSpace }, 3943 { 67, PrivMode_BackSpace },
3164#endif 3944#endif
3165 { 1000, PrivMode_MouseX11 }, 3945 { 1000, PrivMode_MouseX11 },
3946 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3947 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3948 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3166 { 1010, PrivMode_TtyOutputInh }, 3949 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3167 { 1011, PrivMode_Keypress }, 3950 { 1011, PrivMode_Keypress }, // rxvt extension
3951 // 1035 enable modifiers for alt, numlock NYI
3952 // 1036 send ESC for meta keys NYI
3953 // 1037 send DEL for keypad delete NYI
3168 { 1047, PrivMode_Screen }, 3954 { 1047, PrivMode_Screen },
3955 // 1048 save and restore cursor
3169 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3956 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3957 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3170 }; 3958 };
3171 3959
3172 if (nargs == 0) 3960 if (nargs == 0)
3173 return; 3961 return;
3174 3962
… …
3189 state = privcases (mode, argtopriv[j].bit); 3977 state = privcases (mode, argtopriv[j].bit);
3190 break; 3978 break;
3191 } 3979 }
3192 3980
3193 /* extra handling for values with state unkept */ 3981 /* extra handling for values with state unkept */
3194 if (state == -1)
3195 switch (arg[i]) 3982 switch (arg[i])
3196 { 3983 {
3197 case 1048: /* alternative cursor save */ 3984 case 1048: /* alternative cursor save */
3985 case 1049:
3986 if (options & Opt_secondaryScreen)
3198 if (mode == 0) 3987 if (mode == 0)
3199 scr_cursor (RESTORE); 3988 scr_cursor (RESTORE);
3200 else if (mode == 1) 3989 else if (mode == 1)
3201 scr_cursor (SAVE); 3990 scr_cursor (SAVE);
3202 /* FALLTHROUGH */
3203 default:
3204 continue; /* for (;i;) */
3205 }
3206
3207 /* extra handling for values with valid 0 or 1 state */
3208 switch (arg[i])
3209 {
3210 /* case 1: - application cursor keys */
3211 case 2: /* VT52 mode */
3212 /* oddball mode. should be set regardless of set/reset
3213 * parameter. Return from VT52 mode with an ESC < from
3214 * within VT52 mode
3215 */
3216 PrivMode (1, PrivMode_vt52);
3217 break; 3991 break;
3992 }
3993
3994 if (state >= 0)
3995 /* extra handling for values with valid 0 or 1 state */
3996 switch (arg[i])
3997 {
3998 /* case 1: - application cursor keys */
3999 case 2: /* VT52 mode */
4000 /* oddball mode. should be set regardless of set/reset
4001 * parameter. Return from VT52 mode with an ESC < from
4002 * within VT52 mode
4003 */
4004 PrivMode (1, PrivMode_vt52);
4005 break;
3218 case 3: /* 80/132 */ 4006 case 3: /* 80/132 */
3219 if (PrivateModes & PrivMode_132OK) 4007 if (priv_modes & PrivMode_132OK)
3220 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3221 (unsigned int)TermWin.height);
3222 break; 4009 break;
3223 case 4: /* smooth scrolling */ 4010 case 4: /* smooth scrolling */
3224 if (state) 4011 if (state)
3225 Options &= ~Opt_jumpScroll; 4012 options &= ~Opt_jumpScroll;
3226 else 4013 else
3227 Options |= Opt_jumpScroll; 4014 options |= Opt_jumpScroll;
3228 break; 4015 break;
3229 case 5: /* reverse video */ 4016 case 5: /* reverse video */
3230 scr_rvideo_mode (state); 4017 scr_rvideo_mode (state);
3231 break; 4018 break;
3232 case 6: /* relative/absolute origins */ 4019 case 6: /* relative/absolute origins */
3233 scr_relative_origin (state); 4020 scr_relative_origin (state);
3234 break; 4021 break;
3235 case 7: /* autowrap */ 4022 case 7: /* autowrap */
3236 scr_autowrap (state); 4023 scr_autowrap (state);
3237 break; 4024 break;
3238 /* case 8: - auto repeat, can't do on a per window basis */ 4025 /* case 8: - auto repeat, can't do on a per window basis */
3239 case 9: /* X10 mouse reporting */ 4026 case 9: /* X10 mouse reporting */
3240 if (state) /* orthogonal */ 4027 if (state) /* orthogonal */
3241 PrivateModes &= ~ (PrivMode_MouseX11); 4028 priv_modes &= ~PrivMode_MouseX11;
3242 break; 4029 break;
3243#ifdef menuBar_esc 4030#ifdef menuBar_esc
3244 case menuBar_esc: 4031 case menuBar_esc:
3245#ifdef MENUBAR 4032#ifdef MENUBAR
3246 map_menuBar (state); 4033 map_menuBar (state);
3247#endif 4034#endif
3248 break; 4035 break;
3249#endif 4036#endif
3250#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3251 case scrollBar_esc: 4038 case scrollBar_esc:
3252 if (scrollbar_mapping (state)) 4039 if (scrollbar_mapping (state))
3253 { 4040 {
3254 resize_all_windows (0, 0, 0); 4041 resize_all_windows (0, 0, 0);
3255 scr_touch (true); 4042 scr_touch (true);
3256 } 4043 }
3257 break; 4044 break;
3258#endif 4045#endif
3259 case 25: /* visible/invisible cursor */ 4046 case 25: /* visible/invisible cursor */
3260 scr_cursor_visible (state); 4047 scr_cursor_visible (state);
3261 break; 4048 break;
3262 /* case 35: - shift keys */ 4049 /* case 35: - shift keys */
3263 /* case 40: - 80 <--> 132 mode */ 4050 /* case 40: - 80 <--> 132 mode */
3264 case 47: /* secondary screen */ 4051 case 47: /* secondary screen */
3265 scr_change_screen (state); 4052 scr_change_screen (state);
3266 break; 4053 break;
3267 /* case 66: - application key pad */ 4054 /* case 66: - application key pad */
3268 /* case 67: - backspace key */ 4055 /* case 67: - backspace key */
3269 case 1000: /* X11 mouse reporting */ 4056 case 1000: /* X11 mouse reporting */
3270 if (state) /* orthogonal */ 4057 if (state) /* orthogonal */
3271 PrivateModes &= ~ (PrivMode_MouseX10); 4058 priv_modes &= ~PrivMode_MouseX10;
3272 break; 4059 break;
3273#if 0 4060#if 0
3274 case 1001: 4061 case 1001:
3275 break; /* X11 mouse highlighting */ 4062 break; /* X11 mouse highlighting */
3276#endif 4063#endif
3277 case 1010: /* scroll to bottom on TTY output inhibit */ 4064 case 1010: /* scroll to bottom on TTY output inhibit */
3278 if (state) 4065 if (state)
3279 Options &= ~Opt_scrollTtyOutput; 4066 options &= ~Opt_scrollTtyOutput;
3280 else 4067 else
3281 Options |= Opt_scrollTtyOutput; 4068 options |= Opt_scrollTtyOutput;
3282 break; 4069 break;
3283 case 1011: /* scroll to bottom on key press */ 4070 case 1011: /* scroll to bottom on key press */
3284 if (state) 4071 if (state)
3285 Options |= Opt_scrollTtyKeypress; 4072 options |= Opt_scrollTtyKeypress;
3286 else 4073 else
3287 Options &= ~Opt_scrollTtyKeypress; 4074 options &= ~Opt_scrollTtyKeypress;
3288 break; 4075 break;
3289 case 1047: /* secondary screen w/ clearing */ 4076 case 1047: /* secondary screen w/ clearing last */
3290 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4077 if (options & Opt_secondaryScreen)
3291 if (current_screen != PRIMARY) 4078 if (current_screen != PRIMARY)
3292 scr_erase_screen (2); 4079 scr_erase_screen (2);
3293 scr_change_screen (state); 4080 scr_change_screen (state);
3294 /* FALLTHROUGH */
3295 default:
3296 break; 4081 break;
4082 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen)
4085 if (current_screen != PRIMARY)
4086 scr_erase_screen (2);
4087 break;
4088 default:
4089 break;
3297 } 4090 }
3298 } 4091 }
3299} 4092}
3300/*}}} */ 4093/*}}} */
3301 4094
3302/*{{{ process sgr sequences */ 4095/*{{{ process sgr sequences */
3303void 4096void
3304rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4097rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3305{ 4098{
3306 unsigned int i; 4099 unsigned int i;
3307 short rendset; 4100 short rendset;
3308 int rendstyle; 4101 int rendstyle;
3309 4102
3310 if (nargs == 0) 4103 if (nargs == 0)
3311 { 4104 {
3312 scr_rendition (0, ~RS_None); 4105 scr_rendition (0, ~RS_None);
3313 return; 4106 return;
3314 } 4107 }
4108
3315 for (i = 0; i < nargs; i++) 4109 for (i = 0; i < nargs; i++)
3316 { 4110 {
3317 rendset = -1; 4111 rendset = -1;
3318 switch (arg[i]) 4112 switch (arg[i])
3319 { 4113 {
… …
3321 rendset = 0, rendstyle = ~RS_None; 4115 rendset = 0, rendstyle = ~RS_None;
3322 break; 4116 break;
3323 case 1: 4117 case 1:
3324 rendset = 1, rendstyle = RS_Bold; 4118 rendset = 1, rendstyle = RS_Bold;
3325 break; 4119 break;
4120 //case 2: // low intensity
4121 case 3:
4122 rendset = 1, rendstyle = RS_Italic;
4123 break;
3326 case 4: 4124 case 4:
3327 rendset = 1, rendstyle = RS_Uline; 4125 rendset = 1, rendstyle = RS_Uline;
3328 break; 4126 break;
3329 case 5: 4127 case 5: // slowly blinking
4128 case 6: // rapidly blinking
3330 rendset = 1, rendstyle = RS_Blink; 4129 rendset = 1, rendstyle = RS_Blink;
3331 break; 4130 break;
4131 //case 6: // scoansi light background
3332 case 7: 4132 case 7:
3333 rendset = 1, rendstyle = RS_RVid; 4133 rendset = 1, rendstyle = RS_RVid;
3334 break; 4134 break;
3335 case 22: 4135 case 8:
4136 // invisible. NYI
4137 break;
4138 //case 9: // crossed out
4139 //case 10: // scoansi acs off, primary font
4140 //case 11: // scoansi acs on, first alt font
4141 //case 12: // scoansi acs on, |0x80, second alt font
4142 //...
4143 //case 19: // ninth alt font
4144 //case 20: // gothic
4145 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3336 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 22: // normal intensity
4149 rendset = 0, rendstyle = RS_Bold;
4150 break;
4151 case 23: // disable italic
4152 rendset = 0, rendstyle = RS_Italic;
3337 break; 4153 break;
3338 case 24: 4154 case 24:
3339 rendset = 0, rendstyle = RS_Uline; 4155 rendset = 0, rendstyle = RS_Uline;
3340 break; 4156 break;
3341 case 25: 4157 case 25:
3342 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3343 break; 4159 break;
4160 case 26: // variable spacing (iso 8613)
4161 rendset = 0, rendstyle = RS_Blink;
4162 break;
3344 case 27: 4163 case 27:
3345 rendset = 0, rendstyle = RS_RVid; 4164 rendset = 0, rendstyle = RS_RVid;
3346 break; 4165 break;
4166 //case 28: // visible. NYI
4167 //case 29: // not crossed-out
3347 } 4168 }
4169
3348 if (rendset != -1) 4170 if (rendset != -1)
3349 { 4171 {
3350 scr_rendition (rendset, rendstyle); 4172 scr_rendition (rendset, rendstyle);
3351 continue; /* for (;i;) */ 4173 continue; /* for (;i;) */
3352 } 4174 }
… …
3359 case 33: 4181 case 33:
3360 case 34: 4182 case 34:
3361 case 35: 4183 case 35:
3362 case 36: 4184 case 36:
3363 case 37: 4185 case 37:
3364 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4186 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3365 Color_fg);
3366 break; 4187 break;
3367#ifdef TTY_256COLOR 4188 case 38: // set fg color, ISO 8613-6
3368 case 38:
3369 if (nargs > i + 2 && arg[i + 1] == 5) 4189 if (nargs > i + 2 && arg[i + 1] == 5)
3370 { 4190 {
3371 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4191 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3372 Color_fg);
3373 i += 2; 4192 i += 2;
3374 } 4193 }
3375 break; 4194 break;
3376#endif
3377 case 39: /* default fg */ 4195 case 39: /* default fg */
3378 scr_color (Color_fg, Color_fg); 4196 scr_color (Color_fg, Color_fg);
3379 break; 4197 break;
3380 4198
3381 case 40: 4199 case 40:
… …
3384 case 43: 4202 case 43:
3385 case 44: 4203 case 44:
3386 case 45: 4204 case 45:
3387 case 46: 4205 case 46:
3388 case 47: 4206 case 47:
3389 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4207 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3390 Color_bg);
3391 break; 4208 break;
3392#ifdef TTY_256COLOR 4209 case 48: // set bg color, ISO 8613-6
3393 case 48:
3394 if (nargs > i + 2 && arg[i + 1] == 5) 4210 if (nargs > i + 2 && arg[i + 1] == 5)
3395 { 4211 {
3396 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4212 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3397 Color_bg);
3398 i += 2; 4213 i += 2;
3399 } 4214 }
3400 break; 4215 break;
3401#endif
3402 case 49: /* default bg */ 4216 case 49: /* default bg */
3403 scr_color (Color_bg, Color_bg); 4217 scr_color (Color_bg, Color_bg);
3404 break; 4218 break;
4219
4220 //case 50: // not variable spacing
3405 4221
3406#ifndef NO_BRIGHTCOLOR 4222#ifndef NO_BRIGHTCOLOR
3407 case 90: 4223 case 90:
3408 case 91: /* set bright fg color */ 4224 case 91: /* set bright fg color */
3409 case 92: 4225 case 92:
3410 case 93: 4226 case 93:
3411 case 94: 4227 case 94:
3412 case 95: 4228 case 95:
3413 case 96: 4229 case 96:
3414 case 97: 4230 case 97:
3415 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4231 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3416 Color_fg);
3417 break; 4232 break;
3418 case 100: 4233 case 100:
3419 case 101: /* set bright bg color */ 4234 case 101: /* set bright bg color */
3420 case 102: 4235 case 102:
3421 case 103: 4236 case 103:
3422 case 104: 4237 case 104:
3423 case 105: 4238 case 105:
3424 case 106: 4239 case 106:
3425 case 107: 4240 case 107:
3426 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3427 Color_bg);
3428 break; 4242 break;
3429#endif 4243#endif
3430 4244
3431 } 4245 }
3432 } 4246 }
3433} 4247}
3434/*}}} */ 4248/*}}} */
3435 4249
3436/*{{{ process Rob Nation's own graphics mode sequences */ 4250/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3437void 4251void
3438rxvt_term::process_graphics () 4252rxvt_term::process_graphics ()
3439{ 4253{
3440 unsigned char ch, cmd = cmd_getc (); 4254 unicode_t ch, cmd = cmd_getc ();
3441 4255
3442 if (cmd == 'Q') 4256 if (cmd == 'Q')
3443 { /* query graphics */ 4257 { /* query graphics */
3444 tt_printf ("\033G0\n"); /* no graphics */ 4258 tt_printf ("\033G0\012"); /* no graphics */
3445 return; 4259 return;
3446 } 4260 }
3447 /* swallow other graphics sequences until terminating ':' */ 4261 /* swallow other graphics sequences until terminating ':' */
3448 do 4262 do
3449 ch = cmd_getc (); 4263 ch = cmd_getc ();
… …
3464 unsigned char buf[256]; 4278 unsigned char buf[256];
3465 4279
3466 va_start (arg_ptr, fmt); 4280 va_start (arg_ptr, fmt);
3467 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3468 va_end (arg_ptr); 4282 va_end (arg_ptr);
3469 tt_write (buf, STRLEN (buf)); 4283 tt_write (buf, strlen (buf));
3470} 4284}
3471 4285
3472/* ---------------------------------------------------------------------- */ 4286/* ---------------------------------------------------------------------- */
3473/* Write data to the pty as typed by the user, pasted with the mouse, 4287/* Write data to the pty as typed by the user, pasted with the mouse,
3474 * or generated by us in response to a query ESC sequence. 4288 * or generated by us in response to a query ESC sequence.
3475 */ 4289 */
3476void 4290void
3477rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3478{ 4292{
3479 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3480 4294
3481 if (len) 4295 if (len)
3482 { 4296 {
3483 if (v_buflen == 0) 4297 if (v_buflen == 0)
3484 { 4298 {
3485 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3486 4300
3487 if ((unsigned int)written == len) 4301 if ((unsigned int)written == len)
3488 return; 4302 return;
3489 4303
3490 data += written; 4304 data += written;
… …
3498 v_buflen += len; 4312 v_buflen += len;
3499 } 4313 }
3500 4314
3501 for (;;) 4315 for (;;)
3502 { 4316 {
3503 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3504 4318
3505 if (written > 0) 4319 if (written > 0)
3506 { 4320 {
3507 v_buflen -= written; 4321 v_buflen -= written;
3508 4322

Diff Legend

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