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.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

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

Diff Legend

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