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.12 by pcg, Fri Dec 5 04:05:13 2003 UTC vs.
Revision 1.59 by pcg, Wed Feb 25 15:39:48 2004 UTC

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

Diff Legend

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