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.33 by pcg, Fri Jan 30 18:12:17 2004 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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