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.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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