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

Diff Legend

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