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.28 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 58void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
61{ 60{
62 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
63 unsigned int newlen; 62 unsigned int newlen;
64 KeySym keysym; 63 KeySym keysym;
65#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
67#endif 66#endif
68 int valid_keysym; 67 int valid_keysym;
69 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
70 69
71/* 70 /*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
74 * 73 *
75 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
76 */ 75 */
77 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 78 meta = (ev.state & ModMetaMask);
80 79
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
82 { 81 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
85 } 84 }
86 85
87 kbuf[0] = 0; 86 kbuf[0] = 0;
88 87
89#ifdef USE_XIM 88#ifdef USE_XIM
90 if (R->Input_Context) 89 if (Input_Context)
91 { 90 {
92 Status status_return; 91 Status status_return;
93 92
94#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
98 else 97 else
99#endif 98#endif
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
115 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
116 wkbuf[len] = 0; 123 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0) 125 if (len < 0)
119 len = 0; 126 len = 0;
120 } 127 }
128 }
121 else 129 else
122 len = 0; 130 len = 0;
123 } 131 }
124 132
125 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
126 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
127 } 135 }
128 else 136 else
129#endif 137#endif
130 { 138 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
144 {
145 if (TermWin.saveLines)
136 { 146 {
137/* for some backwards compatibility */ 147#ifdef UNSHIFTED_SCROLLKEYS
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 148 if (!ctrl && !meta)
139# ifdef HOTKEY_CTRL 149 {
140 if (ctrl)
141# else 150#else
142 if (meta) 151 if (IS_SCROLL_MOD)
152 {
153#endif
154 int lnsppg;
155
156#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
158#else
159 lnsppg = TermWin.nrow * 4 / 5;
160#endif
161 if (keysym == XK_Prior)
162 {
163 scr_page (UP, lnsppg);
164 return;
165 }
166 else if (keysym == XK_Next)
167 {
168 scr_page (DN, lnsppg);
169 return;
170 }
171 }
172#ifdef SCROLL_ON_UPDOWN_KEYS
173 if (IS_SCROLL_MOD)
174 {
175 if (keysym == XK_Up)
176 {
177 scr_page (UP, 1);
178 return;
179 }
180 else if (keysym == XK_Down)
181 {
182 scr_page (DN, 1);
183 return;
184 }
185 }
186#endif
187#ifdef SCROLL_ON_HOMEEND_KEYS
188 if (IS_SCROLL_MOD)
189 {
190 if (keysym == XK_Home)
191 {
192 scr_move_to (0, 1);
193 return;
194 }
195 else if (keysym == XK_End)
196 {
197 scr_move_to (1, 0);
198 return;
199 }
200 }
201#endif
202 }
203
204 if (shft)
205 {
206 /* Shift + F1 - F10 generates F11 - F20 */
207 if (keysym >= XK_F1 && keysym <= XK_F10)
208 {
209 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */
211 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
213 {
214 switch (keysym)
215 {
216 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0);
219 return;
220 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP);
223 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN);
226 return;
227 }
228 }
229 }
230#ifdef PRINTPIPE
231 if (keysym == XK_Print)
232 {
233 scr_printscreen (ctrl | shft);
234 return;
235 }
236#endif
237
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
239 {
240#ifdef KEYSYM_RESOURCE
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 {
243 unsigned int l;
244 const unsigned char *kbuf0;
245
246 kbuf0 = (Keysym_map[keysym & 0xFF]);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
143# endif 253# endif
144 { 254 )
145 if (keysym == R->ks_bigfont)
146 { 255 {
147 rxvt_change_font(aR_ 0, FONT_UP); 256 const unsigned char ch = C0_ESC;
148 return; 257 tt_write (&ch, 1);
149 } 258 }
150 else if (keysym == R->ks_smallfont) 259
260 tt_write (kbuf0, l);
261 return;
262 }
263 else
264#endif
265 {
266 newlen = 1;
267 switch (keysym)
151 { 268 {
152 rxvt_change_font(aR_ 0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (R->TermWin.saveLines) {
159#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) {
161#else
162 if (IS_SCROLL_MOD) {
163#endif
164 int lnsppg;
165
166#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES;
168#else
169 lnsppg = R->TermWin.nrow * 4 / 5;
170#endif
171 if (keysym == XK_Prior) {
172 rxvt_scr_page(aR_ UP, lnsppg);
173 return;
174 } else if (keysym == XK_Next) {
175 rxvt_scr_page(aR_ DN, lnsppg);
176 return;
177 }
178 }
179#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) {
181 if (keysym == XK_Up) {
182 rxvt_scr_page(aR_ UP, 1);
183 return;
184 } else if (keysym == XK_Down) {
185 rxvt_scr_page(aR_ DN, 1);
186 return;
187 }
188 }
189#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) {
192 if (keysym == XK_Home) {
193 rxvt_scr_move_to(aR_ 0, 1);
194 return;
195 } else if (keysym == XK_End) {
196 rxvt_scr_move_to(aR_ 1, 0);
197 return;
198 }
199 }
200#endif
201 }
202
203 if (shft) {
204 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) {
206 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) {
209 switch (keysym) {
210 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0);
213 return;
214 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP);
217 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN);
220 return;
221 }
222 }
223 }
224#ifdef PRINTPIPE
225 if (keysym == XK_Print) {
226 rxvt_scr_printscreen(aR_ ctrl | shft);
227 return;
228 }
229#endif
230#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) {
232 R->greek_mode = !R->greek_mode;
233 if (R->greek_mode) {
234 rxvt_xterm_seq(aR_ XTerm_title,
235 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset();
238 } else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return;
241 }
242#endif
243
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
245#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) {
247 unsigned int l;
248 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC;
250
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++;
253
254 /* escape prefix */
255 if (meta)
256# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC)
258# endif
259 R->tt_write (&ch, 1);
260 R->tt_write (kbuf0, l);
261 return;
262 } else
263#endif
264 {
265 newlen = 1;
266 switch (keysym) {
267#ifndef NO_BACKSPACE_KEY 269#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 270 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 271 if (PrivateModes & PrivMode_HaveBackSpace)
272 {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 274 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 275 kbuf[1] = '\0';
273 } else 276 }
274 STRCPY(kbuf, R->key_backspace); 277 else
275# ifdef MULTICHAR_SET 278 STRCPY (kbuf, key_backspace);
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 279 break;
277 int col, row;
278
279 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 }
285# endif
286 break;
287#endif 280#endif
288#ifndef NO_DELETE_KEY 281#ifndef NO_DELETE_KEY
289 case XK_Delete: 282 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 283 STRCPY (kbuf, key_delete);
291# ifdef MULTICHAR_SET 284 break;
292 if (R->Options & Opt_mc_hack) {
293 int col, row;
294
295 newlen = STRLEN(kbuf);
296 col = R->screen.cur.col;
297 row = R->screen.cur.row + R->TermWin.saveLines;
298 if (IS_MULTI1(R->screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 }
301# endif 285#endif
302 break; 286 case XK_Tab:
303#endif 287 if (shft)
304 case XK_Tab: 288 STRCPY (kbuf, "\033[Z");
305 if (shft) 289 else
306 STRCPY(kbuf, "\033[Z"); 290 {
307 else {
308#ifdef CTRL_TAB_MAKES_META 291#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 292 if (ctrl)
310 meta = 1; 293 meta = 1;
311#endif 294#endif
312#ifdef MOD4_TAB_MAKES_META 295#ifdef MOD4_TAB_MAKES_META
313 if (ev->state & Mod4Mask) 296 if (ev.state & Mod4Mask)
314 meta = 1; 297 meta = 1;
315#endif 298#endif
316 newlen = 0; 299 newlen = 0;
317 } 300 }
318 break; 301 break;
319
320 302
321#ifdef XK_KP_Left 303#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 304 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 305 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 306 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 307 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
327 STRCPY(kbuf, "\033OZ"); 309 {
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 310 STRCPY (kbuf, "\033OZ");
329 break; 311 kbuf[2] = "txvr"[keysym - XK_KP_Left];
330 } else 312 break;
313 }
314 else
331 /* translate to std. cursor key */ 315 /* translate to std. cursor key */
332 keysym = XK_Left + (keysym - XK_KP_Left); 316 keysym = XK_Left + (keysym - XK_KP_Left);
333 /* FALLTHROUGH */ 317 /* FALLTHROUGH */
334#endif 318#endif
335 case XK_Up: /* "\033[A" */ 319 case XK_Up: /* "\033[A" */
336 case XK_Down: /* "\033[B" */ 320 case XK_Down: /* "\033[B" */
337 case XK_Right: /* "\033[C" */ 321 case XK_Right: /* "\033[C" */
338 case XK_Left: /* "\033[D" */ 322 case XK_Left: /* "\033[D" */
339 STRCPY(kbuf, "\033[Z"); 323 STRCPY (kbuf, "\033[Z");
340 kbuf[2] = ("DACB"[keysym - XK_Left]); 324 kbuf[2] = "DACB"[keysym - XK_Left];
341 /* do Shift first */ 325 /* do Shift first */
342 if (shft) 326 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 327 kbuf[2] = "dacb"[keysym - XK_Left];
344 else if (ctrl) { 328 else if (ctrl)
345 kbuf[1] = 'O';
346 kbuf[2] = ("dacb"[keysym - XK_Left]);
347 } else if (R->PrivateModes & PrivMode_aplCUR)
348 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET
350 //TODO: ?? 329 {
351 if (R->Options & Opt_mc_hack) { 330 kbuf[1] = 'O';
352 int col, row, m; 331 kbuf[2] = "dacb"[keysym - XK_Left];
353 332 }
354 col = R->screen.cur.col; 333 else if (PrivateModes & PrivMode_aplCUR)
355 row = R->screen.cur.row + R->TermWin.saveLines; 334 kbuf[1] = 'O';
356 m = 0; 335 break;
357 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col]))
359 m = 1;
360 else if (keysym == XK_Left) {
361 if (col > 0) {
362 if (IS_MULTI2(R->screen.rend[row][col - 1]))
363 m = 1;
364 } else if (R->screen.cur.row > 0) {
365 col = R->screen.tlen[--row];
366 if (col == -1)
367 col = R->TermWin.ncol - 1;
368 else
369 col--;
370 if (col > 0
371 && IS_MULTI2(R->screen.rend[row][col]))
372 m = 1;
373 }
374 }
375 if (m)
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
377 }
378#endif
379 break;
380 336
381#ifndef UNSHIFTED_SCROLLKEYS 337#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 338# ifdef XK_KP_Prior
383 case XK_KP_Prior: 339 case XK_KP_Prior:
384 /* allow shift to override */ 340 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
386 STRCPY(kbuf, "\033Oy"); 342 {
387 break; 343 STRCPY (kbuf, "\033Oy");
388 } 344 break;
389 /* FALLTHROUGH */ 345 }
346 /* FALLTHROUGH */
390# endif 347# endif
391 case XK_Prior: 348 case XK_Prior:
392 STRCPY(kbuf, "\033[5~"); 349 STRCPY (kbuf, "\033[5~");
393 break; 350 break;
394# ifdef XK_KP_Next 351# ifdef XK_KP_Next
395 case XK_KP_Next: 352 case XK_KP_Next:
396 /* allow shift to override */ 353 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
398 STRCPY(kbuf, "\033Os"); 355 {
399 break; 356 STRCPY (kbuf, "\033Os");
400 } 357 break;
401 /* FALLTHROUGH */ 358 }
359 /* FALLTHROUGH */
402# endif 360# endif
403 case XK_Next: 361 case XK_Next:
404 STRCPY(kbuf, "\033[6~"); 362 STRCPY (kbuf, "\033[6~");
405 break; 363 break;
406#endif 364#endif
407 case XK_KP_Enter: 365 case XK_KP_Enter:
408 /* allow shift to override */ 366 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
410 STRCPY(kbuf, "\033OM"); 368 {
411 } else { 369 STRCPY (kbuf, "\033OM");
412 kbuf[0] = '\r'; 370 }
413 kbuf[1] = '\0'; 371 else
414 } 372 {
415 break; 373 kbuf[0] = '\r';
374 kbuf[1] = '\0';
375 }
376 break;
416 377
417#ifdef XK_KP_Begin 378#ifdef XK_KP_Begin
418 case XK_KP_Begin: 379 case XK_KP_Begin:
419 STRCPY(kbuf, "\033Ou"); 380 STRCPY (kbuf, "\033Ou");
420 break; 381 break;
421 382
422 case XK_KP_Insert: 383 case XK_KP_Insert:
423 STRCPY(kbuf, "\033Op"); 384 STRCPY (kbuf, "\033Op");
424 break; 385 break;
425 386
426 case XK_KP_Delete: 387 case XK_KP_Delete:
427 STRCPY(kbuf, "\033On"); 388 STRCPY (kbuf, "\033On");
428 break; 389 break;
429#endif 390#endif
430 case XK_KP_F1: /* "\033OP" */ 391 case XK_KP_F1: /* "\033OP" */
431 case XK_KP_F2: /* "\033OQ" */ 392 case XK_KP_F2: /* "\033OQ" */
432 case XK_KP_F3: /* "\033OR" */ 393 case XK_KP_F3: /* "\033OR" */
433 case XK_KP_F4: /* "\033OS" */ 394 case XK_KP_F4: /* "\033OS" */
434 STRCPY(kbuf, "\033OP"); 395 STRCPY (kbuf, "\033OP");
435 kbuf[2] += (keysym - XK_KP_F1); 396 kbuf[2] += (keysym - XK_KP_F1);
436 break; 397 break;
437 398
438 case XK_KP_Multiply: /* "\033Oj" : "*" */ 399 case XK_KP_Multiply: /* "\033Oj" : "*" */
439 case XK_KP_Add: /* "\033Ok" : "+" */ 400 case XK_KP_Add: /* "\033Ok" : "+" */
440 case XK_KP_Separator: /* "\033Ol" : "," */ 401 case XK_KP_Separator: /* "\033Ol" : "," */
441 case XK_KP_Subtract: /* "\033Om" : "-" */ 402 case XK_KP_Subtract: /* "\033Om" : "-" */
442 case XK_KP_Decimal: /* "\033On" : "." */ 403 case XK_KP_Decimal: /* "\033On" : "." */
443 case XK_KP_Divide: /* "\033Oo" : "/" */ 404 case XK_KP_Divide: /* "\033Oo" : "/" */
444 case XK_KP_0: /* "\033Op" : "0" */ 405 case XK_KP_0: /* "\033Op" : "0" */
445 case XK_KP_1: /* "\033Oq" : "1" */ 406 case XK_KP_1: /* "\033Oq" : "1" */
446 case XK_KP_2: /* "\033Or" : "2" */ 407 case XK_KP_2: /* "\033Or" : "2" */
447 case XK_KP_3: /* "\033Os" : "3" */ 408 case XK_KP_3: /* "\033Os" : "3" */
448 case XK_KP_4: /* "\033Ot" : "4" */ 409 case XK_KP_4: /* "\033Ot" : "4" */
449 case XK_KP_5: /* "\033Ou" : "5" */ 410 case XK_KP_5: /* "\033Ou" : "5" */
450 case XK_KP_6: /* "\033Ov" : "6" */ 411 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 412 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 413 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 414 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 415 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
456 STRCPY(kbuf, "\033Oj"); 417 {
457 kbuf[2] += (keysym - XK_KP_Multiply); 418 STRCPY (kbuf, "\033Oj");
458 } else { 419 kbuf[2] += (keysym - XK_KP_Multiply);
420 }
421 else
422 {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 424 kbuf[1] = '\0';
461 } 425 }
462 break; 426 break;
463 427
464 case XK_Find: 428 case XK_Find:
465 STRCPY(kbuf, "\033[1~"); 429 STRCPY (kbuf, "\033[1~");
466 break; 430 break;
467 case XK_Insert: 431 case XK_Insert:
468 STRCPY(kbuf, "\033[2~"); 432 STRCPY (kbuf, "\033[2~");
469 break; 433 break;
470#ifdef DXK_Remove /* support for DEC remove like key */ 434#ifdef DXK_Remove /* support for DEC remove like key */
471 case DXK_Remove: 435 case DXK_Remove:
472 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
473#endif 437#endif
474 case XK_Execute: 438 case XK_Execute:
475 STRCPY(kbuf, "\033[3~"); 439 STRCPY (kbuf, "\033[3~");
476 break; 440 break;
477 case XK_Select: 441 case XK_Select:
478 STRCPY(kbuf, "\033[4~"); 442 STRCPY (kbuf, "\033[4~");
479 break; 443 break;
480#ifdef XK_KP_End 444#ifdef XK_KP_End
481 case XK_KP_End: 445 case XK_KP_End:
482 /* allow shift to override */ 446 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
484 STRCPY(kbuf, "\033Oq"); 448 {
485 break; 449 STRCPY (kbuf, "\033Oq");
486 } 450 break;
487 /* FALLTHROUGH */ 451 }
452 /* FALLTHROUGH */
488#endif 453#endif
489 case XK_End: 454 case XK_End:
490 STRCPY(kbuf, KS_END); 455 STRCPY (kbuf, KS_END);
491 break; 456 break;
492#ifdef XK_KP_Home 457#ifdef XK_KP_Home
493 case XK_KP_Home: 458 case XK_KP_Home:
494 /* allow shift to override */ 459 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
496 STRCPY(kbuf, "\033Ow"); 461 {
497 break; 462 STRCPY (kbuf, "\033Ow");
498 } 463 break;
499 /* FALLTHROUGH */ 464 }
465 /* FALLTHROUGH */
500#endif 466#endif
501 case XK_Home: 467 case XK_Home:
502 STRCPY(kbuf, KS_HOME); 468 STRCPY (kbuf, KS_HOME);
503 break; 469 break;
504 470
505#define FKEY(n, fkey) \ 471#define FKEY(n, fkey) \
506 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
507 473
508 case XK_F1: /* "\033[11~" */ 474 case XK_F1: /* "\033[11~" */
509 case XK_F2: /* "\033[12~" */ 475 case XK_F2: /* "\033[12~" */
510 case XK_F3: /* "\033[13~" */ 476 case XK_F3: /* "\033[13~" */
511 case XK_F4: /* "\033[14~" */ 477 case XK_F4: /* "\033[14~" */
512 case XK_F5: /* "\033[15~" */ 478 case XK_F5: /* "\033[15~" */
513 FKEY(11, XK_F1); 479 FKEY (11, XK_F1);
514 break; 480 break;
515 case XK_F6: /* "\033[17~" */ 481 case XK_F6: /* "\033[17~" */
516 case XK_F7: /* "\033[18~" */ 482 case XK_F7: /* "\033[18~" */
517 case XK_F8: /* "\033[19~" */ 483 case XK_F8: /* "\033[19~" */
518 case XK_F9: /* "\033[20~" */ 484 case XK_F9: /* "\033[20~" */
519 case XK_F10: /* "\033[21~" */ 485 case XK_F10: /* "\033[21~" */
520 FKEY(17, XK_F6); 486 FKEY (17, XK_F6);
521 break; 487 break;
522 case XK_F11: /* "\033[23~" */ 488 case XK_F11: /* "\033[23~" */
523 case XK_F12: /* "\033[24~" */ 489 case XK_F12: /* "\033[24~" */
524 case XK_F13: /* "\033[25~" */ 490 case XK_F13: /* "\033[25~" */
525 case XK_F14: /* "\033[26~" */ 491 case XK_F14: /* "\033[26~" */
526 FKEY(23, XK_F11); 492 FKEY (23, XK_F11);
527 break; 493 break;
528 case XK_F15: /* "\033[28~" */ 494 case XK_F15: /* "\033[28~" */
529 case XK_F16: /* "\033[29~" */ 495 case XK_F16: /* "\033[29~" */
530 FKEY(28, XK_F15); 496 FKEY (28, XK_F15);
531 break; 497 break;
532 case XK_Help: /* "\033[28~" */ 498 case XK_Help: /* "\033[28~" */
533 FKEY(28, XK_Help); 499 FKEY (28, XK_Help);
534 break; 500 break;
535 case XK_Menu: /* "\033[29~" */ 501 case XK_Menu: /* "\033[29~" */
536 FKEY(29, XK_Menu); 502 FKEY (29, XK_Menu);
537 break; 503 break;
538 case XK_F17: /* "\033[31~" */ 504 case XK_F17: /* "\033[31~" */
539 case XK_F18: /* "\033[32~" */ 505 case XK_F18: /* "\033[32~" */
540 case XK_F19: /* "\033[33~" */ 506 case XK_F19: /* "\033[33~" */
541 case XK_F20: /* "\033[34~" */ 507 case XK_F20: /* "\033[34~" */
542 case XK_F21: /* "\033[35~" */ 508 case XK_F21: /* "\033[35~" */
543 case XK_F22: /* "\033[36~" */ 509 case XK_F22: /* "\033[36~" */
544 case XK_F23: /* "\033[37~" */ 510 case XK_F23: /* "\033[37~" */
545 case XK_F24: /* "\033[38~" */ 511 case XK_F24: /* "\033[38~" */
546 case XK_F25: /* "\033[39~" */ 512 case XK_F25: /* "\033[39~" */
547 case XK_F26: /* "\033[40~" */ 513 case XK_F26: /* "\033[40~" */
548 case XK_F27: /* "\033[41~" */ 514 case XK_F27: /* "\033[41~" */
549 case XK_F28: /* "\033[42~" */ 515 case XK_F28: /* "\033[42~" */
550 case XK_F29: /* "\033[43~" */ 516 case XK_F29: /* "\033[43~" */
551 case XK_F30: /* "\033[44~" */ 517 case XK_F30: /* "\033[44~" */
552 case XK_F31: /* "\033[45~" */ 518 case XK_F31: /* "\033[45~" */
553 case XK_F32: /* "\033[46~" */ 519 case XK_F32: /* "\033[46~" */
554 case XK_F33: /* "\033[47~" */ 520 case XK_F33: /* "\033[47~" */
555 case XK_F34: /* "\033[48~" */ 521 case XK_F34: /* "\033[48~" */
556 case XK_F35: /* "\033[49~" */ 522 case XK_F35: /* "\033[49~" */
557 FKEY(31, XK_F17); 523 FKEY (31, XK_F17);
558 break; 524 break;
559#undef FKEY 525#undef FKEY
560 default: 526 default:
561 newlen = 0; 527 newlen = 0;
562 break; 528 break;
563 } 529 }
564 if (newlen) 530 if (newlen)
565 len = STRLEN(kbuf); 531 len = STRLEN (kbuf);
566 } 532 }
567 /* 533
534 /*
568 * Pass meta for all function keys, if 'meta' option set 535 * Pass meta for all function keys, if 'meta' option set
569 */ 536 */
570#ifdef META8_OPTION 537#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 538 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 539 kbuf[len - 1] |= 0x80;
573#endif 540#endif
541
542 }
574 } else if (ctrl && keysym == XK_minus) { 543 else if (ctrl && keysym == XK_minus)
544 {
575 len = 1; 545 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 547 }
548 else
549 {
578#ifdef META8_OPTION 550#ifdef META8_OPTION
579 /* set 8-bit on */ 551 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 552 if (meta && (meta_char == 0x80))
581 unsigned char *ch; 553 {
554 unsigned char *ch;
582 555
583 for (ch = kbuf; ch < kbuf + len; ch++) 556 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 557 *ch |= 0x80;
585 meta = 0; 558
559 meta = 0;
560 }
561#endif
562 /* nil */ ;
563 }
586 } 564 }
587#endif 565
588#ifdef GREEK_SUPPORT 566 if (len <= 0)
589 if (R->greek_mode) 567 return; /* not mapped */
590 len = greek_xlat(kbuf, len); 568
591#endif 569 if (Options & Opt_scrollTtyKeypress)
592 /* nil */ ; 570 if (TermWin.view_start)
593 } 571 {
572 TermWin.view_start = 0;
573 want_refresh = 1;
594 } 574 }
595 575
596 if (len <= 0) 576 /*
597 return; /* not mapped */
598
599 if (R->Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) {
601 R->TermWin.view_start = 0;
602 R->want_refresh = 1;
603 }
604
605/*
606 * these modifications only affect the static keybuffer 577 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 578 * pass Shift/Control indicators for function keys ending with `~'
608 * 579 *
609 * eg, 580 * eg,
610 * Prior = "ESC[5~" 581 * Prior = "ESC[5~"
611 * Shift+Prior = "ESC[5$" 582 * Shift+Prior = "ESC[5$"
612 * Ctrl+Prior = "ESC[5^" 583 * Ctrl+Prior = "ESC[5^"
613 * Ctrl+Shift+Prior = "ESC[5@" 584 * Ctrl+Shift+Prior = "ESC[5@"
614 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 585 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
615 */ 586 */
616 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 587 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 588 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 589
619/* escape prefix */ 590 /* escape prefix */
620 if (meta 591 if (meta
621#ifdef META8_OPTION 592#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 593 && meta_char == C0_ESC
623#endif 594#endif
624 ) { 595 )
596 {
625 const unsigned char ch = C0_ESC; 597 const unsigned char ch = C0_ESC;
626
627 R->tt_write(&ch, 1); 598 tt_write (&ch, 1);
628 } 599 }
600
629#ifdef DEBUG_CMD 601#if defined(DEBUG_CMD)
630 if (debug_key) { /* Display keyboard buffer contents */ 602 /* Display keyboard buffer contents */
631 char *p; 603 unsigned char *p;
632 int i; 604 int i;
633 605
634 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 606 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
635 for (i = 0, p = kbuf; i < len; i++, p++) 607 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 608 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 609 fprintf (stderr, "'\n");
638 }
639#endif /* DEBUG_CMD */ 610#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 611 tt_write (kbuf, (unsigned int)len);
641} 612}
642/*}}} */ 613/*}}} */
643 614
644#if (MENUBAR_MAX) 615#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
646/* attempt to `write' count to the input buffer */ 617/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 618unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 619rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 620{
651 unsigned int n, s; 621 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 622
656 n = cmdbuf_ptr - cmdbuf_base; 623 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
625
658 if (n > 0 && s < count) { 626 if (n > 0 && s < count)
627 {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 628 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
660 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
661 cmdbuf_ptr = cmdbuf_base; 630 cmdbuf_ptr = cmdbuf_base;
662 cmdbuf_endp -= n; 631 cmdbuf_endp -= n;
663 s += n; 632 s += n;
664 } 633 }
634
665 if (count > s) { 635 if (count > s)
636 {
666 rxvt_print_error("data loss: cmd_write too large"); 637 rxvt_print_error ("data loss: cmd_write too large");
667 count = s; 638 count = s;
668 } 639 }
640
669 for (; count--;) 641 for (; count--;)
670 *cmdbuf_endp++ = *str++; 642 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr; 643
672 R->cmdbuf_endp = cmdbuf_endp; 644 cmd_parse ();
645
673 return 0; 646 return 0;
674} 647}
675#endif /* MENUBAR_MAX */ 648#endif /* MENUBAR_MAX */
676 649
677void 650void
678rxvt_term::flush () 651rxvt_term::flush ()
… …
688#endif 661#endif
689 662
690 if (want_refresh) 663 if (want_refresh)
691 { 664 {
692 scr_refresh (refresh_type); 665 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 666 scrollbar_show (1);
694#ifdef USE_XIM 667#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 668 IMSendSpot ();
696#endif 669#endif
697 }
698 670
699 XFlush (Xdisplay); 671 }
672
673 display->flush ();
700} 674}
701 675
702void 676void
703rxvt_term::check_cb (check_watcher &w) 677rxvt_term::check_cb (check_watcher &w)
704{ 678{
… …
706 SET_LOCALE (locale); 680 SET_LOCALE (locale);
707 681
708 flush (); 682 flush ();
709} 683}
710 684
711void
712rxvt_term::process_x_events ()
713{
714 do
715 {
716 XEvent xev;
717
718 XNextEvent (Xdisplay, &xev);
719
720#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink)
722 && xev.type == KeyPress)
723 {
724 if (hidden_cursor)
725 {
726 hidden_cursor = 0;
727 want_refresh = 1;
728 }
729
730 blink_ev.start (NOW + BLINK_INTERVAL);
731 }
732#endif
733
734#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank)
736 && (pointerBlankDelay > 0))
737 {
738 if (xev.type == MotionNotify
739 || xev.type == ButtonPress
740 || xev.type == ButtonRelease)
741 if (hidden_pointer)
742 pointer_unblank ();
743
744 if (xev.type == KeyPress && hidden_pointer == 0)
745 pointer_blank ();
746 }
747#endif
748
749#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window))
751#endif
752 rxvt_process_x_event (this, &xev);
753 }
754 while (XPending (Xdisplay));
755}
756
757#ifdef CURSOR_BLINK 685#ifdef CURSOR_BLINK
758void 686void
759rxvt_term::blink_cb (time_watcher &w) 687rxvt_term::cursor_blink_cb (time_watcher &w)
760{ 688{
761 hidden_cursor = !hidden_cursor; 689 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 690 want_refresh = 1;
763 691
764 w.start (w.at + BLINK_INTERVAL); 692 w.start (w.at + BLINK_INTERVAL);
765} 693}
766#endif 694#endif
767 695
696#ifdef TEXT_BLINK
768void 697void
769rxvt_term::x_cb (io_watcher &w, short revents) 698rxvt_term::text_blink_cb (time_watcher &w)
770{ 699{
771 SET_R (this); 700 if (scr_refresh_rend (RS_Blink, RS_Blink))
772 SET_LOCALE (locale); 701 {
773 702 hidden_text = !hidden_text;
774 process_x_events (); 703 want_refresh = 1;
704 w.start (w.at + TEXT_BLINK_INTERVAL);
705 }
775} 706}
707#endif
776 708
777bool 709bool
778rxvt_term::pty_fill () 710rxvt_term::pty_fill ()
779{ 711{
780 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 712 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
781 713
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 714 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 715 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 716 cmdbuf_endp = cmdbuf_ptr + n;
785 717
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
787 719
788 if (n > 0) 720 if (n > 0)
789 { 721 {
790 cmdbuf_endp += n; 722 cmdbuf_endp += n;
791 return true; 723 return true;
792 } 724 }
793 else if (n < 0 && errno != EAGAIN) 725 else if (n < 0 && errno != EAGAIN)
794 destroy (); 726 destroy ();
795 727
796 return false; 728 return false;
797} 729}
798 730
799void 731void
800rxvt_term::pty_cb (io_watcher &w, short revents) 732rxvt_term::pty_cb (io_watcher &w, short revents)
… …
817 seen_input = 1; 749 seen_input = 1;
818 /* once we know the shell is running, send the screen size. Again! */ 750 /* once we know the shell is running, send the screen size. Again! */
819 tt_winch (); 751 tt_winch ();
820 } 752 }
821 753
822 uint32_t ch = NOCHAR; 754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
823 783
824 for (;;) 784 for (;;)
825 { 785 {
826 if (ch == NOCHAR)
827 ch = next_char (); 786 ch = next_char ();
828 787
829 if (ch == NOCHAR) // TODO: improve 788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
830 break; 789 break;
831 790 else
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
833 { 791 {
834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
839
840 *str++ = ch; 792 *str++ = ch;
841 793
842 for (;;) 794 if (ch == '\n')
843 { 795 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
848 else 796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
849 { 801 {
850 *str++ = ch;
851
852 if (ch == '\n')
853 {
854 nlines++;
855 refresh_count++;
856
857 if (!(Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
860 refreshnow = true; 802 refreshnow = true;
861 flag = false; 803 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865 }
866
867 if (str >= buf + BUFSIZ)
868 {
869 ch = NOCHAR; 804 ch = NOCHAR;
870 break; 805 break;
871 } 806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
872 } 814 }
873 } 815 }
874 816
875 rxvt_scr_add_lines (this, buf, nlines, str - buf); 817 if (str >= buf + BUFSIZ)
876
877 /*
878 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which
881 * is incremented here because we must be doing flat-out scrolling.
882 *
883 * refreshing should be correct for small scrolls, because of the
884 * time-out
885 */
886 if (refreshnow)
887 { 818 {
888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 819 ch = NOCHAR;
889 refresh_limit++; 820 break;
890
891 scr_refresh (refresh_type);
892 } 821 }
893
894 }
895 else
896 {
897 switch (ch)
898 {
899 default:
900 rxvt_process_nonprinting (this, ch);
901 break;
902 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this);
904 break;
905 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */
907 }
908
909 ch = NOCHAR;
910 } 822 }
911 } 823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
912 } 846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
913 } 861 }
862
863 return flag;
914} 864}
915 865
916// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
917// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
918uint32_t 868unicode_t
919rxvt_term::next_char () 869rxvt_term::next_char ()
920{ 870{
921 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
922 { 872 {
923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
924 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
925 877
926 wchar_t wc; 878 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
928 880
929 if (len == (size_t)-2) 881 if (len == (size_t)-2)
930 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
931 887
932 if (len == (size_t)-1) 888 if (len == (size_t)-1)
933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934 890
935 // assume wchar == unicode 891 // assume wchar == unicode
… …
938 } 894 }
939 895
940 return NOCHAR; 896 return NOCHAR;
941} 897}
942 898
943/* rxvt_cmd_getc() - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
944/* 900/*
945 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
946 * to the command. 902 * to the command.
947 */ 903 */
948/* INTPROTO */ 904unicode_t
949uint32_t
950rxvt_cmd_getc(pR) 905rxvt_term::cmd_getc ()
951{ 906{
952 for (;;) 907 for (;;)
953 { 908 {
954 uint32_t c = R->next_char (); 909 unicode_t c = next_char ();
955 if (c != NOCHAR) 910 if (c != NOCHAR)
956 return c; 911 return c;
957 912
958 // incomplete sequences should occur rarely, still, a better solution 913 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design. 914 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (R->cmd_fd, F_SETFL, 0); 915 fcntl (cmd_fd, F_SETFL, 0);
961 R->pty_fill (); 916 pty_fill ();
962 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964
965#if 0
966#define TIMEOUT_USEC 5000
967 fd_set readfds;
968 int quick_timeout, select_res;
969 int want_motion_time, want_keypress_time;
970 struct timeval value;
971#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
972 struct timeval tp;
973#endif
974
975 for (;;) {
976 /* loop until we can return something */
977
978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
979 R->tt_write(NULL, 0);
980
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 if (R->mouse_slip_wheel_speed) {
983 quick_timeout = 1;
984 if (!R->mouse_slip_wheel_delay--
985 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
986 abs(R->mouse_slip_wheel_speed))) {
987 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1;
990 } 918 }
991 }
992#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
993#ifdef SELECTION_SCROLLING
994 if (R->pending_scroll_selection) {
995 quick_timeout = 1;
996 if (!R->scroll_selection_delay--
997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
998 R->scroll_selection_lines)) {
999 R->selection_extend (R->selection_save_x,
1000 R->selection_save_y, R->selection_save_state);
1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1002 R->refresh_type |= SMOOTH_REFRESH;
1003 R->want_refresh = 1;
1004 }
1005 }
1006#endif
1007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1008 if (scrollbar_isUp() || scrollbar_isDn()) {
1009 quick_timeout = 1;
1010 if (!R->scroll_arrow_delay--
1011 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1012 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1;
1015 }
1016 }
1017#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1018
1019#ifdef TRANSPARENT
1020 quick_timeout |= R->want_full_refresh;
1021#endif
1022#endif
1023} 919}
1024 920
921#ifdef POINTER_BLANK
1025void 922void
1026rxvt_term::pointer_unblank () 923rxvt_term::pointer_unblank ()
1027{ 924{
1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1029 recolour_cursor (); 926 recolour_cursor ();
1030 927
1031#ifdef POINTER_BLANK
1032 hidden_pointer = 0; 928 hidden_pointer = 0;
1033 929
1034 if (Options & Opt_pointerBlank) 930 if (Options & Opt_pointerBlank)
1035 pointer_ev.start (NOW + pointerBlankDelay); 931 pointer_ev.start (NOW + pointerBlankDelay);
1036#endif
1037} 932}
1038 933
1039#ifdef POINTER_BLANK
1040void 934void
1041rxvt_term::pointer_blank () 935rxvt_term::pointer_blank ()
1042{ 936{
1043 if (!(Options & Opt_pointerBlank)) 937 if (! (Options & Opt_pointerBlank))
1044 return; 938 return;
1045 939
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 940 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 941 XFlush (display->display);
1048 942
1049 hidden_pointer = 1; 943 hidden_pointer = 1;
1050} 944}
1051 945
1052void 946void
… …
1057 951
1058 pointer_blank (); 952 pointer_blank ();
1059} 953}
1060#endif 954#endif
1061 955
1062/* INTPROTO */
1063void 956void
1064rxvt_mouse_report(pR_ const XButtonEvent *ev) 957rxvt_term::mouse_report (XButtonEvent &ev)
1065{ 958{
1066 int button_number, key_state = 0; 959 int button_number, key_state = 0;
1067 int x, y; 960 int x, y;
1068 961
1069 x = ev->x; 962 x = ev.x;
1070 y = ev->y; 963 y = ev.y;
1071 R->pixel_position (&x, &y); 964 pixel_position (&x, &y);
1072 965
1073 if (R->MEvent.button == AnyButton) { 966 if (MEvent.button == AnyButton)
967 {
1074 button_number = 3; 968 button_number = 3;
1075 } else { 969 }
970 else
971 {
1076 button_number = R->MEvent.button - Button1; 972 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 973 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 974 if (button_number >= 3)
1079 button_number += (64 - 3); 975 button_number += (64 - 3);
1080 } 976 }
1081 977
1082 if (R->PrivateModes & PrivMode_MouseX10) { 978 if (PrivateModes & PrivMode_MouseX10)
979 {
1083 /* 980 /*
1084 * do not report ButtonRelease 981 * do not report ButtonRelease
1085 * no state info allowed 982 * no state info allowed
1086 */ 983 */
1087 key_state = 0; 984 key_state = 0;
1088 if (button_number == 3) 985 if (button_number == 3)
1089 return; 986 return;
1090 } else { 987 }
988 else
989 {
1091 /* XTerm mouse reporting needs these values: 990 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 991 * 4 = Shift
1093 * 8 = Meta 992 * 8 = Meta
1094 * 16 = Control 993 * 16 = Control
1095 * plus will add in our own Double-Click reporting 994 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 995 * 32 = Double Click
1097 */ 996 */
1098 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 997 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 998 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((R->MEvent.state & ControlMask) ? 16 : 0); 999 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1000#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1001 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1002#endif
1003
1104 } 1004 }
1105 1005
1106#ifdef DEBUG_MOUSEREPORT 1006#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1007 fprintf (stderr, "Mouse [");
1108 if (key_state & 16) 1008 if (key_state & 16)
1109 fputc('C', stderr); 1009 fputc ('C', stderr);
1110 if (key_state & 4) 1010 if (key_state & 4)
1111 fputc('S', stderr); 1011 fputc ('S', stderr);
1112 if (key_state & 8) 1012 if (key_state & 8)
1113 fputc('A', stderr); 1013 fputc ('A', stderr);
1114 if (key_state & 32) 1014 if (key_state & 32)
1115 fputc('2', stderr); 1015 fputc ('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1016 fprintf (stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1017 button_number,
1118 x + 1, 1018 x + 1,
1119 y + 1); 1019 y + 1);
1120#else 1020#else
1121 R->tt_printf("\033[M%c%c%c", 1021 tt_printf ("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1022 (32 + button_number + key_state),
1123 (32 + x + 1), 1023 (32 + x + 1),
1124 (32 + y + 1)); 1024 (32 + y + 1));
1125#endif 1025#endif
1126} 1026}
1127 1027
1128#ifdef USING_W11LIB 1028#ifdef USING_W11LIB
1129/* EXTPROTO */
1130void 1029void
1131rxvt_W11_process_x_event(XEvent *ev) 1030rxvt_W11_process_x_event (XEvent *ev)
1132{ 1031{
1133 rxvt_t *r = rxvt_get_r(); 1032 rxvt_t *r = rxvt_get_r ();
1134 1033
1135 rxvt_process_x_event(aR_ ev); 1034 x_cb (*ev);
1136} 1035}
1137#endif 1036#endif
1138 1037
1139/*{{{ process an X event */ 1038/*{{{ process an X event */
1140/* INTPROTO */
1141void 1039void
1142rxvt_process_x_event(pR_ XEvent *ev) 1040rxvt_term::x_cb (XEvent &ev)
1143{ 1041{
1144 int i, want_timeout; 1042 SET_R (this);
1043 SET_LOCALE (locale);
1044
1045#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 }
1056#endif
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1145 Window unused_root, unused_child; 1077 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1078 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1079 unsigned int unused_mask;
1148 1080
1149#ifdef DEBUG_X 1081#ifdef DEBUG_X
1150 const char *const eventnames[] = 1082 const char *const eventnames[] =
1151 { /* mason - this matches my system */ 1083 { /* mason - this matches my system */
1152 "", 1084 "",
1153 "", 1085 "",
1154 "KeyPress", 1086 "KeyPress",
1155 "KeyRelease", 1087 "KeyRelease",
1156 "ButtonPress", 1088 "ButtonPress",
1157 "ButtonRelease", 1089 "ButtonRelease",
1158 "MotionNotify", 1090 "MotionNotify",
1159 "EnterNotify", 1091 "EnterNotify",
1160 "LeaveNotify", 1092 "LeaveNotify",
1161 "FocusIn", 1093 "FocusIn",
1162 "FocusOut", 1094 "FocusOut",
1163 "KeymapNotify", 1095 "KeymapNotify",
1164 "Expose", 1096 "Expose",
1165 "GraphicsExpose", 1097 "GraphicsExpose",
1166 "NoExpose", 1098 "NoExpose",
1167 "VisibilityNotify", 1099 "VisibilityNotify",
1168 "CreateNotify", 1100 "CreateNotify",
1169 "DestroyNotify", 1101 "DestroyNotify",
1170 "UnmapNotify", 1102 "UnmapNotify",
1171 "MapNotify", 1103 "MapNotify",
1172 "MapRequest", 1104 "MapRequest",
1173 "ReparentNotify", 1105 "ReparentNotify",
1174 "ConfigureNotify", 1106 "ConfigureNotify",
1175 "ConfigureRequest", 1107 "ConfigureRequest",
1176 "GravityNotify", 1108 "GravityNotify",
1177 "ResizeRequest", 1109 "ResizeRequest",
1178 "CirculateNotify", 1110 "CirculateNotify",
1179 "CirculateRequest", 1111 "CirculateRequest",
1180 "PropertyNotify", 1112 "PropertyNotify",
1181 "SelectionClear", 1113 "SelectionClear",
1182 "SelectionRequest", 1114 "SelectionRequest",
1183 "SelectionNotify", 1115 "SelectionNotify",
1184 "ColormapNotify", 1116 "ColormapNotify",
1185 "ClientMessage", 1117 "ClientMessage",
1186 "MappingNotify" 1118 "MappingNotify"
1187 }; 1119 };
1188#endif 1120#endif
1189 1121
1190#ifdef DEBUG_X 1122#ifdef DEBUG_X
1191 struct timeval tp; 1123 struct timeval tp;
1192 struct tm *ltt; 1124 struct tm *ltt;
1193 (void)gettimeofday(&tp, NULL); 1125 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime(&(tp.tv_sec)); 1126 ltt = localtime (& (tp.tv_sec));
1195 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1127 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));
1196#endif 1128#endif
1197 1129
1198 switch (ev->type) { 1130 switch (ev.type)
1131 {
1199 case KeyPress: 1132 case KeyPress:
1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1133 lookup_key (ev.xkey);
1201 break; 1134 break;
1202 1135
1203#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1204 case KeyRelease: 1137 case KeyRelease:
1205 { 1138 {
1206 if (!(ev->xkey.state & ControlMask)) 1139 if (! (ev.xkey.state & ControlMask))
1207 R->mouse_slip_wheel_speed = 0; 1140 mouse_slip_wheel_speed = 0;
1208 else { 1141 else
1209 KeySym ks; 1142 {
1210 1143 KeySym ks;
1144
1211 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1212 if (ks == XK_Control_L || ks == XK_Control_R) 1146 if (ks == XK_Control_L || ks == XK_Control_R)
1213 R->mouse_slip_wheel_speed = 0; 1147 mouse_slip_wheel_speed = 0;
1214 } 1148 }
1215 break; 1149 break;
1216 } 1150 }
1217#endif 1151#endif
1218 1152
1219 case ButtonPress: 1153 case ButtonPress:
1220 rxvt_button_press(aR_ (XButtonEvent *)ev); 1154 button_press (ev.xbutton);
1221 break; 1155 break;
1222 1156
1223 case ButtonRelease: 1157 case ButtonRelease:
1224 rxvt_button_release(aR_ (XButtonEvent *)ev); 1158 button_release (ev.xbutton);
1225 break; 1159 break;
1226 1160
1227 case ClientMessage: 1161 case ClientMessage:
1228 if (ev->xclient.format == 32 1162 if (ev.xclient.format == 32
1229 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1230 R->destroy (); 1164 destroy ();
1231#ifdef OFFIX_DND 1165#ifdef OFFIX_DND
1232 /* OffiX Dnd (drag 'n' drop) protocol */ 1166 /* OffiX Dnd (drag 'n' drop) protocol */
1233 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1234 && (ev->xclient.data.l[0] == DndFile 1168 && (ev.xclient.data.l[0] == DndFile
1235 || ev->xclient.data.l[0] == DndDir 1169 || ev.xclient.data.l[0] == DndDir
1236 || ev->xclient.data.l[0] == DndLink)) { 1170 || ev.xclient.data.l[0] == DndLink))
1237 /* Get Dnd data */ 1171 {
1172 /* Get Dnd data */
1238 Atom ActualType; 1173 Atom ActualType;
1239 int ActualFormat; 1174 int ActualFormat;
1240 unsigned char *data; 1175 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1176 unsigned long Size, RemainingBytes;
1242 1177
1243 XGetWindowProperty(R->Xdisplay, Xroot, 1178 XGetWindowProperty (display->display, display->root,
1244 R->xa[XA_DNDSELECTION], 1179 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1180 0L, 1000000L,
1246 False, AnyPropertyType, 1181 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1182 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1183 &Size, &RemainingBytes,
1249 &data); 1184 &data);
1250 XChangeProperty(R->Xdisplay, Xroot, 1185 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1186 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1187 8, PropModeReplace,
1253 data, STRLEN(data)); 1188 data, STRLEN (data));
1254 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1189 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1191 }
1257#endif /* OFFIX_DND */ 1192#endif /* OFFIX_DND */
1258 break; 1193 break;
1259 1194
1260 case MappingNotify: 1195 case MappingNotify:
1261 XRefreshKeyboardMapping(&(ev->xmapping)); 1196 XRefreshKeyboardMapping (& (ev.xmapping));
1262 break; 1197 break;
1263 1198
1264 /* 1199 /*
1265 * XXX: this is not the _current_ arrangement 1200 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1201 * Here's my conclusion:
1267 * If the window is completely unobscured, use bitblt's 1202 * If the window is completely unobscured, use bitblt's
1268 * to scroll. Even then, they're only used when doing partial 1203 * to scroll. Even then, they're only used when doing partial
1269 * screen scrolling. When partially obscured, we have to fill 1204 * screen scrolling. When partially obscured, we have to fill
1270 * in the GraphicsExpose parts, which means that after each refresh, 1205 * in the GraphicsExpose parts, which means that after each refresh,
1271 * we need to wait for the graphics expose or Noexpose events, 1206 * we need to wait for the graphics expose or Noexpose events,
1272 * which ought to make things real slow! 1207 * which ought to make things real slow!
1273 */ 1208 */
1274 case VisibilityNotify: 1209 case VisibilityNotify:
1275 switch (ev->xvisibility.state) 1210 switch (ev.xvisibility.state)
1276 { 1211 {
1277 case VisibilityUnobscured: 1212 case VisibilityUnobscured:
1278 R->refresh_type = FAST_REFRESH; 1213 refresh_type = FAST_REFRESH;
1279 break; 1214 break;
1280 case VisibilityPartiallyObscured: 1215 case VisibilityPartiallyObscured:
1281 R->refresh_type = SLOW_REFRESH; 1216 refresh_type = SLOW_REFRESH;
1282 break; 1217 break;
1283 default: 1218 default:
1284 R->refresh_type = NO_REFRESH; 1219 refresh_type = NO_REFRESH;
1285 break; 1220 break;
1286 } 1221 }
1287 break; 1222 break;
1288 1223
1289 case FocusIn: 1224 case FocusIn:
1290 if (!R->TermWin.focus) { 1225 if (!TermWin.focus)
1291 R->TermWin.focus = 1; 1226 {
1292 R->want_refresh = 1; 1227 TermWin.focus = 1;
1228 want_refresh = 1;
1293#ifdef USE_XIM 1229#ifdef USE_XIM
1294 if (R->Input_Context != NULL) 1230 if (Input_Context != NULL)
1295 XSetICFocus(R->Input_Context); 1231 XSetICFocus (Input_Context);
1296#endif 1232#endif
1297#ifdef CURSOR_BLINK 1233#ifdef CURSOR_BLINK
1298 if (R->Options & Opt_cursorBlink) 1234 if (Options & Opt_cursorBlink)
1299 R->blink_ev.start (NOW + BLINK_INTERVAL); 1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1300#endif 1236#endif
1301 }
1302 break;
1303 1237
1238 }
1239 break;
1240
1304 case FocusOut: 1241 case FocusOut:
1305 if (R->TermWin.focus) { 1242 if (TermWin.focus)
1306 R->TermWin.focus = 0; 1243 {
1307 R->want_refresh = 1; 1244 TermWin.focus = 0;
1245 want_refresh = 1;
1308#ifdef USE_XIM 1246#ifdef USE_XIM
1309 if (R->Input_Context != NULL) 1247 if (Input_Context != NULL)
1310 XUnsetICFocus(R->Input_Context); 1248 XUnsetICFocus (Input_Context);
1311#endif 1249#endif
1312#ifdef CURSOR_BLINK 1250#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1251 if (Options & Opt_cursorBlink)
1314 R->blink_ev.stop (); 1252 cursor_blink_ev.stop ();
1315 R->hidden_cursor = 0; 1253 hidden_cursor = 0;
1316#endif 1254#endif
1317 }
1318 break;
1319 1255
1256 }
1257 break;
1258
1320 case ConfigureNotify: 1259 case ConfigureNotify:
1321 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1260 if (ev.xconfigure.window == TermWin.parent[0])
1322 int height, width; 1261 {
1262 int height, width;
1323 1263
1264 do
1324 do { /* Wrap lots of configures into one */ 1265 { /* Wrap lots of configures into one */
1325 width = ev->xconfigure.width; 1266 width = ev.xconfigure.width;
1326 height = ev->xconfigure.height; 1267 height = ev.xconfigure.height;
1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1269 }
1329 ConfigureNotify, ev)); 1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1330 if (R->szHint.width != width || R->szHint.height != height) { 1272 if (szHint.width != width || szHint.height != height)
1273 {
1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1332 R->resize_all_windows (width, height, 1); 1275 resize_all_windows (width, height, 1);
1333 } 1276 }
1334#ifdef DEBUG_SIZE 1277#ifdef DEBUG_SIZE
1335 else { 1278 else
1279 {
1336 D_SIZE((stderr, "Size: Not resizing")); 1280 D_SIZE ((stderr, "Size: Not resizing"));
1337 } 1281 }
1338#endif 1282#endif
1339#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1340 if (R->Options & Opt_transparent) { 1284 if (Options & Opt_transparent)
1341 rxvt_check_our_parents(aR); 1285 {
1342 if (R->am_transparent) 1286 check_our_parents ();
1343 R->want_full_refresh = 1; 1287 if (am_transparent)
1344 } 1288 want_full_refresh = 1;
1289 }
1345#endif 1290#endif
1346 }
1347 break;
1348 1291
1292 }
1293 break;
1294
1349 case SelectionClear: 1295 case SelectionClear:
1350 rxvt_selection_clear(aR); 1296 display->set_selection_owner (0);
1351 break; 1297 break;
1352 1298
1353 case SelectionNotify: 1299 case SelectionNotify:
1354 if (R->selection_wait == Sel_normal) 1300 if (selection_wait == Sel_normal)
1355 rxvt_selection_paste(aR_ ev->xselection.requestor, 1301 selection_paste (ev.xselection.requestor,
1356 ev->xselection.property, True); 1302 ev.xselection.property, True);
1357 break; 1303 break;
1358 1304
1359 case SelectionRequest: 1305 case SelectionRequest:
1360 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1306 selection_send (ev.xselectionrequest);
1361 break; 1307 break;
1362 1308
1363 case UnmapNotify: 1309 case UnmapNotify:
1364 R->TermWin.mapped = 0; 1310 TermWin.mapped = 0;
1365 break; 1311#ifdef TEXT_BLINK
1312 text_blink_ev.stop ();
1313#endif
1314 break;
1366 1315
1367 case MapNotify: 1316 case MapNotify:
1368 R->TermWin.mapped = 1; 1317 TermWin.mapped = 1;
1369 break; 1318#ifdef TEXT_BLINK
1370 1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371 case PropertyNotify: 1320#endif
1372 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1373 if (ev->xproperty.state == PropertyNewValue)
1374 rxvt_selection_property(aR_ ev->xproperty.window,
1375 ev->xproperty.atom);
1376 break; 1321 break;
1377 } 1322
1378#ifdef TRANSPARENT 1323#ifdef TRANSPARENT
1379 /*
1380 * if user used some Esetroot compatible prog to set the root bg,
1381 * use the property to determine the pixmap. We use it later on.
1382 */
1383 if (R->xa[XA_XROOTPMAPID] == 0)
1384 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1385 "_XROOTPMAP_ID", False);
1386 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1387 break;
1388 /* FALLTHROUGH */
1389 case ReparentNotify: 1324 case ReparentNotify:
1390 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1325 rootwin_cb (ev);
1391 if (R->am_transparent) 1326 break;
1392 R->want_full_refresh = 1;
1393 }
1394#endif /* TRANSPARENT */ 1327#endif /* TRANSPARENT */
1395 break;
1396 1328
1397 case GraphicsExpose: 1329 case GraphicsExpose:
1398 case Expose: 1330 case Expose:
1399 if (ev->xany.window == R->TermWin.vt) { 1331 if (ev.xany.window == TermWin.vt)
1332 {
1400#ifdef NO_SLOW_LINK_SUPPORT 1333#ifdef NO_SLOW_LINK_SUPPORT
1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1334 scr_expose (ev.xexpose.x, ev.xexpose.y,
1402 ev->xexpose.width, ev->xexpose.height, False); 1335 ev.xexpose.width, ev.xexpose.height, False);
1403#else 1336#else
1404 // don't understand this, so commented it out 1337 // don't understand this, so commented it out
1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1338 scr_expose (ev.xexpose.x, ev.xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1339 ev.xexpose.width, ev.xexpose.height, False);
1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1340 //scr_expose (ev.xexpose.x, 0,
1408 // ev->xexpose.width, R->TermWin.height, False); 1341 // ev.xexpose.width, TermWin.height, False);
1409#endif 1342#endif
1410 R->want_refresh = 1; 1343 want_refresh = 1;
1411 } else { 1344 }
1412 XEvent unused_xevent; 1345 else
1346 {
1347 XEvent unused_event;
1413 1348
1414 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1415 Expose, 1350 Expose,
1416 &unused_xevent)) ; 1351 &unused_event)) ;
1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1418 GraphicsExpose, 1353 GraphicsExpose,
1419 &unused_xevent)) ; 1354 &unused_event)) ;
1420 if (isScrollbarWindow(ev->xany.window)) { 1355 if (isScrollbarWindow (ev.xany.window))
1421 R->scrollBar.setIdle(); 1356 {
1422 rxvt_scrollbar_show(aR_ 0); 1357 scrollBar.setIdle ();
1423 } 1358 scrollbar_show (0);
1359 }
1424#ifdef MENUBAR 1360#ifdef MENUBAR
1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1426 rxvt_menubar_expose(aR); 1362 menubar_expose ();
1427#endif 1363#endif
1428#ifdef RXVT_GRAPHICS 1364 }
1429 rxvt_Gr_expose(aR_ ev->xany.window); 1365 break;
1430#endif
1431 }
1432 break;
1433 1366
1434 case MotionNotify: 1367 case MotionNotify:
1435#ifdef POINTER_BLANK 1368#ifdef POINTER_BLANK
1436 if (R->hidden_pointer) 1369 if (hidden_pointer)
1437 R->pointer_unblank (); 1370 pointer_unblank ();
1438#endif 1371#endif
1439#if MENUBAR 1372#if MENUBAR
1440 if (isMenuBarWindow(ev->xany.window)) { 1373 if (isMenuBarWindow (ev.xany.window))
1441 rxvt_menubar_control(aR_ &(ev->xbutton)); 1374 {
1442 break; 1375 menubar_control (ev.xbutton);
1443 } 1376 break;
1377 }
1444#endif 1378#endif
1445 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1446 break; 1380 break;
1447 1381
1448 if (ev->xany.window == R->TermWin.vt) { 1382 if (ev.xany.window == TermWin.vt)
1383 {
1449 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1450 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1385 {
1451 MotionNotify, ev)) ; 1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1452 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1387 ;
1453 &unused_root, &unused_child, 1388
1454 &unused_root_x, &unused_root_y, 1389 XQueryPointer (display->display, TermWin.vt,
1455 &(ev->xbutton.x), &(ev->xbutton.y), 1390 &unused_root, &unused_child,
1456 &unused_mask); 1391 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y),
1393 &unused_mask);
1457#ifdef MOUSE_THRESHOLD 1394#ifdef MOUSE_THRESHOLD
1458 /* deal with a `jumpy' mouse */ 1395 /* deal with a `jumpy' mouse */
1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 {
1460#endif 1398#endif
1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1462 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1400 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1463#ifdef SELECTION_SCROLLING 1401#ifdef SELECTION_SCROLLING
1464 if (ev->xbutton.y<R->TermWin.int_bwidth || 1402 if (ev.xbutton.y < TermWin.int_bwidth
1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1466 int dist;
1467
1468 R->pending_scroll_selection=1;
1469
1470 /* don't clobber the current delay if we are
1471 * already in the middle of scrolling.
1472 */
1473 if (R->scroll_selection_delay<=0)
1474 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1475
1476 /* save the event params so we can highlight
1477 * the selection in the pending-scroll loop
1478 */
1479 R->selection_save_x=ev->xbutton.x;
1480 R->selection_save_y=ev->xbutton.y;
1481 R->selection_save_state=
1482 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1483
1484 /* calc number of lines to scroll */
1485 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1486 R->scroll_selection_dir = UP;
1487 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1488 }
1489 else {
1490 R->scroll_selection_dir = DN;
1491 dist = ev->xbutton.y -
1492 (R->TermWin.int_bwidth + R->TermWin.height);
1493 }
1494 R->scroll_selection_lines=(Pixel2Height(dist)/
1495 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1496 MIN_IT(R->scroll_selection_lines,
1497 SELECTION_SCROLL_MAX_LINES);
1498 }
1499 else {
1500 /* we are within the text window, so we
1501 * shouldn't be scrolling
1502 */
1503 R->pending_scroll_selection = 0;
1504 }
1505#endif
1506#ifdef MOUSE_THRESHOLD
1507 }
1508#endif
1509 }
1510 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1511 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1512 MotionNotify, ev)) ;
1513 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1514 &unused_root, &unused_child,
1515 &unused_root_x, &unused_root_y,
1516 &(ev->xbutton.x), &(ev->xbutton.y),
1517 &unused_mask);
1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1519 scrollbar_size());
1520 R->scr_refresh (R->refresh_type);
1521 R->refresh_limit = 0;
1522 rxvt_scrollbar_show(aR_ 1);
1523 }
1524 break;
1525 }
1526}
1527
1528/* INTPROTO */
1529void
1530rxvt_button_press(pR_ XButtonEvent *ev)
1531{
1532 int reportmode = 0, clickintime;
1533
1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1535 if (!R->bypass_keystate)
1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1537/*
1538 * VT window processing of button press
1539 */
1540 if (ev->window == R->TermWin.vt)
1541 {
1542#if RXVT_GRAPHICS
1543 if (ev->subwindow != None)
1544 rxvt_Gr_ButtonPress (ev->x, ev->y);
1545 else
1546#endif
1547 {
1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1549 if (reportmode)
1550 {
1551 /* mouse report from vt window */
1552 /* save the xbutton state (for ButtonRelease) */
1553 R->MEvent.state = ev->state;
1554#ifdef MOUSE_REPORT_DOUBLECLICK
1555 if (ev->button == R->MEvent.button && clickintime)
1556 {
1557 /* same button, within alloted time */
1558 R->MEvent.clicks++;
1559 if (R->MEvent.clicks > 1)
1560 { 1404 {
1561 /* only report double clicks */ 1405 int dist;
1562 R->MEvent.clicks = 2;
1563 rxvt_mouse_report(aR_ ev);
1564 1406
1565 /* don't report the release */ 1407 pending_scroll_selection=1;
1566 R->MEvent.clicks = 0; 1408
1567 R->MEvent.button = AnyButton; 1409 /* don't clobber the current delay if we are
1568 } 1410 * already in the middle of scrolling.
1569 }
1570 else
1571 { 1411 */
1572 /* different button, or time expired */ 1412 if (scroll_selection_delay<=0)
1573 R->MEvent.clicks = 1; 1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1574 R->MEvent.button = ev->button; 1414
1575 rxvt_mouse_report(aR_ ev); 1415 /* save the event params so we can highlight
1576 } 1416 * the selection in the pending-scroll loop
1577#else
1578 R->MEvent.button = ev->button;
1579 rxvt_mouse_report(aR_ ev);
1580#endif /* MOUSE_REPORT_DOUBLECLICK */
1581 }
1582 else
1583 {
1584 if (ev->button != R->MEvent.button)
1585 R->MEvent.clicks = 0;
1586 switch (ev->button)
1587 { 1417 */
1588 case Button1: 1418 selection_save_x=ev.xbutton.x;
1589 /* allow shift+left click to extend selection */ 1419 selection_save_y=ev.xbutton.y;
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422
1423 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth)
1591 { 1425 {
1592 if (R->MEvent.button == Button1 && clickintime) 1426 scroll_selection_dir = UP;
1593 R->selection_rotate (ev->x, ev->y); 1427 dist = TermWin.int_bwidth - ev.xbutton.y;
1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 } 1428 }
1597 else 1429 else
1598 { 1430 {
1599 if (R->MEvent.button == Button1 && clickintime) 1431 scroll_selection_dir = DN;
1600 R->MEvent.clicks++; 1432 dist = ev.xbutton.y -
1601 else 1433 (TermWin.int_bwidth + TermWin.height);
1602 R->MEvent.clicks = 1;
1603
1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 } 1434 }
1435 scroll_selection_lines= (Pixel2Height (dist)/
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1437 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES);
1439 }
1440 else
1441 {
1442 /* we are within the text window, so we
1443 * shouldn't be scrolling
1444 */
1445 pending_scroll_selection = 0;
1446 }
1447#endif
1448#ifdef MOUSE_THRESHOLD
1606 1449
1450 }
1451#endif
1452
1453 }
1454 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1458 MotionNotify, &ev)) ;
1459 XQueryPointer (display->display, scrollBar.win,
1460 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y),
1463 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ());
1466 scr_refresh (refresh_type);
1467 refresh_limit = 0;
1468 scrollbar_show (1);
1469 }
1470 break;
1471 }
1472}
1473
1474void
1475rxvt_term::rootwin_cb (XEvent &ev)
1476{
1477 SET_R (this);
1478 SET_LOCALE (locale);
1479
1480 switch (ev.type)
1481 {
1482 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /*
1493 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on.
1495 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1500 return;
1501 }
1502
1503 /* FALLTHROUGH */
1504 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ())
1506 if (am_transparent)
1507 want_full_refresh = 1;
1508 break;
1509#endif
1510 }
1511}
1512
1513void
1514rxvt_term::button_press (XButtonEvent &ev)
1515{
1516 int reportmode = 0, clickintime;
1517
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1521 /*
1522 * VT window processing of button press
1523 */
1524 if (ev.window == TermWin.vt)
1525 {
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1527 if (reportmode)
1528 {
1529 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime)
1534 {
1535 /* same button, within alloted time */
1536 MEvent.clicks++;
1537 if (MEvent.clicks > 1)
1538 {
1539 /* only report double clicks */
1540 MEvent.clicks = 2;
1541 mouse_report (ev);
1542
1543 /* don't report the release */
1544 MEvent.clicks = 0;
1545 MEvent.button = AnyButton;
1546 }
1547 }
1548 else
1549 {
1550 /* different button, or time expired */
1551 MEvent.clicks = 1;
1552 MEvent.button = ev.button;
1553 mouse_report (ev);
1554 }
1555#else
1556 MEvent.button = ev.button;
1557 mouse_report (ev);
1558#endif /* MOUSE_REPORT_DOUBLECLICK */
1559
1560 }
1561 else
1562 {
1563 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0;
1565 switch (ev.button)
1566 {
1567 case Button1:
1568 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1570 {
1571 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y);
1573 else
1574 selection_extend (ev.x, ev.y, 1);
1575 }
1576 else
1577 {
1578 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++;
1580 else
1581 MEvent.clicks = 1;
1582
1583 selection_click (MEvent.clicks, ev.x, ev.y);
1584 }
1585
1607 R->MEvent.button = Button1; 1586 MEvent.button = Button1;
1587 break;
1588
1589 case Button3:
1590 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y);
1592 else
1593 selection_extend (ev.x, ev.y, 1);
1594 MEvent.button = Button3;
1595 break;
1596 }
1597 }
1598 MEvent.time = ev.time;
1599 return;
1600 }
1601
1602 /*
1603 * Scrollbar window processing of button press
1604 */
1605 if (isScrollbarWindow (ev.window))
1606 {
1607 scrollBar.setIdle ();
1608 /*
1609 * Rxvt-style scrollbar:
1610 * move up if mouse is above slider
1611 * move dn if mouse is below slider
1612 *
1613 * XTerm-style scrollbar:
1614 * Move display proportional to pointer location
1615 * pointer near top -> scroll one line
1616 * pointer near bot -> scroll full page
1617 */
1618#ifndef NO_SCROLLBAR_REPORT
1619 if (reportmode)
1620 {
1621 /*
1622 * Mouse report disabled scrollbar:
1623 * arrow buttons - send up/down
1624 * click on scrollbar - send pageup/down
1625 */
1626 if ((scrollBar.style == R_SB_NEXT
1627 && scrollbarnext_upButton (ev.y))
1628 || (scrollBar.style == R_SB_RXVT
1629 && scrollbarrxvt_upButton (ev.y)))
1630 tt_printf ("\033[A");
1631 else if ((scrollBar.style == R_SB_NEXT
1632 && scrollbarnext_dnButton (ev.y))
1633 || (scrollBar.style == R_SB_RXVT
1634 && scrollbarrxvt_dnButton (ev.y)))
1635 tt_printf ("\033[B");
1636 else
1637 switch (ev.button)
1638 {
1639 case Button2:
1640 tt_printf ("\014");
1641 break;
1642 case Button1:
1643 tt_printf ("\033[6~");
1644 break;
1645 case Button3:
1646 tt_printf ("\033[5~");
1647 break;
1648 }
1649 }
1650 else
1651#endif /* NO_SCROLLBAR_REPORT */
1652
1653 {
1654 char upordown = 0;
1655
1656 if (scrollBar.style == R_SB_NEXT)
1657 {
1658 if (scrollbarnext_upButton (ev.y))
1659 upordown = -1; /* up */
1660 else if (scrollbarnext_dnButton (ev.y))
1661 upordown = 1; /* down */
1662 }
1663 else if (scrollBar.style == R_SB_RXVT)
1664 {
1665 if (scrollbarrxvt_upButton (ev.y))
1666 upordown = -1; /* up */
1667 else if (scrollbarrxvt_dnButton (ev.y))
1668 upordown = 1; /* down */
1669 }
1670 if (upordown)
1671 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1674#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 {
1677 if (upordown < 0)
1678 scrollBar.setUp ();
1679 else
1680 scrollBar.setDn ();
1681 }
1682 }
1683 else
1684 switch (ev.button)
1685 {
1686 case Button2:
1687 switch (scrollbar_align)
1688 {
1689 case R_SB_ALIGN_TOP:
1690 csrO = 0;
1608 break; 1691 break;
1609 1692 case R_SB_ALIGN_CENTRE:
1610 case Button3: 1693 csrO = (scrollBar.bot - scrollBar.top) / 2;
1611 if (R->MEvent.button == Button3 && clickintime)
1612 R->selection_rotate (ev->x, ev->y);
1613 else
1614 R->selection_extend (ev->x, ev->y, 1);
1615 R->MEvent.button = Button3;
1616 break; 1694 break;
1695 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top;
1697 break;
1698 }
1699 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO,
1703 scrollbar_size ());
1704 scrollBar.setMotion ();
1705 break;
1706
1707 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1709 csrO = ev.y - scrollBar.top;
1710 /* FALLTHROUGH */
1711
1712 case Button3:
1713 if (scrollBar.style != R_SB_XTERM)
1714 {
1715 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1);
1718# else
1719 scr_page (UP, TermWin.nrow / 4);
1720# endif
1721 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1);
1724# else
1725 scr_page (DN, TermWin.nrow / 4);
1726# endif
1727 else
1728 scrollBar.setMotion ();
1729 }
1730 else
1731 {
1732 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow
1734 * scrollbar_position (ev.y)
1735 / scrollbar_size ()));
1736 }
1737 break;
1738 }
1617 } 1739 }
1618 }
1619 R->MEvent.time = ev->time;
1620 return; 1740 return;
1621 }
1622 }
1623
1624/*
1625 * Scrollbar window processing of button press
1626 */
1627 if (isScrollbarWindow(ev->window))
1628 {
1629 R->scrollBar.setIdle ();
1630 /*
1631 * Rxvt-style scrollbar:
1632 * move up if mouse is above slider
1633 * move dn if mouse is below slider
1634 *
1635 * XTerm-style scrollbar:
1636 * Move display proportional to pointer location
1637 * pointer near top -> scroll one line
1638 * pointer near bot -> scroll full page
1639 */
1640#ifndef NO_SCROLLBAR_REPORT
1641 if (reportmode) {
1642 /*
1643 * Mouse report disabled scrollbar:
1644 * arrow buttons - send up/down
1645 * click on scrollbar - send pageup/down
1646 */
1647 if ((R->scrollBar.style == R_SB_NEXT
1648 && scrollbarnext_upButton(ev->y))
1649 || (R->scrollBar.style == R_SB_RXVT
1650 && scrollbarrxvt_upButton(ev->y)))
1651 R->tt_printf("\033[A");
1652 else if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_dnButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_dnButton(ev->y)))
1656 R->tt_printf("\033[B");
1657 else
1658 switch (ev->button) {
1659 case Button2:
1660 R->tt_printf("\014");
1661 break;
1662 case Button1:
1663 R->tt_printf("\033[6~");
1664 break;
1665 case Button3:
1666 R->tt_printf("\033[5~");
1667 break;
1668 }
1669 }
1670 else
1671#endif /* NO_SCROLLBAR_REPORT */
1672 {
1673 char upordown = 0;
1674
1675 if (R->scrollBar.style == R_SB_NEXT) {
1676 if (scrollbarnext_upButton(ev->y))
1677 upordown = -1; /* up */
1678 else if (scrollbarnext_dnButton(ev->y))
1679 upordown = 1; /* down */
1680 } else if (R->scrollBar.style == R_SB_RXVT) {
1681 if (scrollbarrxvt_upButton(ev->y))
1682 upordown = -1; /* up */
1683 else if (scrollbarrxvt_dnButton(ev->y))
1684 upordown = 1; /* down */
1685 } 1741 }
1686 if (upordown) { 1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749}
1750
1751void
1752rxvt_term::button_release (XButtonEvent &ev)
1753{
1754 int reportmode = 0;
1755
1756 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1759
1760 if (scrollbar_isUpDn ())
1761 {
1762 scrollBar.setIdle ();
1763 scrollbar_show (0);
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1765 refresh_type &= ~SMOOTH_REFRESH;
1689#endif
1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1691 if (upordown < 0)
1692 R->scrollBar.setUp ();
1693 else
1694 R->scrollBar.setDn ();
1695 }
1696 } else
1697 switch (ev->button) {
1698 case Button2:
1699 switch (R->scrollbar_align) {
1700 case R_SB_ALIGN_TOP:
1701 R->csrO = 0;
1702 break;
1703 case R_SB_ALIGN_CENTRE:
1704 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1705 break;
1706 case R_SB_ALIGN_BOTTOM:
1707 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1708 break;
1709 }
1710 if (R->scrollBar.style == R_SB_XTERM
1711 || scrollbar_above_slider(ev->y)
1712 || scrollbar_below_slider(ev->y))
1713 rxvt_scr_move_to(aR_
1714 scrollbar_position(ev->y) - R->csrO,
1715 scrollbar_size());
1716 R->scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1721 R->csrO = ev->y - R->scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (R->scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1729# else
1730 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1731# endif 1766#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1735# else
1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1737# endif
1738 else
1739 R->scrollBar.setMotion ();
1740 } else {
1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1742 (R->TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 rxvt_menubar_control(aR_ ev);
1757#endif
1758}
1759 1767
1760/* INTPROTO */
1761void
1762rxvt_button_release(pR_ XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 R->csrO = 0; /* reset csr Offset */
1767 if (!R->bypass_keystate)
1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 R->scrollBar.setIdle ();
1772 rxvt_scrollbar_show(aR_ 0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 R->refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1768 }
1777#ifdef SELECTION_SCROLLING 1769#ifdef SELECTION_SCROLLING
1778 R->pending_scroll_selection=0; 1770 pending_scroll_selection=0;
1779#endif 1771#endif
1780 if (ev->window == R->TermWin.vt) 1772 if (ev.window == TermWin.vt)
1781 { 1773 {
1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else
1786#endif
1787 {
1788 if (reportmode) 1774 if (reportmode)
1789 { 1775 {
1790 /* mouse report from vt window */ 1776 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1777 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1778 if (ev.button >= 4)
1793 return; 1779 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1780#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1781 /* only report the release of 'slow' single clicks */
1796 if (R->MEvent.button != AnyButton 1782 if (MEvent.button != AnyButton
1797 && (ev->button != R->MEvent.button 1783 && (ev.button != MEvent.button
1798 || (ev->time - R->MEvent.time 1784 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1785 > MULTICLICK_TIME / 2)))
1800 { 1786 {
1801 R->MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1802 R->MEvent.button = AnyButton; 1788 MEvent.button = AnyButton;
1803 rxvt_mouse_report(aR_ ev); 1789 mouse_report (ev);
1804 } 1790 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1791#else /* MOUSE_REPORT_DOUBLECLICK */
1806 R->MEvent.button = AnyButton; 1792 MEvent.button = AnyButton;
1807 rxvt_mouse_report(aR_ ev); 1793 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1794#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1795 return;
1810 } 1796 }
1811 /* 1797 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1798 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1799 * when overriding mouse reporting
1814 */ 1800 */
1815 if (R->PrivateModes & PrivMode_mouse_report 1801 if (PrivateModes & PrivMode_mouse_report
1816 && R->bypass_keystate 1802 && bypass_keystate
1817 && ev->button == Button1 && R->MEvent.clicks <= 1) 1803 && ev.button == Button1 && MEvent.clicks <= 1)
1818 R->selection_extend (ev->x, ev->y, 0); 1804 selection_extend (ev.x, ev.y, 0);
1819 1805
1820 switch (ev->button) { 1806 switch (ev.button)
1807 {
1821 case Button1: 1808 case Button1:
1822 case Button3: 1809 case Button3:
1823 rxvt_selection_make(aR_ ev->time); 1810 selection_make (ev.time);
1824 break; 1811 break;
1825 case Button2: 1812 case Button2:
1826 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1813 selection_request (ev.time, ev.x, ev.y);
1827 break; 1814 break;
1828#ifdef MOUSE_WHEEL 1815#ifdef MOUSE_WHEEL
1829 case Button4: 1816 case Button4:
1830 case Button5: 1817 case Button5:
1831 { 1818 {
1832 int i; 1819 int i;
1833 page_dirn v; 1820 page_dirn v;
1834 1821
1835 v = (ev->button == Button4) ? UP : DN; 1822 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1823 if (ev.state & ShiftMask)
1837 i = 1; 1824 i = 1;
1838 else if ((R->Options & Opt_mouseWheelScrollPage)) 1825 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = R->TermWin.nrow - 1; 1826 i = TermWin.nrow - 1;
1840 else 1827 else
1841 i = 5; 1828 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1829# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1830 if (ev.state & ControlMask)
1844 { 1831 {
1845 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1832 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1834 }
1848# endif 1835# endif
1849# ifdef JUMP_MOUSE_WHEEL 1836# ifdef JUMP_MOUSE_WHEEL
1850 rxvt_scr_page(aR_ v, i); 1837 scr_page (v, i);
1851 R->scr_refresh (SMOOTH_REFRESH); 1838 scr_refresh (SMOOTH_REFRESH);
1852 rxvt_scrollbar_show(aR_ 1); 1839 scrollbar_show (1);
1853# else 1840# else
1854 while (i--) 1841 while (i--)
1855 { 1842 {
1856 rxvt_scr_page(aR_ v, 1); 1843 scr_page (v, 1);
1857 R->scr_refresh (SMOOTH_REFRESH); 1844 scr_refresh (SMOOTH_REFRESH);
1858 rxvt_scrollbar_show(aR_ 1); 1845 scrollbar_show (1);
1859 } 1846 }
1860# endif 1847# endif
1861 } 1848
1862 break; 1849 }
1850 break;
1863#endif 1851#endif
1864 } 1852
1865 }
1866 } 1853 }
1854 }
1867#ifdef MENUBAR 1855#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1856 else if (isMenuBarWindow (ev.window))
1869 rxvt_menubar_control(aR_ ev); 1857 menubar_control (ev);
1870#endif 1858#endif
1871} 1859}
1872 1860
1873 1861
1874#ifdef TRANSPARENT 1862#ifdef TRANSPARENT
1875/* 1863/*
1876 * Check our parents are still who we think they are. 1864 * Check our parents are still who we think they are.
1877 * Do transparency updates if required 1865 * Do transparency updates if required
1878 */ 1866 */
1879/* EXTPROTO */
1880int 1867int
1881rxvt_check_our_parents(pR) 1868rxvt_term::check_our_parents ()
1882{ 1869{
1883 int i, pchanged, aformat, have_pixmap, rootdepth; 1870 int i, pchanged, aformat, have_pixmap, rootdepth;
1884 unsigned long nitems, bytes_after; 1871 unsigned long nitems, bytes_after;
1885 Atom atype; 1872 Atom atype;
1886 unsigned char *prop = NULL; 1873 unsigned char *prop = NULL;
1887 Window root, oldp, *list; 1874 Window root, oldp, *list;
1888 Pixmap rootpixmap = None; 1875 Pixmap rootpixmap = None;
1889 XWindowAttributes wattr, wrootattr; 1876 XWindowAttributes wattr, wrootattr;
1890 1877
1891 pchanged = 0; 1878 pchanged = 0;
1892 1879
1893 if (!(R->Options & Opt_transparent)) 1880 if (! (Options & Opt_transparent))
1894 return pchanged; /* Don't try any more */ 1881 return pchanged; /* Don't try any more */
1895 1882
1896 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1897 rootdepth = wrootattr.depth; 1884 rootdepth = wrootattr.depth;
1898 1885
1899 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1900 if (rootdepth != wattr.depth) { 1887 if (rootdepth != wattr.depth)
1888 {
1901 if (R->am_transparent) { 1889 if (am_transparent)
1890 {
1902 pchanged = 1; 1891 pchanged = 1;
1903 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1892 XSetWindowBackground (display->display, TermWin.vt,
1904 R->PixColors[Color_bg]); 1893 PixColors[Color_bg]);
1905 R->am_transparent = R->am_pixmap_trans = 0; 1894 am_transparent = am_pixmap_trans = 0;
1906 } 1895 }
1907 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1908 } 1897 }
1909 1898
1910/* Get all X ops out of the queue so that our information is up-to-date. */ 1899 /* Get all X ops out of the queue so that our information is up-to-date. */
1911 XSync(R->Xdisplay, False); 1900 XSync (display->display, False);
1912 1901
1913/* 1902 /*
1914 * Make the frame window set by the window manager have 1903 * Make the frame window set by the window manager have
1915 * the root background. Some window managers put multiple nested frame 1904 * the root background. Some window managers put multiple nested frame
1916 * windows for each client, so we have to take care about that. 1905 * windows for each client, so we have to take care about that.
1917 */ 1906 */
1918 i = (R->xa[XA_XROOTPMAPID] != 0 1907 i = (xa[XA_XROOTPMAPID] != 0
1919 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1920 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1921 &nitems, &bytes_after, &prop) == Success)); 1910 &nitems, &bytes_after, &prop) == Success));
1922 if (!i || prop == NULL) 1911 if (!i || prop == NULL)
1923 have_pixmap = 0; 1912 have_pixmap = 0;
1924 else { 1913 else
1914 {
1925 have_pixmap = 1; 1915 have_pixmap = 1;
1926 rootpixmap = *((Pixmap *)prop); 1916 rootpixmap = * ((Pixmap *)prop);
1927 XFree(prop); 1917 XFree (prop);
1928 } 1918 }
1929 if (have_pixmap) { 1919 if (have_pixmap)
1930/* 1920 {
1921 /*
1931 * Copy Xroot pixmap transparency 1922 * Copy display->root pixmap transparency
1932 */ 1923 */
1933 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
1934 unsigned int nw, nh; 1925 unsigned int nw, nh;
1935 Window cr; 1926 Window cr;
1936 XImage *image; 1927 XImage *image;
1937 GC gc; 1928 GC gc;
1938 XGCValues gcvalue; 1929 XGCValues gcvalue;
1939 1930
1940 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1941 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
1942 nw = (unsigned int)R->szHint.width; 1933 nw = (unsigned int)szHint.width;
1943 nh = (unsigned int)R->szHint.height; 1934 nh = (unsigned int)szHint.height;
1944 nx = ny = 0; 1935 nx = ny = 0;
1945 if (sx < 0) { 1936
1937 if (sx < 0)
1938 {
1946 nw += sx; 1939 nw += sx;
1947 nx = -sx; 1940 nx = -sx;
1948 sx = 0; 1941 sx = 0;
1949 } 1942 }
1950 if (sy < 0) { 1943
1944 if (sy < 0)
1945 {
1951 nh += sy; 1946 nh += sy;
1952 ny = -sy; 1947 ny = -sy;
1953 sy = 0; 1948 sy = 0;
1954 } 1949 }
1950
1955 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1956 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1957 R->allowedxerror = -1; 1953 allowedxerror = -1;
1958 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1959 ZPixmap); 1955 ZPixmap);
1960 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1961 /* XXX: may need a delay here? */ 1957 /* XXX: may need a delay here? */
1962 R->allowedxerror = 0; 1958 allowedxerror = 0;
1963 if (image == NULL) { 1959 if (image == NULL)
1960 {
1964 if (R->am_transparent && R->am_pixmap_trans) { 1961 if (am_transparent && am_pixmap_trans)
1965 pchanged = 1; 1962 {
1963 pchanged = 1;
1964 if (TermWin.pixmap != None)
1965 {
1966 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None;
1968 }
1969 }
1970 am_pixmap_trans = 0;
1971 }
1972 else
1973 {
1966 if (R->TermWin.pixmap != None) { 1974 if (TermWin.pixmap != None)
1967 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1975 XFreePixmap (display->display, TermWin.pixmap);
1968 R->TermWin.pixmap = None; 1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1969 } 1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height,
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height);
1984 XFreeGC (display->display, gc);
1985 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1987 TermWin.pixmap);
1988 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1;
1990 am_transparent = am_pixmap_trans = 1;
1991 }
1970 } 1992 }
1971 R->am_pixmap_trans = 0; 1993
1972 } else {
1973 if (R->TermWin.pixmap != None)
1974 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1975 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1976 (unsigned int)R->szHint.width,
1977 (unsigned int)R->szHint.height,
1978 (unsigned int)image->depth);
1979 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1980 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1981 nx, ny, (unsigned int)image->width,
1982 (unsigned int)image->height);
1983 XFreeGC(R->Xdisplay, gc);
1984 XDestroyImage(image);
1985 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1986 R->TermWin.pixmap);
1987 if (!R->am_transparent || !R->am_pixmap_trans)
1988 pchanged = 1;
1989 R->am_transparent = R->am_pixmap_trans = 1;
1990 }
1991 }
1992 if (!R->am_pixmap_trans) { 1994 if (!am_pixmap_trans)
1995 {
1993 unsigned int n; 1996 unsigned int n;
1994/* 1997 /*
1995 * InheritPixmap transparency 1998 * InheritPixmap transparency
1996 */ 1999 */
1997 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1998 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1999 i++) { 2002 i++)
2003 {
2000 oldp = R->TermWin.parent[i]; 2004 oldp = TermWin.parent[i];
2001 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2002 &R->TermWin.parent[i], &list, &n); 2006 &TermWin.parent[i], &list, &n);
2003 XFree(list); 2007 XFree (list);
2004 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2005 if (R->TermWin.parent[i] == Xroot) { 2009 if (TermWin.parent[i] == display->root)
2006 if (oldp != None) 2010 {
2007 pchanged = 1; 2011 if (oldp != None)
2008 break; 2012 pchanged = 1;
2009 } 2013 break;
2014 }
2010 if (oldp != R->TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2011 pchanged = 1; 2016 pchanged = 1;
2012 } 2017 }
2013 n = 0; 2018
2014 if (pchanged) { 2019 n = 0;
2020
2021 if (pchanged)
2022 {
2015 for (; n < (unsigned int)i; n++) { 2023 for (; n < (unsigned int)i; n++)
2024 {
2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 {
2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2020 break; 2030 break;
2021 } 2031 }
2022 } 2032 }
2023 } 2033 }
2034
2024 if (n > (int)(sizeof(R->TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2025 / sizeof(R->TermWin.parent[0]))) { 2036 / sizeof (TermWin.parent[0])))
2037 {
2026 D_X((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2027 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
2028 R->PixColors[Color_fg]); 2040 PixColors[Color_fg]);
2029 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2041 XSetWindowBackground (display->display, TermWin.vt,
2030 R->PixColors[Color_bg]); 2042 PixColors[Color_bg]);
2031 R->am_transparent = 0; 2043 am_transparent = 0;
2032 /* XXX: also turn off Opt_transparent? */ 2044 /* XXX: also turn off Opt_transparent? */
2033 } else { 2045 }
2046 else
2047 {
2034 /* wait (an arbitrary period) for the WM to do its thing 2048 /* wait (an arbitrary period) for the WM to do its thing
2035 * needed for fvwm2.2.2 (and before?) */ 2049 * needed for fvwm2.2.2 (and before?) */
2036# ifdef HAVE_NANOSLEEP 2050# ifdef HAVE_NANOSLEEP
2037 struct timespec rqt; 2051 struct timespec rqt;
2038 2052
2039 rqt.tv_sec = 1; 2053 rqt.tv_sec = 1;
2040 rqt.tv_nsec = 0; 2054 rqt.tv_nsec = 0;
2041 nanosleep(&rqt, NULL); 2055 nanosleep (&rqt, NULL);
2042# else 2056# else
2043 sleep(1); 2057 sleep (1);
2044# endif 2058# endif
2045 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2046 for (n = 0; n < (unsigned int)i; n++) 2060 for (n = 0; n < (unsigned int)i; n++)
2047 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2048 ParentRelative); 2062 ParentRelative);
2049 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2050 ParentRelative); 2064 ParentRelative);
2051 R->am_transparent = 1; 2065 am_transparent = 1;
2052 } 2066 }
2067
2053 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2054 R->TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2055 } 2070 }
2056 return pchanged; 2071 return pchanged;
2057} 2072}
2058#endif 2073#endif
2059 2074
2060/*}}} */ 2075/*}}} */
2061 2076
2062/*{{{ print pipe */ 2077/*{{{ print pipe */
2063/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2064#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2065/* EXTPROTO */ 2080FILE *
2066FILE *
2067rxvt_popen_printer(pR) 2081rxvt_term::popen_printer ()
2068{ 2082{
2069 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2070 2084
2071 if (stream == NULL) 2085 if (stream == NULL)
2072 rxvt_print_error("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2073 return stream; 2087 return stream;
2074} 2088}
2075 2089
2076/* EXTPROTO */
2077int 2090int
2078rxvt_pclose_printer (FILE *stream) 2091rxvt_term::pclose_printer (FILE *stream)
2079{ 2092{
2080 fflush (stream); 2093 fflush (stream);
2081/* pclose() reported not to work on SunOS 4.1.3 */ 2094 /* pclose () reported not to work on SunOS 4.1.3 */
2082# if defined (__sun__) /* TODO: RESOLVE THIS */ 2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2083/* pclose works provided SIGCHLD handler uses waitpid */ 2096 /* pclose works provided SIGCHLD handler uses waitpid */
2084 return pclose (stream); /* return fclose (stream); */ 2097 return pclose (stream); /* return fclose (stream); */
2085# else 2098# else
2086 return pclose (stream); 2099 return pclose (stream);
2087# endif 2100# endif
2088} 2101}
2089 2102
2090/* 2103/*
2091 * simulate attached vt100 printer 2104 * simulate attached vt100 printer
2092 */ 2105 */
2093/* INTPROTO */
2094void 2106void
2095rxvt_process_print_pipe(pR) 2107rxvt_term::process_print_pipe ()
2096{ 2108{
2097 int done; 2109 int done;
2098 FILE *fd; 2110 FILE *fd;
2099 2111
2100 if ((fd = rxvt_popen_printer(aR)) == NULL) 2112 if ((fd = popen_printer ()) == NULL)
2101 return; 2113 return;
2102 2114
2103/* 2115 /*
2104 * Send all input to the printer until either ESC[4i or ESC[?4i 2116 * Send all input to the printer until either ESC[4i or ESC[?4i
2105 * is received. 2117 * is received.
2106 */ 2118 */
2107 for (done = 0; !done;) { 2119 for (done = 0; !done;)
2120 {
2108 unsigned char buf[8]; 2121 unsigned char buf[8];
2109 unsigned char ch; 2122 unsigned char ch;
2110 unsigned int i, len; 2123 unsigned int i, len;
2111 2124
2112 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2125 if ((ch = cmd_getc ()) != C0_ESC)
2126 {
2113 if (putc(ch, fd) == EOF) 2127 if (putc (ch, fd) == EOF)
2114 break; /* done = 1 */ 2128 break; /* done = 1 */
2115 } else { 2129 }
2130 else
2131 {
2116 len = 0; 2132 len = 0;
2117 buf[len++] = ch; 2133 buf[len++] = ch;
2118 2134
2119 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2135 if ((buf[len++] = cmd_getc ()) == '[')
2120 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2136 {
2121 buf[len++] = '?'; 2137 if ((ch = cmd_getc ()) == '?')
2122 ch = rxvt_cmd_getc(aR); 2138 {
2123 } 2139 buf[len++] = '?';
2140 ch = cmd_getc ();
2141 }
2124 if ((buf[len++] = ch) == '4') { 2142 if ((buf[len++] = ch) == '4')
2143 {
2125 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2144 if ((buf[len++] = cmd_getc ()) == 'i')
2126 break; /* done = 1 */ 2145 break; /* done = 1 */
2127 } 2146 }
2147 }
2148 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF)
2150 {
2151 done = 1;
2152 break;
2153 }
2154 }
2128 } 2155 }
2129 for (i = 0; i < len; i++)
2130 if (putc(buf[i], fd) == EOF) {
2131 done = 1;
2132 break;
2133 }
2134 }
2135 }
2136 rxvt_pclose_printer(fd); 2156 pclose_printer (fd);
2137} 2157}
2138#endif /* PRINTPIPE */ 2158#endif /* PRINTPIPE */
2139/*}}} */ 2159/*}}} */
2140 2160
2141/* *INDENT-OFF* */ 2161/* *INDENT-OFF* */
2142enum { 2162enum {
2143 C1_40 = 0x40, 2163 C1_40 = 0x40,
2144 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2145 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2146 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2147 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2148}; 2168};
2149/* *INDENT-ON* */ 2169/* *INDENT-ON* */
2150 2170
2151/*{{{ process non-printing single characters */ 2171/*{{{ process non-printing single characters */
2152/* INTPROTO */
2153void 2172void
2154rxvt_process_nonprinting(pR_ unsigned char ch) 2173rxvt_term::process_nonprinting (unsigned char ch)
2155{ 2174{
2156 switch (ch) { 2175 switch (ch)
2176 {
2157 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2158 if (R->rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2159 R->tt_write( 2179 tt_write (
2160 (const unsigned char *)R->rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2161 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2162 else 2182 else
2163 R->tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2164 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2165 break; 2185 break;
2166 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2167 rxvt_scr_bell(aR); 2187 scr_bell ();
2168 break; 2188 break;
2169 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
2170 rxvt_scr_backspace(aR); 2190 scr_backspace ();
2171 break; 2191 break;
2172 case C0_HT: /* tab */ 2192 case C0_HT: /* tab */
2173 rxvt_scr_tab(aR_ 1); 2193 scr_tab (1);
2174 break; 2194 break;
2175 case C0_CR: /* carriage return */ 2195 case C0_CR: /* carriage return */
2176 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2196 scr_gotorc (0, 0, R_RELATIVE);
2177 break; 2197 break;
2178 case C0_VT: /* vertical tab, form feed */ 2198 case C0_VT: /* vertical tab, form feed */
2179 case C0_FF: 2199 case C0_FF:
2180 case C0_LF: /* line feed */ 2200 case C0_LF: /* line feed */
2181 rxvt_scr_index(aR_ UP); 2201 scr_index (UP);
2182 break; 2202 break;
2183 case C0_SO: /* shift out - acs */ 2203 case C0_SO: /* shift out - acs */
2184 rxvt_scr_charset_choose(aR_ 1); 2204 scr_charset_choose (1);
2185 break; 2205 break;
2186 case C0_SI: /* shift in - acs */ 2206 case C0_SI: /* shift in - acs */
2187 rxvt_scr_charset_choose(aR_ 0); 2207 scr_charset_choose (0);
2188 break; 2208 break;
2189 } 2209 }
2190} 2210}
2191/*}}} */ 2211/*}}} */
2192 2212
2193 2213
2194/*{{{ process VT52 escape sequences */ 2214/*{{{ process VT52 escape sequences */
2195/* INTPROTO */
2196void 2215void
2197rxvt_process_escape_vt52(pR_ unsigned char ch) 2216rxvt_term::process_escape_vt52 (unsigned char ch)
2198{ 2217{
2199 int row, col; 2218 int row, col;
2219
2220 switch (ch)
2200 2221 {
2201 switch (ch) {
2202 case 'A': /* cursor up */ 2222 case 'A': /* cursor up */
2203 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2223 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2204 break; 2224 break;
2205 case 'B': /* cursor down */ 2225 case 'B': /* cursor down */
2206 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2226 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2207 break; 2227 break;
2208 case 'C': /* cursor right */ 2228 case 'C': /* cursor right */
2209 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2229 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2210 break; 2230 break;
2211 case 'D': /* cursor left */ 2231 case 'D': /* cursor left */
2212 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2232 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2213 break; 2233 break;
2214 case 'H': /* cursor home */ 2234 case 'H': /* cursor home */
2215 rxvt_scr_gotorc(aR_ 0, 0, 0); 2235 scr_gotorc (0, 0, 0);
2216 break; 2236 break;
2217 case 'I': /* cursor up and scroll down if needed */ 2237 case 'I': /* cursor up and scroll down if needed */
2218 rxvt_scr_index(aR_ DN); 2238 scr_index (DN);
2219 break; 2239 break;
2220 case 'J': /* erase to end of screen */ 2240 case 'J': /* erase to end of screen */
2221 R->scr_erase_screen (0); 2241 scr_erase_screen (0);
2222 break; 2242 break;
2223 case 'K': /* erase to end of line */ 2243 case 'K': /* erase to end of line */
2224 rxvt_scr_erase_line(aR_ 0); 2244 scr_erase_line (0);
2225 break; 2245 break;
2226 case 'Y': /* move to specified row and col */ 2246 case 'Y': /* move to specified row and col */
2227 /* full command is 'ESC Y row col' where row and col 2247 /* full command is 'ESC Y row col' where row and col
2228 * are encoded by adding 32 and sending the ascii 2248 * are encoded by adding 32 and sending the ascii
2229 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2249 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2230 * etc. */ 2250 * etc. */
2231 row = rxvt_cmd_getc(aR) - ' '; 2251 row = cmd_getc () - ' ';
2232 col = rxvt_cmd_getc(aR) - ' '; 2252 col = cmd_getc () - ' ';
2233 rxvt_scr_gotorc(aR_ row, col, 0); 2253 scr_gotorc (row, col, 0);
2234 break; 2254 break;
2235 case 'Z': /* identify the terminal type */ 2255 case 'Z': /* identify the terminal type */
2236 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2256 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2237 break; 2257 break;
2238 case '<': /* turn off VT52 mode */ 2258 case '<': /* turn off VT52 mode */
2239 PrivMode(0, PrivMode_vt52); 2259 PrivMode (0, PrivMode_vt52);
2240 break; 2260 break;
2241 case 'F': /* use special graphics character set */ 2261 case 'F': /* use special graphics character set */
2242 case 'G': /* use regular character set */ 2262 case 'G': /* use regular character set */
2243 /* unimplemented */ 2263 /* unimplemented */
2244 break; 2264 break;
2245 case '=': /* use alternate keypad mode */ 2265 case '=': /* use alternate keypad mode */
2246 case '>': /* use regular keypad mode */ 2266 case '>': /* use regular keypad mode */
2247 /* unimplemented */ 2267 /* unimplemented */
2248 break; 2268 break;
2249 } 2269 }
2250} 2270}
2251/*}}} */ 2271/*}}} */
2252 2272
2253 2273
2254/*{{{ process escape sequences */ 2274/*{{{ process escape sequences */
2255/* INTPROTO */
2256void 2275void
2257rxvt_process_escape_seq(pR) 2276rxvt_term::process_escape_seq ()
2258{ 2277{
2259 unsigned char ch = rxvt_cmd_getc(aR); 2278 unsigned char ch = cmd_getc ();
2260 2279
2261 if (R->PrivateModes & PrivMode_vt52) { 2280 if (PrivateModes & PrivMode_vt52)
2262 rxvt_process_escape_vt52(aR_ ch);
2263 return;
2264 }
2265 2281 {
2282 process_escape_vt52 (ch);
2283 return;
2284 }
2285
2266 switch (ch) { 2286 switch (ch)
2287 {
2267 /* case 1: do_tek_mode (); break; */ 2288 /* case 1: do_tek_mode (); break; */
2268 case '#': 2289 case '#':
2269 if (rxvt_cmd_getc(aR) == '8') 2290 if (cmd_getc () == '8')
2270 rxvt_scr_E(aR); 2291 scr_E ();
2271 break; 2292 break;
2272 case '(': 2293 case '(':
2273 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2294 scr_charset_set (0, (unsigned int)cmd_getc ());
2274 break; 2295 break;
2275 case ')': 2296 case ')':
2276 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2297 scr_charset_set (1, (unsigned int)cmd_getc ());
2277 break; 2298 break;
2278 case '*': 2299 case '*':
2279 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2280 break; 2301 break;
2281 case '+': 2302 case '+':
2282 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2283 break; 2304 break;
2284#ifdef MULTICHAR_SET
2285 case '$':
2286 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR));
2287 break;
2288#endif
2289#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2290 case '6': 2306 case '6':
2291 rxvt_scr_backindex(aR); 2307 scr_backindex ();
2292 break; 2308 break;
2293#endif 2309#endif
2294 case '7': 2310 case '7':
2295 rxvt_scr_cursor(aR_ SAVE); 2311 scr_cursor (SAVE);
2296 break; 2312 break;
2297 case '8': 2313 case '8':
2298 rxvt_scr_cursor(aR_ RESTORE); 2314 scr_cursor (RESTORE);
2299 break; 2315 break;
2300#ifndef NO_FRILLS 2316#ifndef NO_FRILLS
2301 case '9': 2317 case '9':
2302 rxvt_scr_forwardindex(aR); 2318 scr_forwardindex ();
2303 break; 2319 break;
2304#endif 2320#endif
2305 case '=': 2321 case '=':
2306 case '>': 2322 case '>':
2307 PrivMode((ch == '='), PrivMode_aplKP); 2323 PrivMode ((ch == '='), PrivMode_aplKP);
2308 break; 2324 break;
2309 2325
2310 case C1_40: 2326 case C1_40:
2311 rxvt_cmd_getc(aR); 2327 cmd_getc ();
2312 break; 2328 break;
2313 case C1_44: 2329 case C1_44:
2314 rxvt_scr_index(aR_ UP); 2330 scr_index (UP);
2315 break; 2331 break;
2316 2332
2317 /* 8.3.87: NEXT LINE */ 2333 /* 8.3.87: NEXT LINE */
2318 case C1_NEL: /* ESC E */ 2334 case C1_NEL: /* ESC E */
2319 {
2320 uint32_t nlcr[] = { '\n', '\r' };
2321 rxvt_scr_add_lines(aR_ nlcr, 1, 2);
2322 } 2335 {
2323 break; 2336 unicode_t nlcr[] = { L'\n', L'\r' };
2337 scr_add_lines (nlcr, 1, 2);
2338 }
2339 break;
2324 2340
2325 /* kidnapped escape sequence: Should be 8.3.48 */ 2341 /* kidnapped escape sequence: Should be 8.3.48 */
2326 case C1_ESA: /* ESC G */ 2342 case C1_ESA: /* ESC G */
2327 rxvt_process_graphics(aR); 2343 process_graphics ();
2328 break; 2344 break;
2329 2345
2330 /* 8.3.63: CHARACTER TABULATION SET */ 2346 /* 8.3.63: CHARACTER TABULATION SET */
2331 case C1_HTS: /* ESC H */ 2347 case C1_HTS: /* ESC H */
2332 rxvt_scr_set_tab(aR_ 1); 2348 scr_set_tab (1);
2333 break; 2349 break;
2334 2350
2335 /* 8.3.105: REVERSE LINE FEED */ 2351 /* 8.3.105: REVERSE LINE FEED */
2336 case C1_RI: /* ESC M */ 2352 case C1_RI: /* ESC M */
2337 rxvt_scr_index(aR_ DN); 2353 scr_index (DN);
2338 break; 2354 break;
2339 2355
2340 /* 8.3.142: SINGLE-SHIFT TWO */ 2356 /* 8.3.142: SINGLE-SHIFT TWO */
2341 /*case C1_SS2: scr_single_shift (2); break; */ 2357 /*case C1_SS2: scr_single_shift (2); break; */
2342 2358
2343 /* 8.3.143: SINGLE-SHIFT THREE */ 2359 /* 8.3.143: SINGLE-SHIFT THREE */
2344 /*case C1_SS3: scr_single_shift (3); break; */ 2360 /*case C1_SS3: scr_single_shift (3); break; */
2345 2361
2346 /* 8.3.27: DEVICE CONTROL STRING */ 2362 /* 8.3.27: DEVICE CONTROL STRING */
2347 case C1_DCS: /* ESC P */ 2363 case C1_DCS: /* ESC P */
2348 rxvt_process_dcs_seq(aR); 2364 process_dcs_seq ();
2349 break; 2365 break;
2350 2366
2351 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2352 case C1_SCI: /* ESC Z */ 2368 case C1_SCI: /* ESC Z */
2353 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2369 tt_write ((const unsigned char *)ESCZ_ANSWER,
2354 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2355 break; /* steal obsolete ESC [ c */ 2371 break; /* steal obsolete ESC [ c */
2356 2372
2357 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2358 case C1_CSI: /* ESC [ */ 2374 case C1_CSI: /* ESC [ */
2359 rxvt_process_csi_seq(aR); 2375 process_csi_seq ();
2360 break; 2376 break;
2361 2377
2362 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2378 /* 8.3.90: OPERATING SYSTEM COMMAND */
2363 case C1_OSC: /* ESC ] */ 2379 case C1_OSC: /* ESC ] */
2364 rxvt_process_osc_seq(aR); 2380 process_osc_seq ();
2365 break; 2381 break;
2366 2382
2367 /* 8.3.106: RESET TO INITIAL STATE */ 2383 /* 8.3.106: RESET TO INITIAL STATE */
2368 case 'c': 2384 case 'c':
2369 rxvt_scr_poweron(aR); 2385 scr_poweron ();
2370 rxvt_scrollbar_show(aR_ 1); 2386 scrollbar_show (1);
2371 break; 2387 break;
2372 2388
2373 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2374 case 'n': 2390 case 'n':
2375 rxvt_scr_charset_choose(aR_ 2); 2391 scr_charset_choose (2);
2376 break; 2392 break;
2377 2393
2378 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2394 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2379 case 'o': 2395 case 'o':
2380 rxvt_scr_charset_choose(aR_ 3); 2396 scr_charset_choose (3);
2381 break; 2397 break;
2382 } 2398 }
2383} 2399}
2384/*}}} */ 2400/*}}} */
2385 2401
2386/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2387/* *INDENT-OFF* */ 2403/* *INDENT-OFF* */
2388enum { 2404enum {
2389 CSI_ICH = 0x40, 2405 CSI_ICH = 0x40,
2390 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2391 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2392 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2393 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2394 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2395 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2396 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2412 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2397 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2413 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2398}; 2414};
2399 2415
2400#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2416#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2401 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2417 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2402 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2418 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2403#define get_byte_array_bit(array, bit) \ 2419#define get_byte_array_bit(array, bit) \
2404 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2420 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2405 2421
2406const unsigned char csi_defaults[] = { 2422const unsigned char csi_defaults[] =
2423 {
2407 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2424 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2408 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2425 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2409 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2410 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2411 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2412 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2413 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2414 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2415}; 2432 };
2416/* *INDENT-ON* */ 2433/* *INDENT-ON* */
2417 2434
2418/* INTPROTO */
2419void 2435void
2420rxvt_process_csi_seq(pR) 2436rxvt_term::process_csi_seq ()
2421{ 2437{
2422 unsigned char ch, priv, i; 2438 unsigned char ch, priv, i;
2423 unsigned int nargs, p; 2439 unsigned int nargs, p;
2424 int n, ndef; 2440 int n, ndef;
2425 int arg[ESC_ARGS]; 2441 int arg[ESC_ARGS];
2426 2442
2427 for (nargs = ESC_ARGS; nargs > 0;) 2443 for (nargs = ESC_ARGS; nargs > 0;)
2428 arg[--nargs] = 0; 2444 arg[--nargs] = 0;
2429 2445
2430 priv = 0; 2446 priv = 0;
2447 ch = cmd_getc ();
2448 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */
2450 priv = ch;
2431 ch = rxvt_cmd_getc(aR); 2451 ch = cmd_getc ();
2432 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2433 priv = ch;
2434 ch = rxvt_cmd_getc(aR);
2435 } 2452 }
2436/* read any numerical arguments */ 2453 /* read any numerical arguments */
2437 for (n = -1; ch < CSI_ICH; ) { 2454 for (n = -1; ch < CSI_ICH; )
2455 {
2438 if (isdigit(ch)) { 2456 if (isdigit (ch))
2457 {
2439 if (n < 0) 2458 if (n < 0)
2440 n = ch - '0'; 2459 n = ch - '0';
2441 else 2460 else
2442 n = n * 10 + ch - '0'; 2461 n = n * 10 + ch - '0';
2462 }
2443 } else if (ch == ';') { 2463 else if (ch == ';')
2464 {
2444 if (nargs < ESC_ARGS) 2465 if (nargs < ESC_ARGS)
2445 arg[nargs++] = n; 2466 arg[nargs++] = n;
2446 n = -1; 2467 n = -1;
2468 }
2447 } else if (ch == '\b') { 2469 else if (ch == '\b')
2448 rxvt_scr_backspace(aR); 2470 {
2471 scr_backspace ();
2472 }
2449 } else if (ch == C0_ESC) { 2473 else if (ch == C0_ESC)
2450 rxvt_process_escape_seq(aR); 2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch);
2481 }
2482 ch = cmd_getc ();
2483 }
2484
2485 if (ch > CSI_7F)
2451 return; 2486 return;
2452 } else if (ch < ' ') {
2453 rxvt_process_nonprinting(aR_ ch);
2454 }
2455 ch = rxvt_cmd_getc(aR);
2456 }
2457 2487
2458 if (ch > CSI_7F)
2459 return;
2460
2461 if (nargs < ESC_ARGS) 2488 if (nargs < ESC_ARGS)
2462 arg[nargs++] = n; 2489 arg[nargs++] = n;
2463 2490
2464 i = ch - CSI_ICH; 2491 i = ch - CSI_ICH;
2465 ndef = get_byte_array_bit(csi_defaults, i); 2492 ndef = get_byte_array_bit (csi_defaults, i);
2466 for (p = 0; p < nargs; p++) 2493 for (p = 0; p < nargs; p++)
2467 if (arg[p] == -1) 2494 if (arg[p] == -1)
2468 arg[p] = ndef; 2495 arg[p] = ndef;
2469 2496
2470#ifdef DEBUG_CMD 2497#ifdef DEBUG_CMD
2471 fprintf(stderr, "CSI "); 2498 fprintf (stderr, "CSI ");
2472 for (p = 0; p < nargs; p++) 2499 for (p = 0; p < nargs; p++)
2473 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2474 fprintf(stderr, "%c\n", ch); 2501 fprintf (stderr, "%c\n", ch);
2475#endif 2502#endif
2476 2503
2477/* 2504 /*
2478 * private mode handling 2505 * private mode handling
2479 */ 2506 */
2480 if (priv) { 2507 if (priv)
2481 switch (priv) { 2508 {
2482 case '>': 2509 switch (priv)
2510 {
2511 case '>':
2483 if (ch == CSI_DA) /* secondary device attributes */ 2512 if (ch == CSI_DA) /* secondary device attributes */
2484 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2485 break; 2514 break;
2486 case '?': 2515 case '?':
2487 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2488 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2517 process_terminal_mode (ch, priv, nargs, arg);
2489 break; 2518 break;
2490 } 2519 }
2491 return; 2520 return;
2492 } 2521 }
2493 2522
2494 switch (ch) { 2523 switch (ch)
2495/* 2524 {
2525 /*
2496 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2526 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2497 */ 2527 */
2498#ifdef PRINTPIPE 2528#ifdef PRINTPIPE
2499 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2529 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2500 switch (arg[0]) { 2530 switch (arg[0])
2531 {
2501 case 0: /* initiate transfer to primary aux device */ 2532 case 0: /* initiate transfer to primary aux device */
2502 rxvt_scr_printscreen(aR_ 0); 2533 scr_printscreen (0);
2503 break; 2534 break;
2504 case 5: /* start relay to primary aux device */ 2535 case 5: /* start relay to primary aux device */
2505 rxvt_process_print_pipe(aR); 2536 process_print_pipe ();
2537 break;
2538 }
2506 break; 2539 break;
2507 }
2508 break;
2509#endif 2540#endif
2510 2541
2511 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2542 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2512 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2543 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2513 arg[0] = -arg[0]; 2544 arg[0] = -arg[0];
2514 /* FALLTHROUGH */ 2545 /* FALLTHROUGH */
2515 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2546 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2516 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2547 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2517 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2548 scr_gotorc (arg[0], 0, RELATIVE);
2518 break; 2549 break;
2519 2550
2520 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2551 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2521 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2552 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2522#ifdef ISO6429 2553#ifdef ISO6429
2523 arg[0] = -arg[0]; 2554 arg[0] = -arg[0];
2524#else /* emulate common DEC VTs */ 2555#else /* emulate common DEC VTs */
2525 arg[0] = arg[0] ? -arg[0] : -1; 2556 arg[0] = arg[0] ? -arg[0] : -1;
2526#endif 2557#endif
2527 /* FALLTHROUGH */ 2558 /* FALLTHROUGH */
2528 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2559 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2529 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2560 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2530#ifdef ISO6429 2561#ifdef ISO6429
2531 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2562 scr_gotorc (0, arg[0], RELATIVE);
2532#else /* emulate common DEC VTs */ 2563#else /* emulate common DEC VTs */
2533 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2564 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2534#endif 2565#endif
2535 break; 2566 break;
2536 2567
2537 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2568 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2538 arg[0] = -arg[0]; 2569 arg[0] = -arg[0];
2539 /* FALLTHROUGH */ 2570 /* FALLTHROUGH */
2540 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2571 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2541 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2572 scr_gotorc (arg[0], 0, R_RELATIVE);
2542 break; 2573 break;
2543 2574
2544 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2575 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2545 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2576 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2546 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2577 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2547 break; 2578 break;
2548 2579
2549 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2580 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2550 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2581 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2551 break; 2582 break;
2552 2583
2553 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2584 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2554 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2585 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2586 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2556 break; 2587 break;
2557 2588
2558 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2589 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2559 arg[0] = -arg[0]; 2590 arg[0] = -arg[0];
2560 /* FALLTHROUGH */ 2591 /* FALLTHROUGH */
2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2592 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2562 rxvt_scr_tab(aR_ arg[0]); 2593 scr_tab (arg[0]);
2563 break; 2594 break;
2564 2595
2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2596 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2566 R->scr_erase_screen (arg[0]); 2597 scr_erase_screen (arg[0]);
2567 break; 2598 break;
2568 2599
2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2600 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2570 rxvt_scr_erase_line(aR_ arg[0]); 2601 scr_erase_line (arg[0]);
2571 break; 2602 break;
2572 2603
2573 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2604 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2574 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2605 scr_insdel_chars (arg[0], INSERT);
2575 break; 2606 break;
2576 2607
2577 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2608 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2578 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2609 scr_insdel_lines (arg[0], INSERT);
2579 break; 2610 break;
2580 2611
2581 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2612 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2582 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2613 scr_insdel_lines (arg[0], DELETE);
2583 break; 2614 break;
2584 2615
2585 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2616 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2586 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2617 scr_insdel_chars (arg[0], ERASE);
2587 break; 2618 break;
2588 2619
2589 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2620 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2590 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2621 scr_insdel_chars (arg[0], DELETE);
2591 break; 2622 break;
2592 2623
2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2594 arg[0] = -arg[0]; 2625 arg[0] = -arg[0];
2595 /* FALLTHROUGH */ 2626 /* FALLTHROUGH */
2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2598 break; 2629 break;
2599 2630
2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2601 R->tt_write((const unsigned char *)VT100_ANS, 2632 tt_write ((const unsigned char *)VT100_ANS,
2602 (unsigned int)(sizeof(VT100_ANS) - 1)); 2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2603 break; 2634 break;
2604 2635
2605 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2606 rxvt_process_sgr_mode(aR_ nargs, arg); 2637 process_sgr_mode (nargs, arg);
2607 break; 2638 break;
2608 2639
2609 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2640 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2610 switch (arg[0]) { 2641 switch (arg[0])
2642 {
2611 case 5: /* DSR requested */ 2643 case 5: /* DSR requested */
2612 R->tt_printf("\033[0n"); 2644 tt_printf ("\033[0n");
2613 break; 2645 break;
2614 case 6: /* CPR requested */ 2646 case 6: /* CPR requested */
2615 rxvt_scr_report_position(aR); 2647 scr_report_position ();
2616 break; 2648 break;
2617#if defined (ENABLE_DISPLAY_ANSWER) 2649#if defined (ENABLE_DISPLAY_ANSWER)
2618 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2619 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2620 break; 2652 break;
2621#endif 2653#endif
2622 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2623 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break;
2657 }
2624 break; 2658 break;
2625 }
2626 break;
2627 2659
2628 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2629 switch (arg[0]) { 2661 switch (arg[0])
2662 {
2630 case 0: /* char tab stop cleared at active position */ 2663 case 0: /* char tab stop cleared at active position */
2631 rxvt_scr_set_tab(aR_ 0); 2664 scr_set_tab (0);
2632 break; 2665 break;
2633 /* case 1: */ /* line tab stop cleared in active line */ 2666 /* case 1: */ /* line tab stop cleared in active line */
2634 /* case 2: */ /* char tab stops cleared in active line */ 2667 /* case 2: */ /* char tab stops cleared in active line */
2635 case 3: /* all char tab stops are cleared */ 2668 case 3: /* all char tab stops are cleared */
2636 /* case 4: */ /* all line tab stops are cleared */ 2669 /* case 4: */ /* all line tab stops are cleared */
2637 case 5: /* all tab stops are cleared */ 2670 case 5: /* all tab stops are cleared */
2638 rxvt_scr_set_tab(aR_ -1); 2671 scr_set_tab (-1);
2672 break;
2673 }
2639 break; 2674 break;
2640 }
2641 break;
2642 2675
2643 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2676 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2644 switch (arg[0]) { 2677 switch (arg[0])
2678 {
2645 case 0: /* char tab stop set at active position */ 2679 case 0: /* char tab stop set at active position */
2646 rxvt_scr_set_tab(aR_ 1); 2680 scr_set_tab (1);
2647 break; /* = ESC H */ 2681 break; /* = ESC H */
2648 /* case 1: */ /* line tab stop set at active line */ 2682 /* case 1: */ /* line tab stop set at active line */
2649 case 2: /* char tab stop cleared at active position */ 2683 case 2: /* char tab stop cleared at active position */
2650 rxvt_scr_set_tab(aR_ 0); 2684 scr_set_tab (0);
2651 break; /* = ESC [ 0 g */ 2685 break; /* = ESC [ 0 g */
2652 /* case 3: */ /* line tab stop cleared at active line */ 2686 /* case 3: */ /* line tab stop cleared at active line */
2653 /* case 4: */ /* char tab stops cleared at active line */ 2687 /* case 4: */ /* char tab stops cleared at active line */
2654 case 5: /* all char tab stops are cleared */ 2688 case 5: /* all char tab stops are cleared */
2655 rxvt_scr_set_tab(aR_ -1); 2689 scr_set_tab (-1);
2656 break; /* = ESC [ 3 g */ 2690 break; /* = ESC [ 3 g */
2657 /* case 6: */ /* all line tab stops are cleared */ 2691 /* case 6: */ /* all line tab stops are cleared */
2658 } 2692 }
2659 break; 2693 break;
2660 2694
2661 case CSI_RM: /* 8.3.107: RESET MODE */ 2695 case CSI_RM: /* 8.3.107: RESET MODE */
2662 if (arg[0] == 4) 2696 if (arg[0] == 4)
2663 rxvt_scr_insert_mode(aR_ 0); 2697 scr_insert_mode (0);
2664 break; 2698 break;
2665 2699
2666 case CSI_SM: /* 8.3.126: SET MODE */ 2700 case CSI_SM: /* 8.3.126: SET MODE */
2667 if (arg[0] == 4) 2701 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 1); 2702 scr_insert_mode (1);
2669 break; 2703 break;
2670 2704
2671/* 2705 /*
2672 * PRIVATE USE beyond this point. All CSI_7? sequences here 2706 * PRIVATE USE beyond this point. All CSI_7? sequences here
2673 */ 2707 */
2674 case CSI_72: /* DECSTBM: set top and bottom margins */ 2708 case CSI_72: /* DECSTBM: set top and bottom margins */
2675 if (nargs == 1) 2709 if (nargs == 1)
2676 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2710 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2677 else if (nargs == 0 || arg[0] >= arg[1]) 2711 else if (nargs == 0 || arg[0] >= arg[1])
2678 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2712 scr_scroll_region (0, MAX_ROWS - 1);
2679 else 2713 else
2680 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2714 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2681 break; 2715 break;
2682 2716
2683 case CSI_73: 2717 case CSI_73:
2684 rxvt_scr_cursor(aR_ SAVE); 2718 scr_cursor (SAVE);
2685 break; 2719 break;
2686 case CSI_75: 2720 case CSI_75:
2687 rxvt_scr_cursor(aR_ RESTORE); 2721 scr_cursor (RESTORE);
2688 break; 2722 break;
2689 2723
2690#ifndef NO_FRILLS 2724#ifndef NO_FRILLS
2691 case CSI_74: 2725 case CSI_74:
2692 rxvt_process_window_ops(aR_ arg, nargs); 2726 process_window_ops (arg, nargs);
2693 break; 2727 break;
2694#endif 2728#endif
2695 2729
2696 case CSI_78: /* DECREQTPARM */ 2730 case CSI_78: /* DECREQTPARM */
2697 if (arg[0] == 0 || arg[0] == 1) 2731 if (arg[0] == 0 || arg[0] == 1)
2698 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2699 /* FALLTHROUGH */ 2733 /* FALLTHROUGH */
2700 2734
2701 default: 2735 default:
2702 break; 2736 break;
2703 } 2737 }
2704} 2738}
2705/*}}} */ 2739/*}}} */
2706 2740
2707#ifndef NO_FRILLS 2741#ifndef NO_FRILLS
2708/* ARGSUSED */ 2742/* ARGSUSED */
2709/* INTPROTO */
2710void 2743void
2711rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2744rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2712{ 2745{
2713 int x, y; 2746 int x, y;
2714#if 0 2747#if 0
2715 char *s; 2748 char *s;
2716#endif 2749#endif
2717 XWindowAttributes wattr; 2750 XWindowAttributes wattr;
2718 Window wdummy; 2751 Window wdummy;
2719 2752
2720 if (nargs == 0) 2753 if (nargs == 0)
2721 return; 2754 return;
2722 switch (args[0]) { 2755 switch (args[0])
2756 {
2723 /* 2757 /*
2724 * commands 2758 * commands
2725 */ 2759 */
2726 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2727 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2728 break; 2762 break;
2729 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2730 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2731 DefaultScreen(R->Xdisplay)); 2765 DefaultScreen (display->display));
2732 break; 2766 break;
2733 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2734 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2735 break; 2769 break;
2736 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2737 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2738 break; 2772 break;
2739 case 5: /* raise window */ 2773 case 5: /* raise window */
2740 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2741 break; 2775 break;
2742 case 6: /* lower window */ 2776 case 6: /* lower window */
2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2744 break; 2778 break;
2745 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2746 R->scr_touch (true); 2780 scr_touch (true);
2747 break; 2781 break;
2748 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2750 (unsigned int)(args[1] * R->TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2751 break; 2785 break;
2752 default: 2786 default:
2753 if (args[0] >= 24) /* set height (chars) */ 2787 if (args[0] >= 24) /* set height (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2788 set_widthheight ((unsigned int)TermWin.width,
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2789 (unsigned int) (args[1] * TermWin.fheight));
2756 break; 2790 break;
2757 /* 2791 /*
2758 * reports - some output format copied from XTerm 2792 * reports - some output format copied from XTerm
2759 */ 2793 */
2760 case 11: /* report window state */ 2794 case 11: /* report window state */
2761 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2762 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2763 break; 2797 break;
2764 case 13: /* report window position */ 2798 case 13: /* report window position */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2766 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2767 -wattr.border_width, -wattr.border_width, 2801 -wattr.border_width, -wattr.border_width,
2768 &x, &y, &wdummy); 2802 &x, &y, &wdummy);
2769 R->tt_printf("\033[3;%d;%dt", x, y); 2803 tt_printf ("\033[3;%d;%dt", x, y);
2770 break; 2804 break;
2771 case 14: /* report window size (pixels) */ 2805 case 14: /* report window size (pixels) */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2773 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2774 break; 2808 break;
2775 case 18: /* report window size (chars) */ 2809 case 18: /* report window size (chars) */
2776 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2777 break; 2811 break;
2778#if 0 /* XXX: currently disabled due to security concerns */ 2812#if 0 /* XXX: currently disabled due to security concerns */
2779 case 20: /* report icon label */ 2813 case 20: /* report icon label */
2780 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2814 XGetIconName (display->display, TermWin.parent[0], &s);
2781 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2782 break; 2816 break;
2783 case 21: /* report window title */ 2817 case 21: /* report window title */
2784 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2818 XFetchName (display->display, TermWin.parent[0], &s);
2785 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2820 break;
2787#endif 2821#endif
2822
2788 } 2823 }
2789} 2824}
2790#endif 2825#endif
2791 2826
2792/*----------------------------------------------------------------------*/ 2827/*----------------------------------------------------------------------*/
2793/* 2828/*
2794 * get input up until STRING TERMINATOR (or BEL) 2829 * get input up until STRING TERMINATOR (or BEL)
2795 * ends_how is terminator used. returned input must be free()d 2830 * ends_how is terminator used. returned input must be free ()d
2796 */ 2831 */
2797/* INTPROTO */
2798unsigned char * 2832unsigned char *
2799rxvt_get_to_st(pR_ unsigned char *ends_how) 2833rxvt_term::get_to_st (unsigned char *ends_how)
2800{ 2834{
2801 int seen_esc = 0; /* seen escape? */ 2835 int seen_esc = 0; /* seen escape? */
2802 unsigned int n = 0; 2836 unsigned int n = 0;
2803 unsigned char *s; 2837 unsigned char *s;
2804 unsigned char ch, string[STRING_MAX]; 2838 unsigned char ch, string[STRING_MAX];
2805 2839
2806 for (; (ch = rxvt_cmd_getc(aR));) { 2840 for (; (ch = cmd_getc ());)
2841 {
2807 if (ch == C0_BEL 2842 if (ch == C0_BEL
2808 || ch == CHAR_ST 2843 || ch == CHAR_ST
2809 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2810 break; 2845 break;
2811 if (ch == C0_ESC) { 2846 if (ch == C0_ESC)
2847 {
2812 seen_esc = 1; 2848 seen_esc = 1;
2813 continue; 2849 continue;
2850 }
2814 } else if (ch == '\t') 2851 else if (ch == '\t')
2815 ch = ' '; /* translate '\t' to space */ 2852 ch = ' '; /* translate '\t' to space */
2816 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2817 return NULL; /* other control character - exit */ 2854 return NULL; /* other control character - exit */
2818 if (n < sizeof(string) - 1) 2855 if (n < sizeof (string) - 1)
2819 string[n++] = ch; 2856 string[n++] = ch;
2820 seen_esc = 0; 2857 seen_esc = 0;
2821 } 2858 }
2822 string[n++] = '\0'; 2859 string[n++] = '\0';
2823 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2824 return NULL; 2861 return NULL;
2825 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2862 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2826 STRNCPY(s, string, n); 2863 STRNCPY (s, string, n);
2827 return s; 2864 return s;
2828} 2865}
2829 2866
2830/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2831/* 2868/*
2832 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2833 */ 2870 */
2834/* INTPROTO */
2835void 2871void
2836rxvt_process_dcs_seq(pR) 2872rxvt_term::process_dcs_seq ()
2837{ 2873{
2838 unsigned char eh, *s; 2874 unsigned char eh, *s;
2839/* 2875 /*
2840 * Not handled yet 2876 * Not handled yet
2841 */ 2877 */
2842 s = rxvt_get_to_st(aR_ &eh); 2878 s = get_to_st (&eh);
2843 if (s) 2879 if (s)
2844 free(s); 2880 free (s);
2845 return; 2881 return;
2846} 2882}
2847 2883
2848/*----------------------------------------------------------------------*/ 2884/*----------------------------------------------------------------------*/
2849/* 2885/*
2850 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2851 */ 2887 */
2852/* INTPROTO */
2853void 2888void
2854rxvt_process_osc_seq(pR) 2889rxvt_term::process_osc_seq ()
2855{ 2890{
2856 unsigned char ch, eh, *s; 2891 unsigned char ch, eh, *s;
2857 int arg; 2892 int arg;
2858 2893
2859 ch = rxvt_cmd_getc(aR); 2894 ch = cmd_getc ();
2860 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2895 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2861 arg = arg * 10 + (ch - '0'); 2896 arg = arg * 10 + (ch - '0');
2862 2897
2863 if (ch == ';') { 2898 if (ch == ';')
2864 s = rxvt_get_to_st(aR_ &eh); 2899 {
2865 if (s) { 2900 s = get_to_st (&eh);
2866 /* 2901 if (s)
2902 {
2903 /*
2867 * rxvt_menubar_dispatch() violates the constness of the string, 2904 * rxvt_menubar_dispatch () violates the constness of the string,
2868 * so do it here 2905 * so do it here
2869 */ 2906 */
2870 if (arg == XTerm_Menu) 2907 if (arg == XTerm_Menu)
2871#if 0 /* XXX: currently disabled due to security concerns */ 2908#if 0 /* XXX: currently disabled due to security concerns */
2872 rxvt_menubar_dispatch(aR_ (char *)s); 2909 menubar_dispatch ((char *)s);
2873#else 2910#else
2874 0; 2911 (void)0;
2875#endif 2912#endif
2876 else 2913 else
2877 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2914 xterm_seq (arg, (char *)s, eh);
2878 free(s); 2915 free (s);
2879 } 2916 }
2880 } 2917 }
2881} 2918}
2882/* 2919/*
2883 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2884 * 0 = change iconName/title 2921 * 0 = change iconName/title
… …
2897 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
2898 * 20 = bg pixmap 2935 * 20 = bg pixmap
2899 * 39 = change default fg color 2936 * 39 = change default fg color
2900 * 49 = change default bg color 2937 * 49 = change default bg color
2901 * 55 = dump scrollback buffer and all of screen 2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2902 */ 2941 */
2903/* EXTPROTO */
2904void 2942void
2905rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2906{ 2944{
2907 int changed = 0; 2945 int changed = 0;
2908 int color; 2946 int color;
2909 char *buf, *name; 2947 char *buf, *name;
2910 2948
2911 assert(str != NULL); 2949 assert (str != NULL);
2912 switch (op) { 2950 switch (op)
2951 {
2913 case XTerm_name: 2952 case XTerm_name:
2914 rxvt_set_title(aR_ str); 2953 set_title (str);
2915 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
2916 case XTerm_iconName: 2955 case XTerm_iconName:
2917 rxvt_set_iconName(aR_ str); 2956 set_iconName (str);
2918 break; 2957 break;
2919 case XTerm_title: 2958 case XTerm_title:
2920 rxvt_set_title(aR_ str); 2959 set_title (str);
2921 break; 2960 break;
2922 case XTerm_Color: 2961 case XTerm_Color:
2923 for (buf = (char *)str; buf && *buf;) { 2962 for (buf = (char *)str; buf && *buf;)
2963 {
2924 if ((name = STRCHR(buf, ';')) == NULL) 2964 if ((name = STRCHR (buf, ';')) == NULL)
2925 break; 2965 break;
2926 *name++ = '\0'; 2966 *name++ = '\0';
2927 color = atoi(buf); 2967 color = atoi (buf);
2928 if (color < 0 || color >= TOTAL_COLORS) 2968 if (color < 0 || color >= TOTAL_COLORS)
2929 break; 2969 break;
2930 if ((buf = STRCHR(name, ';')) != NULL) 2970 if ((buf = STRCHR (name, ';')) != NULL)
2931 *buf++ = '\0'; 2971 *buf++ = '\0';
2932 rxvt_set_window_color(aR_ color + minCOLOR, name); 2972 set_window_color (color + minCOLOR, name);
2933 } 2973 }
2934 break; 2974 break;
2935#ifndef NO_CURSORCOLOR 2975#ifndef NO_CURSORCOLOR
2936 case XTerm_Color_cursor: 2976 case XTerm_Color_cursor:
2937 rxvt_set_window_color(aR_ Color_cursor, str); 2977 set_window_color (Color_cursor, str);
2938 break; 2978 break;
2939#endif 2979#endif
2940 case XTerm_Color_pointer: 2980 case XTerm_Color_pointer:
2941 rxvt_set_window_color(aR_ Color_pointer, str); 2981 set_window_color (Color_pointer, str);
2942 break; 2982 break;
2943#ifndef NO_BOLD_UNDERLINE_REVERSE 2983#ifndef NO_BOLD_UNDERLINE_REVERSE
2944 case XTerm_Color_BD: 2984 case XTerm_Color_BD:
2945 rxvt_set_window_color(aR_ Color_BD, str); 2985 set_window_color (Color_BD, str);
2946 break; 2986 break;
2947 case XTerm_Color_UL: 2987 case XTerm_Color_UL:
2948 rxvt_set_window_color(aR_ Color_UL, str); 2988 set_window_color (Color_UL, str);
2949 break; 2989 break;
2950 case XTerm_Color_RV: 2990 case XTerm_Color_RV:
2951 rxvt_set_window_color(aR_ Color_RV, str); 2991 set_window_color (Color_RV, str);
2952 break; 2992 break;
2953#endif 2993#endif
2954 2994
2955 case XTerm_Menu: 2995 case XTerm_Menu:
2956 /* 2996 /*
2957 * rxvt_menubar_dispatch() violates the constness of the string, 2997 * rxvt_menubar_dispatch () violates the constness of the string,
2958 * so DON'T do it here 2998 * so DON'T do it here
2959 */ 2999 */
2960 break; 3000 break;
2961 case XTerm_Pixmap: 3001 case XTerm_Pixmap:
2962 if (*str != ';') { 3002 if (*str != ';')
3003 {
2963#if XPM_BACKGROUND 3004#if XPM_BACKGROUND
2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3005 scale_pixmap (""); /* reset to default scaling */
2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3006 set_bgPixmap (str); /* change pixmap */
2966#endif 3007#endif
2967 R->scr_touch (true); 3008 scr_touch (true);
2968 } 3009 }
2969 while ((str = STRCHR(str, ';')) != NULL) { 3010 while ((str = STRCHR (str, ';')) != NULL)
2970 str++; 3011 {
3012 str++;
2971#if XPM_BACKGROUND 3013#if XPM_BACKGROUND
2972 changed += rxvt_scale_pixmap(aR_ str); 3014 changed += scale_pixmap (str);
2973#endif 3015#endif
2974 } 3016
2975 if (changed) { 3017 }
3018 if (changed)
3019 {
2976#ifdef XPM_BACKGROUND 3020#ifdef XPM_BACKGROUND
2977 rxvt_resize_pixmap(aR); 3021 resize_pixmap ();
2978#endif 3022#endif
2979 R->scr_touch (true); 3023 scr_touch (true);
2980 } 3024 }
2981 break; 3025 break;
2982 3026
2983 case XTerm_restoreFG: 3027 case XTerm_restoreFG:
2984 rxvt_set_window_color(aR_ Color_fg, str); 3028 set_window_color (Color_fg, str);
2985 break; 3029 break;
2986 case XTerm_restoreBG: 3030 case XTerm_restoreBG:
2987 rxvt_set_window_color(aR_ Color_bg, str); 3031 set_window_color (Color_bg, str);
2988 break; 3032 break;
2989 case XTerm_logfile: 3033 case XTerm_logfile:
2990 break; 3034 break;
2991 case XTerm_font: 3035 case XTerm_font:
2992 rxvt_change_font(aR_ 0, str); 3036 change_font (str);
2993 break; 3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif
2994#if 0 3057#if 0
2995 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
2996 { 3059 {
2997 int fd; 3060 int fd;
2998 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2999 rxvt_scr_dump(aR_ fd); 3062 {
3000 close(fd); 3063 scr_dump (fd);
3001 } 3064 close (fd);
3002 } 3065 }
3003 break; 3066 }
3067 break;
3004#endif 3068#endif
3069
3005 } 3070 }
3006} 3071}
3007/*----------------------------------------------------------------------*/ 3072/*----------------------------------------------------------------------*/
3008 3073
3009/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3014 * 's' = save 3079 * 's' = save
3015 * 'r' = restore 3080 * 'r' = restore
3016 * 't' = toggle 3081 * 't' = toggle
3017 * so no need for fancy checking 3082 * so no need for fancy checking
3018 */ 3083 */
3019/* INTPROTO */
3020int 3084int
3021rxvt_privcases(pR_ int mode, unsigned long bit) 3085rxvt_term::privcases (int mode, unsigned long bit)
3022{ 3086{
3023 int state; 3087 int state;
3024 3088
3025 if (mode == 's') { 3089 if (mode == 's')
3090 {
3026 R->SavedModes |= (R->PrivateModes & bit); 3091 SavedModes |= (PrivateModes & bit);
3027 return -1; 3092 return -1;
3028 } else { 3093 }
3094 else
3095 {
3029 if (mode == 'r') 3096 if (mode == 'r')
3030 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3031 else 3098 else
3032 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3033 PrivMode(state, bit); 3100 PrivMode (state, bit);
3034 } 3101 }
3035 return state; 3102 return state;
3036} 3103}
3037 3104
3038/* we're not using priv _yet_ */ 3105/* we're not using priv _yet_ */
3039/* INTPROTO */
3040void 3106void
3041rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3042{ 3108{
3043 unsigned int i, j; 3109 unsigned int i, j;
3044 int state; 3110 int state;
3045 static const struct { 3111 static const struct
3112 {
3046 const int argval; 3113 const int argval;
3047 const unsigned long bit; 3114 const unsigned long bit;
3115 }
3048 } argtopriv[] = { 3116 argtopriv[] = {
3049 { 1, PrivMode_aplCUR }, 3117 { 1, PrivMode_aplCUR },
3050 { 2, PrivMode_vt52 }, 3118 { 2, PrivMode_vt52 },
3051 { 3, PrivMode_132 }, 3119 { 3, PrivMode_132 },
3052 { 4, PrivMode_smoothScroll }, 3120 { 4, PrivMode_smoothScroll },
3053 { 5, PrivMode_rVideo }, 3121 { 5, PrivMode_rVideo },
3054 { 6, PrivMode_relOrigin }, 3122 { 6, PrivMode_relOrigin },
3055 { 7, PrivMode_Autowrap }, 3123 { 7, PrivMode_Autowrap },
3056 { 9, PrivMode_MouseX10 }, 3124 { 9, PrivMode_MouseX10 },
3057#ifdef menuBar_esc 3125#ifdef menuBar_esc
3058 { menuBar_esc, PrivMode_menuBar }, 3126 { menuBar_esc, PrivMode_menuBar },
3059#endif 3127#endif
3060#ifdef scrollBar_esc 3128#ifdef scrollBar_esc
3061 { scrollBar_esc, PrivMode_scrollBar }, 3129 { scrollBar_esc, PrivMode_scrollBar },
3062#endif 3130#endif
3131 // 18, 19 printing-related
3063 { 25, PrivMode_VisibleCursor }, 3132 { 25, PrivMode_VisibleCursor },
3064 { 35, PrivMode_ShiftKeys }, 3133 // 30 show scrollbar rxvt. extension
3065 { 40, PrivMode_132OK }, 3134 { 35, PrivMode_ShiftKeys }, // rxvt extension
3066 { 47, PrivMode_Screen }, 3135 { 40, PrivMode_132OK },
3067 { 66, PrivMode_aplKP }, 3136 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI
3138 // 46 start logging
3139 { 47, PrivMode_Screen },
3140 { 66, PrivMode_aplKP },
3068#ifndef NO_BACKSPACE_KEY 3141#ifndef NO_BACKSPACE_KEY
3069 { 67, PrivMode_BackSpace }, 3142 { 67, PrivMode_BackSpace },
3070#endif 3143#endif
3071 { 1000, PrivMode_MouseX11 }, 3144 { 1000, PrivMode_MouseX11 },
3072 { 1010, PrivMode_TtyOutputInh }, 3145 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3073 { 1011, PrivMode_Keypress }, 3146 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3074 { 1047, PrivMode_Screen }, 3147 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3075 }; 3148 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3149 { 1011, PrivMode_Keypress }, // rxvt extension
3150 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 };
3076 3158
3077 if (nargs == 0) 3159 if (nargs == 0)
3078 return; 3160 return;
3079 3161
3080/* make lo/hi boolean */ 3162 /* make lo/hi boolean */
3081 if (mode == 'l') 3163 if (mode == 'l')
3082 mode = 0; /* reset */ 3164 mode = 0; /* reset */
3083 else if (mode == 'h') 3165 else if (mode == 'h')
3084 mode = 1; /* set */ 3166 mode = 1; /* set */
3085 3167
3086 for (i = 0; i < nargs; i++) { 3168 for (i = 0; i < nargs; i++)
3169 {
3087 state = -1; 3170 state = -1;
3088 3171
3089 /* basic handling */ 3172 /* basic handling */
3090 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3173 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3091 if (argtopriv[j].argval == arg[i]) { 3174 if (argtopriv[j].argval == arg[i])
3175 {
3092 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3176 state = privcases (mode, argtopriv[j].bit);
3093 break; 3177 break;
3094 } 3178 }
3095 3179
3096 /* extra handling for values with state unkept */ 3180 /* extra handling for values with state unkept */
3097 if (state == -1)
3098 switch (arg[i]) { 3181 switch (arg[i])
3182 {
3099 case 1048: /* alternative cursor save */ 3183 case 1048: /* alternative cursor save */
3100 if (mode == 0) 3184 case 1049:
3101 rxvt_scr_cursor(aR_ RESTORE); 3185 if (mode == 0)
3102 else if (mode == 1) 3186 scr_cursor (RESTORE);
3103 rxvt_scr_cursor(aR_ SAVE); 3187 else if (mode == 1)
3188 scr_cursor (SAVE);
3104 /* FALLTHROUGH */ 3189 /* FALLTHROUGH */
3105 default: 3190 }
3106 continue; /* for(;i;) */
3107 }
3108 3191
3192 if (state >= 0)
3109 /* extra handling for values with valid 0 or 1 state */ 3193 /* extra handling for values with valid 0 or 1 state */
3110 switch (arg[i]) { 3194 switch (arg[i])
3195 {
3111 /* case 1: - application cursor keys */ 3196 /* case 1: - application cursor keys */
3112 case 2: /* VT52 mode */ 3197 case 2: /* VT52 mode */
3113 /* oddball mode. should be set regardless of set/reset 3198 /* oddball mode. should be set regardless of set/reset
3114 * parameter. Return from VT52 mode with an ESC < from 3199 * parameter. Return from VT52 mode with an ESC < from
3115 * within VT52 mode 3200 * within VT52 mode
3116 */ 3201 */
3117 PrivMode(1, PrivMode_vt52); 3202 PrivMode (1, PrivMode_vt52);
3118 break; 3203 break;
3119 case 3: /* 80/132 */ 3204 case 3: /* 80/132 */
3120 if (R->PrivateModes & PrivMode_132OK) 3205 if (PrivateModes & PrivMode_132OK)
3121 rxvt_set_widthheight(aR_ 3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3122 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3207 break;
3123 (unsigned int)R->TermWin.height);
3124 break;
3125 case 4: /* smooth scrolling */ 3208 case 4: /* smooth scrolling */
3126 if (state) 3209 if (state)
3127 R->Options &= ~Opt_jumpScroll; 3210 Options &= ~Opt_jumpScroll;
3128 else 3211 else
3129 R->Options |= Opt_jumpScroll; 3212 Options |= Opt_jumpScroll;
3130 break; 3213 break;
3131 case 5: /* reverse video */ 3214 case 5: /* reverse video */
3132 rxvt_scr_rvideo_mode(aR_ state); 3215 scr_rvideo_mode (state);
3133 break; 3216 break;
3134 case 6: /* relative/absolute origins */ 3217 case 6: /* relative/absolute origins */
3135 rxvt_scr_relative_origin(aR_ state); 3218 scr_relative_origin (state);
3136 break; 3219 break;
3137 case 7: /* autowrap */ 3220 case 7: /* autowrap */
3138 rxvt_scr_autowrap(aR_ state); 3221 scr_autowrap (state);
3139 break; 3222 break;
3140 /* case 8: - auto repeat, can't do on a per window basis */ 3223 /* case 8: - auto repeat, can't do on a per window basis */
3141 case 9: /* X10 mouse reporting */ 3224 case 9: /* X10 mouse reporting */
3142 if (state) /* orthogonal */ 3225 if (state) /* orthogonal */
3143 R->PrivateModes &= ~(PrivMode_MouseX11); 3226 PrivateModes &= ~ (PrivMode_MouseX11);
3144 break; 3227 break;
3145#ifdef menuBar_esc 3228#ifdef menuBar_esc
3146 case menuBar_esc: 3229 case menuBar_esc:
3147#ifdef MENUBAR 3230#ifdef MENUBAR
3148 rxvt_map_menuBar(aR_ state); 3231 map_menuBar (state);
3149#endif 3232#endif
3150 break; 3233 break;
3151#endif 3234#endif
3152#ifdef scrollBar_esc 3235#ifdef scrollBar_esc
3153 case scrollBar_esc: 3236 case scrollBar_esc:
3154 if (rxvt_scrollbar_mapping(aR_ state)) { 3237 if (scrollbar_mapping (state))
3155 R->resize_all_windows (0, 0, 0); 3238 {
3239 resize_all_windows (0, 0, 0);
3156 R->scr_touch (true); 3240 scr_touch (true);
3157 } 3241 }
3158 break; 3242 break;
3159#endif 3243#endif
3160 case 25: /* visible/invisible cursor */ 3244 case 25: /* visible/invisible cursor */
3161 rxvt_scr_cursor_visible(aR_ state); 3245 scr_cursor_visible (state);
3162 break; 3246 break;
3163 /* case 35: - shift keys */ 3247 /* case 35: - shift keys */
3164 /* case 40: - 80 <--> 132 mode */ 3248 /* case 40: - 80 <--> 132 mode */
3165 case 47: /* secondary screen */ 3249 case 47: /* secondary screen */
3166 rxvt_scr_change_screen(aR_ state); 3250 scr_change_screen (state);
3167 break; 3251 break;
3168 /* case 66: - application key pad */ 3252 /* case 66: - application key pad */
3169 /* case 67: - backspace key */ 3253 /* case 67: - backspace key */
3170 case 1000: /* X11 mouse reporting */ 3254 case 1000: /* X11 mouse reporting */
3171 if (state) /* orthogonal */ 3255 if (state) /* orthogonal */
3172 R->PrivateModes &= ~(PrivMode_MouseX10); 3256 PrivateModes &= ~ (PrivMode_MouseX10);
3173 break; 3257 break;
3174#if 0 3258#if 0
3175 case 1001: 3259 case 1001:
3176 break; /* X11 mouse highlighting */ 3260 break; /* X11 mouse highlighting */
3177#endif 3261#endif
3178 case 1010: /* scroll to bottom on TTY output inhibit */ 3262 case 1010: /* scroll to bottom on TTY output inhibit */
3179 if (state) 3263 if (state)
3180 R->Options &= ~Opt_scrollTtyOutput; 3264 Options &= ~Opt_scrollTtyOutput;
3181 else 3265 else
3182 R->Options |= Opt_scrollTtyOutput; 3266 Options |= Opt_scrollTtyOutput;
3183 break; 3267 break;
3184 case 1011: /* scroll to bottom on key press */ 3268 case 1011: /* scroll to bottom on key press */
3185 if (state) 3269 if (state)
3186 R->Options |= Opt_scrollTtyKeypress; 3270 Options |= Opt_scrollTtyKeypress;
3187 else 3271 else
3188 R->Options &= ~Opt_scrollTtyKeypress; 3272 Options &= ~Opt_scrollTtyKeypress;
3189 break; 3273 break;
3190 case 1047: /* secondary screen w/ clearing */ 3274 case 1047: /* secondary screen w/ clearing */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3191 if (R->current_screen != PRIMARY) 3276 if (current_screen != PRIMARY)
3192 R->scr_erase_screen (2); 3277 scr_erase_screen (2);
3193 rxvt_scr_change_screen(aR_ state); 3278 scr_change_screen (state);
3194 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
3195 default: 3280 default:
3196 break; 3281 break;
3197 } 3282 }
3198 } 3283 }
3199} 3284}
3200/*}}} */ 3285/*}}} */
3201 3286
3202/*{{{ process sgr sequences */ 3287/*{{{ process sgr sequences */
3203/* INTPROTO */
3204void 3288void
3205rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3206{ 3290{
3207 unsigned int i; 3291 unsigned int i;
3208 short rendset; 3292 short rendset;
3209 int rendstyle; 3293 int rendstyle;
3210 3294
3211 if (nargs == 0) { 3295 if (nargs == 0)
3212 rxvt_scr_rendition(aR_ 0, ~RS_None);
3213 return;
3214 } 3296 {
3297 scr_rendition (0, ~RS_None);
3298 return;
3299 }
3215 for (i = 0; i < nargs; i++) { 3300 for (i = 0; i < nargs; i++)
3301 {
3216 rendset = -1; 3302 rendset = -1;
3217 switch (arg[i]) { 3303 switch (arg[i])
3218 case 0: 3304 {
3305 case 0:
3219 rendset = 0, rendstyle = ~RS_None; 3306 rendset = 0, rendstyle = ~RS_None;
3220 break; 3307 break;
3221 case 1: 3308 case 1:
3222 rendset = 1, rendstyle = RS_Bold; 3309 rendset = 1, rendstyle = RS_Bold;
3223 break; 3310 break;
3224 case 4: 3311 case 4:
3225 rendset = 1, rendstyle = RS_Uline; 3312 rendset = 1, rendstyle = RS_Uline;
3226 break; 3313 break;
3227 case 5: 3314 case 5:
3228 rendset = 1, rendstyle = RS_Blink; 3315 rendset = 1, rendstyle = RS_Blink;
3229 break; 3316 break;
3230 case 7: 3317 case 7:
3231 rendset = 1, rendstyle = RS_RVid; 3318 rendset = 1, rendstyle = RS_RVid;
3232 break; 3319 break;
3233 case 22: 3320 case 8:
3321 // invisible. NYI
3322 break;
3323 case 22:
3234 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3235 break; 3325 break;
3236 case 24: 3326 case 24:
3237 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
3238 break; 3328 break;
3239 case 25: 3329 case 25:
3240 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3241 break; 3331 break;
3242 case 27: 3332 case 27:
3243 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3244 break; 3334 break;
3245 } 3335 case 28:
3336 // visible. NYI
3337 break;
3338 }
3339
3246 if (rendset != -1) { 3340 if (rendset != -1)
3247 rxvt_scr_rendition(aR_ rendset, rendstyle); 3341 {
3342 scr_rendition (rendset, rendstyle);
3248 continue; /* for(;i;) */ 3343 continue; /* for (;i;) */
3249 } 3344 }
3250 3345
3251 switch (arg[i]) { 3346 switch (arg[i])
3252 case 30: 3347 {
3348 case 30:
3253 case 31: /* set fg color */ 3349 case 31: /* set fg color */
3254 case 32: 3350 case 32:
3255 case 33: 3351 case 33:
3256 case 34: 3352 case 34:
3257 case 35: 3353 case 35:
3258 case 36: 3354 case 36:
3259 case 37: 3355 case 37:
3260 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3261 Color_fg); 3357 break;
3262 break;
3263#ifdef TTY_256COLOR 3358#ifdef TTY_256COLOR
3264 case 38: 3359 case 38:
3265 if (nargs > i + 2 && arg[i + 1] == 5) { 3360 if (nargs > i + 2 && arg[i + 1] == 5)
3266 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3361 {
3267 Color_fg); 3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3268 i += 2; 3363 i += 2;
3269 } 3364 }
3270 break; 3365 break;
3271#endif 3366#endif
3272 case 39: /* default fg */ 3367 case 39: /* default fg */
3273 rxvt_scr_color(aR_ Color_fg, Color_fg); 3368 scr_color (Color_fg, Color_fg);
3274 break; 3369 break;
3275 3370
3276 case 40: 3371 case 40:
3277 case 41: /* set bg color */ 3372 case 41: /* set bg color */
3278 case 42: 3373 case 42:
3279 case 43: 3374 case 43:
3280 case 44: 3375 case 44:
3281 case 45: 3376 case 45:
3282 case 46: 3377 case 46:
3283 case 47: 3378 case 47:
3284 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3285 Color_bg); 3380 break;
3286 break;
3287#ifdef TTY_256COLOR 3381#ifdef TTY_256COLOR
3288 case 48: 3382 case 48:
3289 if (nargs > i + 2 && arg[i + 1] == 5) { 3383 if (nargs > i + 2 && arg[i + 1] == 5)
3290 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3384 {
3291 Color_bg); 3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3292 i += 2; 3386 i += 2;
3293 } 3387 }
3294 break; 3388 break;
3295#endif 3389#endif
3296 case 49: /* default bg */ 3390 case 49: /* default bg */
3297 rxvt_scr_color(aR_ Color_bg, Color_bg); 3391 scr_color (Color_bg, Color_bg);
3298 break; 3392 break;
3299 3393
3300#ifndef NO_BRIGHTCOLOR 3394#ifndef NO_BRIGHTCOLOR
3301 case 90: 3395 case 90:
3302 case 91: /* set bright fg color */ 3396 case 91: /* set bright fg color */
3303 case 92: 3397 case 92:
3304 case 93: 3398 case 93:
3305 case 94: 3399 case 94:
3306 case 95: 3400 case 95:
3307 case 96: 3401 case 96:
3308 case 97: 3402 case 97:
3309 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3310 Color_fg); 3404 Color_fg);
3311 break; 3405 break;
3312 case 100: 3406 case 100:
3313 case 101: /* set bright bg color */ 3407 case 101: /* set bright bg color */
3314 case 102: 3408 case 102:
3315 case 103: 3409 case 103:
3316 case 104: 3410 case 104:
3317 case 105: 3411 case 105:
3318 case 106: 3412 case 106:
3319 case 107: 3413 case 107:
3320 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3321 Color_bg); 3415 Color_bg);
3322 break; 3416 break;
3323#endif 3417#endif
3324 } 3418
3419 }
3325 } 3420 }
3326} 3421}
3327/*}}} */ 3422/*}}} */
3328 3423
3329/*{{{ process Rob Nation's own graphics mode sequences */ 3424/*{{{ process Rob Nation's own graphics mode sequences */
3330/* INTPROTO */
3331void 3425void
3332rxvt_process_graphics(pR) 3426rxvt_term::process_graphics ()
3333{ 3427{
3334 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3428 unsigned char ch, cmd = cmd_getc ();
3335 3429
3336#ifndef RXVT_GRAPHICS 3430 if (cmd == 'Q')
3337 if (cmd == 'Q') { /* query graphics */ 3431 { /* query graphics */
3338 R->tt_printf("\033G0\n"); /* no graphics */ 3432 tt_printf ("\033G0\n"); /* no graphics */
3339 return; 3433 return;
3340 } 3434 }
3341/* swallow other graphics sequences until terminating ':' */ 3435 /* swallow other graphics sequences until terminating ':' */
3342 do 3436 do
3343 ch = rxvt_cmd_getc(aR); 3437 ch = cmd_getc ();
3344 while (ch != ':'); 3438 while (ch != ':');
3345#else
3346 unsigned int nargs;
3347 int args[NGRX_PTS];
3348 unsigned char *text = NULL;
3349
3350 if (cmd == 'Q') { /* query graphics */
3351 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3352 return;
3353 }
3354 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3355 int neg;
3356
3357 ch = rxvt_cmd_getc(aR);
3358 neg = (ch == '-');
3359 if (neg || ch == '+')
3360 ch = rxvt_cmd_getc(aR);
3361
3362 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3363 args[nargs] = args[nargs] * 10 + (ch - '0');
3364 if (neg)
3365 args[nargs] = -args[nargs];
3366
3367 nargs++;
3368 args[nargs] = 0;
3369 if (ch != ';')
3370 break;
3371 }
3372
3373 if ((cmd == 'T') && (nargs >= 5)) {
3374 int i, len = args[4];
3375
3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3377
3378 if (text != NULL) {
3379 for (i = 0; i < len; i++)
3380 text[i] = rxvt_cmd_getc(aR);
3381 text[len] = '\0';
3382 }
3383 }
3384 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3385#endif
3386} 3439}
3387/*}}} */ 3440/*}}} */
3388 3441
3389/* ------------------------------------------------------------------------- */ 3442/* ------------------------------------------------------------------------- */
3390 3443
3391/* 3444/*
3392 * Send printf() formatted output to the command. 3445 * Send printf () formatted output to the command.
3393 * Only use for small amounts of data. 3446 * Only use for small amounts of data.
3394 */ 3447 */
3395void 3448void
3396rxvt_term::tt_printf (const char *fmt,...) 3449rxvt_term::tt_printf (const char *fmt,...)
3397{ 3450{
… …
3415 3468
3416 if (len) 3469 if (len)
3417 { 3470 {
3418 if (v_buflen == 0) 3471 if (v_buflen == 0)
3419 { 3472 {
3420 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3421 if (written == len) 3475 if ((unsigned int)written == len)
3422 return; 3476 return;
3423 3477
3424 data += written; 3478 data += written;
3425 len -= written; 3479 len -= written;
3426 } 3480 }

Diff Legend

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