ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.6 2003/11/25 17:11:33 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb), fixme
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb) 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
71{ 103{
72 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
73} 105}
74 106
75rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
76{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
77 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
142}
143
144void
145rxvt_term::destroy ()
146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
164 check_ev.stop ();
165 pty_ev.stop ();
166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
170 text_blink_ev.stop ();
171#endif
172#ifdef POINTER_BLANK
173 pointer_ev.stop ();
174#endif
175
176 destroy_ev.start (0);
177}
178
179void
180rxvt_term::destroy_cb (time_watcher &w)
181{
182 SET_R (this);
183
184 delete this;
78} 185}
79 186
80/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
81/* rxvt_init() */ 188/* rxvt_init () */
82/* LIBPROTO */ 189/* LIBPROTO */
83rxvt_t 190rxvt_t
84rxvt_init(int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
85{ 192{
86 SET_R(new rxvt_term); 193 SET_R (new rxvt_term);
87 dR;
88 194
89 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
90 { 196 {
91 delete R; 197 delete GET_R;
92 return NULL; 198 SET_R (0);
93 } 199 }
94 200
95 return R; 201 return GET_R;
202}
203
204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
206void
207rxvt_init_signals ()
208{
209 /* install exit handler for cleanup */
210#if 0
211#ifdef HAVE_ATEXIT
212 atexit (rxvt_clean_exit);
213#else
214#endif
215#endif
216
217 struct sigaction sa;
218
219 sigfillset (&sa.sa_mask);
220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
227
228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
229 /* signal (SIGURG, SIG_DFL); */
230
231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
96} 233}
97 234
98bool 235bool
99rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
100{ 237{
101 dR;//TODO (scrollbar, setidle)
102
103 /* 238 /*
104 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
105 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
106 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
107 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
108 * 2. chown tty on some systems 243 * 2. chown tty on some systems
109 */ 244 */
110 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
111 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
112 247
113 rxvt_init_secondary (this); 248 init_secondary ();
114 249
115 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
116 253
117#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
118 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
119#endif 256#endif
120#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
121 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
122 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
123#endif 260#endif
124 261
125 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
126 263
127 rxvt_init_xlocale (this); 264 init_xlocale ();
128 265
129 rxvt_scr_reset (this); /* initialize screen */ 266 scr_reset (); /* initialize screen */
130#ifdef RXVT_GRAPHICS 267#ifdef RXVT_GRAPHICS
131 rxvt_Gr_reset (this); /* reset graphics */ 268 Gr_reset (); /* reset graphics */
132#endif 269#endif
133 270
134#if 0 271#if 0
135#ifdef DEBUG_X
136 XSynchronize(Xdisplay, True); 272 XSynchronize (display->display, True);
137 XSetErrorHandler((XErrorHandler) abort);
138#else
139 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
140#endif
141#endif 273#endif
142 274
143#ifdef HAVE_SCROLLBARS 275#ifdef HAVE_SCROLLBARS
144 if (Options & Opt_scrollBar) 276 if (Options & Opt_scrollBar)
145 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 277 resize_scrollbar (); /* create and map scrollbar */
146#endif 278#endif
147#if (MENUBAR_MAX) 279#if (MENUBAR_MAX)
148 if (menubar_visible(r)) 280 if (menubar_visible (r))
149 XMapWindow (Xdisplay, menuBar.win); 281 XMapWindow (display->display, menuBar.win);
150#endif 282#endif
151#ifdef TRANSPARENT 283#ifdef TRANSPARENT
152 if (Options & Opt_transparent) 284 if (Options & Opt_transparent)
153 { 285 {
154 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 286 XSelectInput (display->display, display->root, PropertyChangeMask);
155 rxvt_check_our_parents (this); 287 check_our_parents ();
156 } 288 }
157#endif 289#endif
290
291 rootwin_ev.start (display, display->root);
292
158 XMapWindow (Xdisplay, TermWin.vt); 293 XMapWindow (display->display, TermWin.vt);
159 XMapWindow (Xdisplay, TermWin.parent[0]); 294 XMapWindow (display->display, TermWin.parent[0]);
160 295
161 rxvt_init_env (this);
162 rxvt_init_command (this, cmd_argv); 296 init_command (cmd_argv);
163 297
164 x_ev.start (Xfd, EVENT_READ);
165 pty_ev.start (cmd_fd, EVENT_READ); 298 pty_ev.start (cmd_fd, EVENT_READ);
299
300 check_ev.start ();
166 301
167 return true; 302 return true;
168} 303}
169 304
170/* ------------------------------------------------------------------------- * 305/* ------------------------------------------------------------------------- *
174 * Catch a SIGCHLD signal and exit if the direct child has died 309 * Catch a SIGCHLD signal and exit if the direct child has died
175 */ 310 */
176/* ARGSUSED */ 311/* ARGSUSED */
177/* EXTPROTO */ 312/* EXTPROTO */
178RETSIGTYPE 313RETSIGTYPE
179rxvt_Child_signal(int sig __attribute__ ((unused))) 314rxvt_Child_signal (int sig __attribute__ ((unused)))
180{ 315{
181 dR;
182 int pid, save_errno = errno; 316 int pid, save_errno = errno;
183
184 do {
185 errno = 0;
186 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 317 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
187 318 ;
188 if (pid == R->cmd_pid)
189 exit(EXIT_SUCCESS);
190
191 errno = save_errno; 319 errno = save_errno;
192 signal(SIGCHLD, rxvt_Child_signal); 320
321#if 0
322 if (pid == cmd_pid)
323 exit (EXIT_SUCCESS);
324#endif
193} 325}
194 326
195/* 327/*
196 * Catch a fatal signal and tidy up before quitting 328 * Catch a fatal signal and tidy up before quitting
197 */ 329 */
198/* EXTPROTO */ 330/* EXTPROTO */
199RETSIGTYPE 331RETSIGTYPE
200rxvt_Exit_signal(int sig) 332rxvt_Exit_signal (int sig)
201{ 333{
202 signal(sig, SIG_DFL); 334 signal (sig, SIG_DFL);
203#ifdef DEBUG_CMD 335#ifdef DEBUG_CMD
204 rxvt_print_error("signal %d", sig); 336 rxvt_print_error ("signal %d", sig);
205#endif 337#endif
206 rxvt_clean_exit(); 338 rxvt_clean_exit ();
207 kill(getpid(), sig); 339 kill (getpid (), sig);
208} 340}
209 341
210/* ARGSUSED */
211/* INTPROTO */ 342/* INTPROTO */
212int 343int
213rxvt_xerror_handler(const Display * display 344rxvt_xerror_handler (Display *display, XErrorEvent *event)
214 __attribute__ ((unused)), const XErrorEvent * event)
215{ 345{
216 dR;
217
218 if (R->allowedxerror == -1) { 346 if (GET_R->allowedxerror == -1)
219 R->allowedxerror = event->error_code; 347 GET_R->allowedxerror = event->error_code;
220 return 0; /* ignored anyway */ 348 else
221 } 349 {
222 rxvt_print_error("XError: Request: %d . %d, Error: %d", 350 old_xerror_handler (display, event);
223 event->request_code, event->minor_code, 351 GET_R->destroy ();
224 event->error_code); 352 }
225/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 353
226 exit(EXIT_FAILURE); 354 return 0;
227/* NOTREACHED */
228} 355}
229 356
230/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
231/* 358/*
232 * Exit gracefully, clearing the utmp entry and restoring tty attributes 359 * Exit gracefully, clearing the utmp entry and restoring tty attributes
233 * TODO: if debugging, this should free up any known resources if we can 360 * TODO: if debugging, this should free up any known resources if we can
234 */ 361 */
235/* EXTPROTO */ 362/* EXTPROTO */
236void 363void
237rxvt_clean_exit(void) 364rxvt_clean_exit ()
238{ 365{
239 dR; 366 // TODO: rxvtd should clean up all ressources
240 367 if (GET_R)
241#ifdef DEBUG_SCREEN 368 GET_R->destroy ();
242 rxvt_scr_release(aR);
243#endif
244#ifndef NO_SETOWNER_TTYDEV
245 rxvt_privileged_ttydev(aR_ RESTORE);
246#endif
247#ifdef UTMP_SUPPORT
248 rxvt_privileged_utmp(aR_ RESTORE);
249#endif
250#ifdef USE_XIM
251 if (R->Input_Context != NULL) {
252 XDestroyIC(R->Input_Context);
253 R->Input_Context = NULL;
254 }
255#endif
256} 369}
257 370
258/* ------------------------------------------------------------------------- * 371/* ------------------------------------------------------------------------- *
259 * MEMORY ALLOCATION WRAPPERS * 372 * MEMORY ALLOCATION WRAPPERS *
260 * ------------------------------------------------------------------------- */ 373 * ------------------------------------------------------------------------- */
261/* EXTPROTO */ 374/* EXTPROTO */
262void * 375void *
263rxvt_malloc(size_t size) 376rxvt_malloc (size_t size)
264{ 377{
265 void *p; 378 void *p;
266 379
267 p = malloc(size); 380 p = malloc (size);
268 if (p) 381 if (p)
269 return p; 382 return p;
270 383
271 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 384 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
272 rxvt_clean_exit(); 385 rxvt_clean_exit ();
273 exit(EXIT_FAILURE); 386 exit (EXIT_FAILURE);
274/* NOTREACHED */ 387 /* NOTREACHED */
275} 388}
276 389
277/* EXTPROTO */ 390/* EXTPROTO */
278void * 391void *
279rxvt_calloc(size_t number, size_t size) 392rxvt_calloc (size_t number, size_t size)
280{ 393{
281 void *p; 394 void *p;
282 395
283 p = calloc(number, size); 396 p = calloc (number, size);
284 if (p) 397 if (p)
285 return p; 398 return p;
286 399
287 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 400 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
288 rxvt_clean_exit(); 401 rxvt_clean_exit ();
289 exit(EXIT_FAILURE); 402 exit (EXIT_FAILURE);
290/* NOTREACHED */ 403 /* NOTREACHED */
291} 404}
292 405
293/* EXTPROTO */ 406/* EXTPROTO */
294void * 407void *
295rxvt_realloc(void *ptr, size_t size) 408rxvt_realloc (void *ptr, size_t size)
296{ 409{
297 void *p; 410 void *p;
298 411
299 if (ptr) 412 if (ptr)
300 p = realloc(ptr, size); 413 p = realloc (ptr, size);
301 else 414 else
302 p = malloc(size); 415 p = malloc (size);
303 if (p) 416 if (p)
304 return p; 417 return p;
305 418
306 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 419 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
307 rxvt_clean_exit(); 420 rxvt_clean_exit ();
308 exit(EXIT_FAILURE); 421 exit (EXIT_FAILURE);
309/* NOTREACHED */ 422 /* NOTREACHED */
310} 423}
311 424
312/* ------------------------------------------------------------------------- * 425/* ------------------------------------------------------------------------- *
313 * PRIVILEGED OPERATIONS * 426 * PRIVILEGED OPERATIONS *
314 * ------------------------------------------------------------------------- */ 427 * ------------------------------------------------------------------------- */
315/* take care of suid/sgid super-user (root) privileges */ 428/* take care of suid/sgid super-user (root) privileges */
316/* INTPROTO */
317void 429void
318rxvt_privileges(pR_ int mode) 430rxvt_term::privileges (int mode)
319{ 431{
320#if ! defined(__CYGWIN32__) 432#if ! defined(__CYGWIN32__)
321# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 433# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
322/* setreuid() is the poor man's setuid(), seteuid() */ 434 /* setreuid () is the poor man's setuid (), seteuid () */
323# define seteuid(a) setreuid(-1, (a)) 435# define seteuid(a) setreuid(-1, (a))
324# define setegid(a) setregid(-1, (a)) 436# define setegid(a) setregid(-1, (a))
325# define HAVE_SETEUID 437# define HAVE_SETEUID
326# endif 438# endif
327# ifdef HAVE_SETEUID 439# ifdef HAVE_SETEUID
328 switch (mode) { 440 switch (mode)
441 {
329 case IGNORE: 442 case IGNORE:
330 /* 443 /*
331 * change effective uid/gid - not real uid/gid - so we can switch 444 * change effective uid/gid - not real uid/gid - so we can switch
332 * back to root later, as required 445 * back to root later, as required
333 */ 446 */
334 seteuid(getuid()); 447 seteuid (getuid ());
335 setegid(getgid()); 448 setegid (getgid ());
336 break; 449 break;
337 case SAVE: 450 case SAVE:
338 R->euid = geteuid(); 451 euid = geteuid ();
339 R->egid = getegid(); 452 egid = getegid ();
340 break; 453 break;
341 case RESTORE: 454 case RESTORE:
342 seteuid(R->euid); 455 seteuid (euid);
343 setegid(R->egid); 456 setegid (egid);
344 break; 457 break;
345 } 458 }
346# else 459# else
347 switch (mode) { 460 switch (mode)
461 {
348 case IGNORE: 462 case IGNORE:
349 setuid(getuid()); 463 setuid (getuid ());
350 setgid(getgid()); 464 setgid (getgid ());
351 /* FALLTHROUGH */ 465 /* FALLTHROUGH */
352 case SAVE: 466 case SAVE:
353 /* FALLTHROUGH */ 467 /* FALLTHROUGH */
354 case RESTORE: 468 case RESTORE:
355 break; 469 break;
356 } 470 }
357# endif 471# endif
358#endif 472#endif
359} 473}
360 474
361#ifdef UTMP_SUPPORT 475#ifdef UTMP_SUPPORT
362/* EXTPROTO */
363void 476void
364rxvt_privileged_utmp(pR_ char action) 477rxvt_term::privileged_utmp (char action)
365{ 478{
366 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 479 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
367 action, R->next_utmp_action, getpid())); 480 action, next_utmp_action, getpid ()));
368 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 481 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
369 || (R->Options & Opt_utmpInhibit) 482 || (Options & Opt_utmpInhibit)
370 || R->ttydev == NULL || *R->ttydev == '\0') 483 || ttydev == NULL || *ttydev == '\0')
371 return; 484 return;
372 485
373 rxvt_privileges(aR_ RESTORE); 486 privileges (RESTORE);
374 if (action == SAVE) { 487 if (action == SAVE)
488 {
375 R->next_utmp_action = RESTORE; 489 next_utmp_action = RESTORE;
376 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 490 makeutent (ttydev, rs[Rs_display_name]);
491 }
492 else
377 } else { /* action == RESTORE */ 493 { /* action == RESTORE */
378 R->next_utmp_action = IGNORE; 494 next_utmp_action = IGNORE;
379 rxvt_cleanutent(aR); 495 cleanutent ();
380 } 496 }
381 rxvt_privileges(aR_ IGNORE); 497 privileges (IGNORE);
382} 498}
383#endif 499#endif
384 500
385#ifndef NO_SETOWNER_TTYDEV 501#ifndef NO_SETOWNER_TTYDEV
386/* EXTPROTO */
387void 502void
388rxvt_privileged_ttydev(pR_ char action) 503rxvt_term::privileged_ttydev (char action)
389{ 504{
390 D_MAIN((stderr, 505 D_MAIN ((stderr,
391 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 506 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
392 action, R->next_tty_action, getpid())); 507 action, next_tty_action, getpid ()));
393 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 508 if (next_tty_action != action || (action != SAVE && action != RESTORE)
394 || R->ttydev == NULL || *R->ttydev == '\0') 509 || ttydev == NULL || *ttydev == '\0')
395 return; 510 return;
396 511
397 rxvt_privileges(aR_ RESTORE); 512 privileges (RESTORE);
398 513
399 if (action == SAVE) { 514 if (action == SAVE)
515 {
400 R->next_tty_action = RESTORE; 516 next_tty_action = RESTORE;
401# ifndef RESET_TTY_TO_COMMON_DEFAULTS 517# ifndef RESET_TTY_TO_COMMON_DEFAULTS
402/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 518 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
403 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 519 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
404 R->next_tty_action = IGNORE; 520 next_tty_action = IGNORE;
405 else 521 else
406# endif 522# endif
523
407 { 524 {
408 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 525 chown (ttydev, getuid (), ttygid); /* fail silently */
409 chmod(R->ttydev, R->ttymode); 526 chmod (ttydev, ttymode);
410# ifdef HAVE_REVOKE 527# ifdef HAVE_REVOKE
411 revoke(R->ttydev); 528 revoke (ttydev);
412# endif 529# endif
530
413 } 531 }
532 }
533 else
414 } else { /* action == RESTORE */ 534 { /* action == RESTORE */
415 R->next_tty_action = IGNORE; 535 next_tty_action = IGNORE;
416# ifndef RESET_TTY_TO_COMMON_DEFAULTS 536# ifndef RESET_TTY_TO_COMMON_DEFAULTS
417 chmod(R->ttydev, R->ttyfd_stat.st_mode); 537 chmod (ttydev, ttyfd_stat.st_mode);
418 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 538 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
419# else 539# else
420 chmod(R->ttydev, 540 chmod (ttydev,
421 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 541 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
422 chown(R->ttydev, 0, 0); 542 chown (ttydev, 0, 0);
423# endif 543# endif
424 }
425 544
545 }
546
426 rxvt_privileges(aR_ IGNORE); 547 privileges (IGNORE);
427 548
428# ifndef RESET_TTY_TO_COMMON_DEFAULTS 549# ifndef RESET_TTY_TO_COMMON_DEFAULTS
429 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 550 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
430 action == RESTORE ? "Restoring" : (action == 551 action == RESTORE ? "Restoring" : (action ==
431 SAVE ? "Saving" : 552 SAVE ? "Saving" :
432 "UNKNOWN ERROR for"), R->ttydev, 553 "UNKNOWN ERROR for"), ttydev,
433 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 554 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
434 R->ttyfd_stat.st_gid)); 555 ttyfd_stat.st_gid));
435# endif 556# endif
436} 557}
437#endif 558#endif
438 559
439/*----------------------------------------------------------------------*/ 560/*----------------------------------------------------------------------*/
440/* 561/*
441 * window size/position calculcations for XSizeHint and other storage. 562 * window size/position calculcations for XSizeHint and other storage.
442 * if width/height are non-zero then override calculated width/height 563 * if width/height are non-zero then override calculated width/height
443 */ 564 */
444/* EXTPROTO */
445void 565void
446rxvt_window_calc(pR_ unsigned int width, unsigned int height) 566rxvt_term::window_calc (unsigned int width, unsigned int height)
447{ 567{
448 short recalc_x, recalc_y; 568 short recalc_x, recalc_y;
449 int x, y, sb_w, mb_h, flags; 569 int x, y, sb_w, mb_h, flags;
450 unsigned int w, h; 570 unsigned int w, h;
451 unsigned int max_width, max_height; 571 unsigned int max_width, max_height;
452 572
453 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 573 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
454 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 574 TermWin.ncol, TermWin.nrow, szHint.width,
455 R->szHint.height)); 575 szHint.height));
456 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 576 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
457 R->szHint.win_gravity = NorthWestGravity; 577 szHint.win_gravity = NorthWestGravity;
458/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 578 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
459 579
460 recalc_x = recalc_y = 0; 580 recalc_x = recalc_y = 0;
461 flags = 0; 581 flags = 0;
462 if (!R->parsed_geometry) { 582 if (!parsed_geometry)
583 {
463 R->parsed_geometry = 1; 584 parsed_geometry = 1;
464 if (R->rs[Rs_geometry]) 585 if (rs[Rs_geometry])
465 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 586 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
466 if (flags & WidthValue) { 587 if (flags & WidthValue)
588 {
467 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 589 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
468 R->szHint.flags |= USSize; 590 szHint.flags |= USSize;
469 } 591 }
470 if (flags & HeightValue) { 592 if (flags & HeightValue)
593 {
471 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 594 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
472 R->szHint.flags |= USSize; 595 szHint.flags |= USSize;
473 } 596 }
474 if (flags & XValue) { 597 if (flags & XValue)
598 {
475 R->szHint.x = x; 599 szHint.x = x;
476 R->szHint.flags |= USPosition; 600 szHint.flags |= USPosition;
477 if (flags & XNegative) { 601 if (flags & XNegative)
602 {
478 recalc_x = 1; 603 recalc_x = 1;
479 R->szHint.win_gravity = NorthEastGravity; 604 szHint.win_gravity = NorthEastGravity;
480 } 605 }
481 } 606 }
482 if (flags & YValue) { 607 if (flags & YValue)
608 {
483 R->szHint.y = y; 609 szHint.y = y;
484 R->szHint.flags |= USPosition; 610 szHint.flags |= USPosition;
485 if (flags & YNegative) { 611 if (flags & YNegative)
612 {
486 recalc_y = 1; 613 recalc_y = 1;
487 if (R->szHint.win_gravity == NorthEastGravity) 614 if (szHint.win_gravity == NorthEastGravity)
488 R->szHint.win_gravity = SouthEastGravity; 615 szHint.win_gravity = SouthEastGravity;
489 else 616 else
490 R->szHint.win_gravity = SouthWestGravity; 617 szHint.win_gravity = SouthWestGravity;
491 } 618 }
492 } 619 }
493 } 620 }
494/* TODO: BOUNDS */ 621 /* TODO: BOUNDS */
495 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 622 TermWin.width = TermWin.ncol * TermWin.fwidth;
496 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 623 TermWin.height = TermWin.nrow * TermWin.fheight;
497 max_width = MAX_COLS * R->TermWin.fwidth; 624 max_width = MAX_COLS * TermWin.fwidth;
498 max_height = MAX_ROWS * R->TermWin.fheight; 625 max_height = MAX_ROWS * TermWin.fheight;
499 626
500 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 627 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
501 628
502 sb_w = mb_h = 0; 629 sb_w = mb_h = 0;
503 R->window_vt_x = R->window_vt_y = 0; 630 window_vt_x = window_vt_y = 0;
504 if (scrollbar_visible(R)) { 631 if (scrollbar_visible ())
632 {
505 sb_w = scrollbar_TotalWidth(); 633 sb_w = scrollbar_TotalWidth ();
506 R->szHint.base_width += sb_w; 634 szHint.base_width += sb_w;
507 if (!(R->Options & Opt_scrollBar_right)) 635 if (! (Options & Opt_scrollBar_right))
508 R->window_vt_x = sb_w; 636 window_vt_x = sb_w;
509 } 637 }
510 if (menubar_visible(R)) { 638 if (menubar_visible ())
639 {
511 mb_h = menuBar_TotalHeight(); 640 mb_h = menuBar_TotalHeight ();
512 R->szHint.base_height += mb_h; 641 szHint.base_height += mb_h;
513 R->window_vt_y = mb_h; 642 window_vt_y = mb_h;
514 } 643 }
515 R->szHint.width_inc = R->TermWin.fwidth; 644 szHint.width_inc = TermWin.fwidth;
516 R->szHint.height_inc = R->TermWin.fheight; 645 szHint.height_inc = TermWin.fheight;
517 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 646 szHint.min_width = szHint.base_width + szHint.width_inc;
518 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 647 szHint.min_height = szHint.base_height + szHint.height_inc;
519 648
520 if (width && width - R->szHint.base_width < max_width) { 649 if (width && width - szHint.base_width < max_width)
650 {
521 R->szHint.width = width; 651 szHint.width = width;
522 R->TermWin.width = width - R->szHint.base_width; 652 TermWin.width = width - szHint.base_width;
523 } else { 653 }
654 else
655 {
524 MIN_IT(R->TermWin.width, max_width); 656 MIN_IT (TermWin.width, max_width);
525 R->szHint.width = R->szHint.base_width + R->TermWin.width; 657 szHint.width = szHint.base_width + TermWin.width;
526 } 658 }
527 if (height && height - R->szHint.base_height < max_height) { 659 if (height && height - szHint.base_height < max_height)
660 {
528 R->szHint.height = height; 661 szHint.height = height;
529 R->TermWin.height = height - R->szHint.base_height; 662 TermWin.height = height - szHint.base_height;
530 } else { 663 }
664 else
665 {
531 MIN_IT(R->TermWin.height, max_height); 666 MIN_IT (TermWin.height, max_height);
532 R->szHint.height = R->szHint.base_height + R->TermWin.height; 667 szHint.height = szHint.base_height + TermWin.height;
533 } 668 }
534 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 669 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
535 R->window_sb_x = R->szHint.width - sb_w; 670 window_sb_x = szHint.width - sb_w;
536 671
537 if (recalc_x) 672 if (recalc_x)
538 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 673 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
539 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 674 - szHint.width - 2 * TermWin.ext_bwidth);
540 if (recalc_y) 675 if (recalc_y)
541 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 676 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
542 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 677 - szHint.height - 2 * TermWin.ext_bwidth);
543 678
544 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 679 TermWin.ncol = TermWin.width / TermWin.fwidth;
545 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 680 TermWin.nrow = TermWin.height / TermWin.fheight;
546 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 681 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
547 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 682 TermWin.ncol, TermWin.nrow, szHint.width,
548 R->szHint.height)); 683 szHint.height));
549 return; 684 return;
550} 685}
551 686
552/*----------------------------------------------------------------------*/ 687/*----------------------------------------------------------------------*/
553/* 688/*
554 * Tell the teletype handler what size the window is. 689 * Tell the teletype handler what size the window is.
555 * Called after a window size change. 690 * Called after a window size change.
556 */ 691 */
557/* EXTPROTO */
558void 692void
559rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 693rxvt_term::tt_winch ()
560{ 694{
561 struct winsize ws; 695 struct winsize ws;
562 696
563 if (fd < 0) 697 if (cmd_fd < 0)
564 return; 698 return;
699
565 ws.ws_col = col; 700 ws.ws_col = TermWin.ncol;
566 ws.ws_row = row; 701 ws.ws_row = TermWin.nrow;
567 ws.ws_xpixel = ws.ws_ypixel = 0; 702 ws.ws_xpixel = ws.ws_ypixel = 0;
568#ifndef DEBUG_SIZE 703#ifndef DEBUG_SIZE
569 (void)ioctl(fd, TIOCSWINSZ, &ws); 704 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
570#else 705#else
571 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 706 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
572 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 707 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
573 }
574# ifdef SIGWINCH 708# ifdef SIGWINCH
575 else if (pid) /* force through to the command */ 709 else if (cmd_pid) /* force through to the command */
576 kill(pid, SIGWINCH); 710 kill (cmd_pid, SIGWINCH);
577# endif 711# endif
578#endif 712#endif
579} 713}
580 714
581/*----------------------------------------------------------------------*/ 715/*----------------------------------------------------------------------*/
582/* rxvt_change_font() - Switch to a new font */ 716/* rxvt_change_font () - Switch to a new font */
583/* 717/*
584 * init = 1 - initialize 718 * init = 1 - initialize
585 * 719 *
586 * fontname == FONT_UP - switch to bigger font 720 * fontname == FONT_UP - switch to bigger font
587 * fontname == FONT_DN - switch to smaller font 721 * fontname == FONT_DN - switch to smaller font
588 */ 722 */
589/* EXTPROTO */
590void 723void
591rxvt_change_font(pR_ int init, const char *fontname) 724rxvt_term::change_font (int init, const char *fontname)
592{ 725{}
593}
594 726
595/* INTPROTO */
596void 727void
597rxvt_font_up_down(pR_ int n, int direction) 728rxvt_term::font_up_down (int n, int direction)
598{ 729{}
599}
600 730
601/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
602/*----------------------------------------------------------------------*/ 732/*----------------------------------------------------------------------*/
603/* xterm sequences - title, iconName, color (exptl) */ 733/* xterm sequences - title, iconName, color (exptl) */
604/* EXTPROTO */
605void 734void
606rxvt_set_title(pR_ const char *str) 735rxvt_term::set_title (const char *str)
607{ 736{
608#ifndef SMART_WINDOW_TITLE 737#ifndef SMART_WINDOW_TITLE
609 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 738 XStoreName (display->display, TermWin.parent[0], str);
610#else 739#else
611 char *name; 740 char *name;
612 741
613 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 742 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
614 name = NULL; 743 name = NULL;
615 if (name == NULL || STRCMP(name, str)) 744 if (name == NULL || STRCMP (name, str))
616 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 745 XStoreName (display->display, TermWin.parent[0], str);
617 if (name) 746 if (name)
618 XFree(name); 747 XFree (name);
619#endif 748#endif
620} 749}
621 750
622/* EXTPROTO */
623void 751void
624rxvt_set_iconName(pR_ const char *str) 752rxvt_term::set_iconName (const char *str)
625{ 753{
626#ifndef SMART_WINDOW_TITLE 754#ifndef SMART_WINDOW_TITLE
627 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 755 XSetIconName (display->display, TermWin.parent[0], str);
628#else 756#else
629 char *name; 757 char *name;
630 758
631 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 759 if (XGetIconName (display->display, TermWin.parent[0], &name))
632 name = NULL; 760 name = NULL;
633 if (name == NULL || STRCMP(name, str)) 761 if (name == NULL || STRCMP (name, str))
634 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 762 XSetIconName (display->display, TermWin.parent[0], str);
635 if (name) 763 if (name)
636 XFree(name); 764 XFree (name);
637#endif 765#endif
638} 766}
639 767
640#ifdef XTERM_COLOR_CHANGE 768#ifdef XTERM_COLOR_CHANGE
641/* EXTPROTO */
642void 769void
643rxvt_set_window_color(pR_ int idx, const char *color) 770rxvt_term::set_window_color (int idx, const char *color)
644{ 771{
645 rxvt_color xcol; 772 rxvt_color xcol;
646 int i; 773 int i;
647 774
648 if (color == NULL || *color == '\0') 775 if (color == NULL || *color == '\0')
649 return; 776 return;
650 777
651/* handle color aliases */ 778 /* handle color aliases */
652 if (isdigit(*color)) { 779 if (isdigit (*color))
780 {
653 i = atoi(color); 781 i = atoi (color);
782 if (i >= 8 && i <= 15)
654 if (i >= 8 && i <= 15) { /* bright colors */ 783 { /* bright colors */
655 i -= 8; 784 i -= 8;
656# ifndef NO_BRIGHTCOLOR 785# ifndef NO_BRIGHTCOLOR
657 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 786 PixColors[idx] = PixColors[minBrightCOLOR + i];
658 SET_PIXCOLOR(R, idx); 787 SET_PIXCOLOR (idx);
659 goto Done; 788 goto Done;
660# endif 789# endif
790
661 } 791 }
662 if (i >= 0 && i <= 7) { /* normal colors */ 792 if (i >= 0 && i <= 7)
793 { /* normal colors */
663 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 794 PixColors[idx] = PixColors[minCOLOR + i];
664 SET_PIXCOLOR(R, idx); 795 SET_PIXCOLOR (idx);
665 goto Done; 796 goto Done;
666 } 797 }
667 } 798 }
668 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 799 if (!rXParseAllocColor (& xcol, color))
669 return; 800 return;
670/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 801 /* XStoreColor (display->display, XCMAP, XColor*); */
671 802
672/* 803 /*
673 * FIXME: should free colors here, but no idea how to do it so instead, 804 * FIXME: should free colors here, but no idea how to do it so instead,
674 * so just keep gobbling up the colormap 805 * so just keep gobbling up the colormap
675 */ 806 */
676# if 0 807# if 0
677 for (i = Color_Black; i <= Color_White; i++) 808 for (i = Color_Black; i <= Color_White; i++)
678 if (R->PixColors[idx] == R->PixColors[i]) 809 if (PixColors[idx] == PixColors[i])
679 break; 810 break;
680 if (i > Color_White) { 811 if (i > Color_White)
812 {
681 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 813 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
682 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 814 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
683 DisplayPlanes(R->Xdisplay, Xscreen)); 815 DisplayPlanes (display->display, display->screen));
684 } 816 }
685# endif 817# endif
686 818
687 R->PixColors[idx] = xcol; 819 PixColors[idx] = xcol;
688 SET_PIXCOLOR(R, idx); 820 SET_PIXCOLOR (idx);
689 821
690/* XSetWindowAttributes attr; */ 822 /* XSetWindowAttributes attr; */
691/* Cursor cursor; */ 823 /* Cursor cursor; */
692 Done: 824Done:
693 if (idx == Color_bg && !(R->Options & Opt_transparent)) 825 if (idx == Color_bg && ! (Options & Opt_transparent))
694 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 826 XSetWindowBackground (display->display, TermWin.vt,
695 R->PixColors[Color_bg]); 827 PixColors[Color_bg]);
696 828
697/* handle Color_BD, scrollbar background, etc. */ 829 /* handle Color_BD, scrollbar background, etc. */
698 830
699 rxvt_set_colorfgbg(aR); 831 set_colorfgbg ();
700 rxvt_recolour_cursor(aR); 832 recolour_cursor ();
701/* the only reasonable way to enforce a clean update */ 833 /* the only reasonable way to enforce a clean update */
702 rxvt_scr_poweron(aR); 834 scr_poweron ();
703} 835}
704 836
705#else 837#else
706# define rxvt_set_window_color(aR_ idx,color) ((void)0) 838# define set_window_color (idx,color) ((void)0)
707#endif /* XTERM_COLOR_CHANGE */ 839#endif /* XTERM_COLOR_CHANGE */
708 840
709/* EXTPROTO */
710void 841void
711rxvt_recolour_cursor(pR) 842rxvt_term::recolour_cursor ()
712{ 843{
713 rxvt_color xcol[2];
714
715#if TODO 844#if TODO
845 rxvt_color xcol[2];
846
716 xcol[0] = R->PixColors[Color_pointer]; 847 xcol[0] = PixColors[Color_pointer];
717 xcol[1] = R->PixColors[Color_bg]; 848 xcol[1] = PixColors[Color_bg];
718 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 849 XQueryColors (display->display, XCMAP, xcol, 2);
719 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 850 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
720#endif 851#endif
721} 852}
722 853
723/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
724/* 855/*
725 * find if fg/bg matches any of the normal (low-intensity) colors 856 * find if fg/bg matches any of the normal (low-intensity) colors
726 */ 857 */
727/* INTPROTO */
728void 858void
729rxvt_set_colorfgbg(pR) 859rxvt_term::set_colorfgbg ()
730{ 860{
731 unsigned int i; 861 unsigned int i;
732 const char *xpmb = "\0"; 862 const char *xpmb = "\0";
733 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 863 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
734 864
735 R->env_colorfgbg = 865 env_colorfgbg =
736 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 866 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
737 STRCPY(fstr, "default"); 867 STRCPY (fstr, "default");
738 STRCPY(bstr, "default"); 868 STRCPY (bstr, "default");
739 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[Color_fg] == R->PixColors[i]) { 870 if (PixColors[Color_fg] == PixColors[i])
871 {
741 sprintf(fstr, "%d", (i - Color_Black)); 872 sprintf (fstr, "%d", (i - Color_Black));
742 break; 873 break;
743 } 874 }
744 for (i = Color_Black; i <= Color_White; i++) 875 for (i = Color_Black; i <= Color_White; i++)
745 if (R->PixColors[Color_bg] == R->PixColors[i]) { 876 if (PixColors[Color_bg] == PixColors[i])
877 {
746 sprintf(bstr, "%d", (i - Color_Black)); 878 sprintf (bstr, "%d", (i - Color_Black));
747#ifdef XPM_BACKGROUND 879#ifdef XPM_BACKGROUND
748 xpmb = "default;"; 880 xpmb = "default;";
749#endif 881#endif
750 break; 882 break;
751 } 883 }
884
752 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 885 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
753 putenv(R->env_colorfgbg);
754 886
755#ifndef NO_BRIGHTCOLOR 887#ifndef NO_BRIGHTCOLOR
756 R->colorfgbg = DEFAULT_RSTYLE; 888 colorfgbg = DEFAULT_RSTYLE;
757 for (i = minCOLOR; i <= maxCOLOR; i++) { 889 for (i = minCOLOR; i <= maxCOLOR; i++)
890 {
758 if (R->PixColors[Color_fg] == R->PixColors[i]) 891 if (PixColors[Color_fg] == PixColors[i])
759 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 892 colorfgbg = SET_FGCOLOR (colorfgbg, i);
760 if (R->PixColors[Color_bg] == R->PixColors[i]) 893 if (PixColors[Color_bg] == PixColors[i])
761 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 894 colorfgbg = SET_BGCOLOR (colorfgbg, i);
762 } 895 }
763#endif 896#endif
764} 897}
765 898
766/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
767/* 900/*
768 * Colour determination for low colour displays, routine from 901 * Colour determination for low colour displays, routine from
769 * Hans de Goede <hans@highrise.nl> 902 * Hans de Goede <hans@highrise.nl>
770 */ 903 */
771 904
772/* EXTPROTO */
773int 905int
774rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 906rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
775{ 907{
776 screen_in_out->set(aR_ colour);
777
778 if (!screen_in_out->set(aR_ colour)) { 908 if (!screen_in_out->set (display, colour))
909 {
779 rxvt_print_error("can't allocate colour: %s", colour); 910 rxvt_print_error ("can't allocate colour: %s", colour);
780 return false; 911 return false;
781 } 912 }
782 913
783 return true; 914 return true;
784} 915}
785 916
786/* -------------------------------------------------------------------- * 917/* -------------------------------------------------------------------- *
787 * - WINDOW RESIZING - * 918 * - WINDOW RESIZING - *
788 * -------------------------------------------------------------------- */ 919 * -------------------------------------------------------------------- */
789/* EXTPROTO */
790void 920void
791rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 921rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
792 int ignoreparent)
793{ 922{
794 int fix_screen; 923 int fix_screen;
795 924
796#ifdef SMART_RESIZE 925#ifdef SMART_RESIZE
797 int old_width = R->szHint.width, old_height = R->szHint.height; 926 int old_width = szHint.width, old_height = szHint.height;
798#endif 927#endif
799 928
800 rxvt_window_calc(aR_ width, height); 929 window_calc (width, height);
801 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 930 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
802 if (!ignoreparent) { 931 if (!ignoreparent)
932 {
803#ifdef SMART_RESIZE 933#ifdef SMART_RESIZE
804/* 934 /*
805 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 935 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
806 * reposition window on resize depending on placement on screen 936 * reposition window on resize depending on placement on screen
807 */ 937 */
808 int x, y, x1, y1; 938 int x, y, x1, y1;
809 int dx, dy; 939 int dx, dy;
810 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 940 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
811 Window unused_cr; 941 Window unused_cr;
812 942
813 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 943 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
814 0, 0, &x, &y, &unused_cr); 944 0, 0, &x, &y, &unused_cr);
815 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 945 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
816 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 946 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
817 /* 947 /*
818 * if Xroot isn't the parent window, a WM will probably have offset 948 * if display->root isn't the parent window, a WM will probably have offset
819 * our position for handles and decorations. Counter it 949 * our position for handles and decorations. Counter it
820 */ 950 */
821 if (x1 != x || y1 != y) { 951 if (x1 != x || y1 != y)
952 {
822 x -= x1; 953 x -= x1;
823 y -= y1; 954 y -= y1;
824 } 955 }
825 956
826 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 957 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
827 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 958 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
828 dx = old_width - R->szHint.width; 959 dx = old_width - szHint.width;
829 dy = old_height - R->szHint.height; 960 dy = old_height - szHint.height;
830 961
831 /* Check position of the center of the window */ 962 /* Check position of the center of the window */
832 if (x < x1) /* left half */ 963 if (x < x1) /* left half */
833 dx = 0; 964 dx = 0;
834 else if (x == x1) /* exact center */ 965 else if (x == x1) /* exact center */
835 dx /= 2; 966 dx /= 2;
836 if (y < y1) /* top half */ 967 if (y < y1) /* top half */
837 dy = 0; 968 dy = 0;
838 else if (y == y1) /* exact center */ 969 else if (y == y1) /* exact center */
839 dy /= 2; 970 dy /= 2;
840 971
841 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 972 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
842 R->szHint.width, R->szHint.height); 973 szHint.width, szHint.height);
843#else 974#else
844 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 975 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
845 R->szHint.height); 976 szHint.height);
846#endif 977#endif
847 }
848 978
979 }
980
849 fix_screen = (R->TermWin.ncol != R->prev_ncol 981 fix_screen = (TermWin.ncol != prev_ncol
850 || R->TermWin.nrow != R->prev_nrow); 982 || TermWin.nrow != prev_nrow);
983
851 if (fix_screen || width != R->old_width || height != R->old_height) { 984 if (fix_screen || width != old_width || height != old_height)
985 {
852 if (scrollbar_visible(R)) { 986 if (scrollbar_visible ())
987 {
853 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 988 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
854 0, scrollbar_TotalWidth(), R->szHint.height); 989 0, scrollbar_TotalWidth (), szHint.height);
855 rxvt_Resize_scrollBar(aR); 990 resize_scrollbar ();
856 } 991 }
992
857 if (menubar_visible(R)) 993 if (menubar_visible ())
858 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 994 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
859 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 995 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
996
860 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
861 R->window_vt_y, TermWin_TotalWidth(), 998 window_vt_y, TermWin_TotalWidth (),
862 TermWin_TotalHeight()); 999 TermWin_TotalHeight ());
863#ifdef RXVT_GRAPHICS 1000#ifdef RXVT_GRAPHICS
864 if (R->old_height) 1001 if (old_height)
865 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 1002 Gr_Resize (old_width - szHint.base_width,
866 R->old_height - R->szHint.base_height); 1003 old_height - szHint.base_height);
867#endif 1004#endif
868 rxvt_scr_clear(aR); 1005 scr_clear ();
869#ifdef XPM_BACKGROUND 1006#ifdef XPM_BACKGROUND
870 rxvt_resize_pixmap(aR); 1007 resize_pixmap ();
871#endif 1008#endif
872 }
873 1009
1010 }
1011
874 if (fix_screen || R->old_height == 0) { 1012 if (fix_screen || old_height == 0)
1013 {
875 int curr_screen = -1; 1014 int curr_screen = -1;
876 uint16_t old_ncol = R->prev_ncol; 1015 int old_ncol = prev_ncol;
877 1016
878 /* scr_reset only works on the primary screen */ 1017 /* scr_reset only works on the primary screen */
879 if (R->old_height) /* this is not the first time through */ 1018 if (old_height) /* this is not the first time through */
1019 {
1020 unsigned int ncol = TermWin.ncol;
1021 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
880 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1022 curr_screen = scr_change_screen (PRIMARY);
881 rxvt_scr_reset(aR); 1023 TermWin.ncol = ncol;
882 if (curr_screen >= 0) { /* this is not the first time through */
883 rxvt_scr_change_screen(aR_ curr_screen);
884 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
885 } 1024 }
886 }
887 1025
1026 scr_reset ();
1027
1028 if (curr_screen >= 0) /* this is not the first time through */
1029 {
1030 scr_change_screen (curr_screen);
1031 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1032 }
1033 }
1034
888 R->old_width = R->szHint.width; 1035 old_width = szHint.width;
889 R->old_height = R->szHint.height; 1036 old_height = szHint.height;
890 1037
891#ifdef USE_XIM 1038#ifdef USE_XIM
892 rxvt_IMSetStatusPosition(aR); 1039 IMSetStatusPosition ();
893#endif 1040#endif
894} 1041}
895 1042
896/* 1043/*
897 * Set the width/height of the vt window in characters. Units are pixels. 1044 * Set the width/height of the vt window in characters. Units are pixels.
898 * good for toggling 80/132 columns 1045 * good for toggling 80/132 columns
899 */ 1046 */
900/* EXTPROTO */
901void 1047void
902rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1048rxvt_term::set_widthheight (unsigned int width, unsigned int height)
903{ 1049{
904 XWindowAttributes wattr; 1050 XWindowAttributes wattr;
905 1051
906 if (width == 0 || height == 0) { 1052 if (width == 0 || height == 0)
1053 {
907 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1054 XGetWindowAttributes (display->display, display->root, &wattr);
908 if (width == 0) 1055 if (width == 0)
909 width = wattr.width - R->szHint.base_width; 1056 width = wattr.width - szHint.base_width;
910 if (height == 0) 1057 if (height == 0)
911 height = wattr.height - R->szHint.base_height; 1058 height = wattr.height - szHint.base_height;
912 } 1059 }
913 if (width != R->TermWin.width || height != R->TermWin.height) { 1060 if (width != TermWin.width || height != TermWin.height)
1061 {
914 width += R->szHint.base_width; 1062 width += szHint.base_width;
915 height += R->szHint.base_height; 1063 height += szHint.base_height;
916 rxvt_resize_all_windows(aR_ width, height, 0); 1064 resize_all_windows (width, height, 0);
917 } 1065 }
918} 1066}
919 1067
920/* -------------------------------------------------------------------- * 1068/* -------------------------------------------------------------------- *
921 * - X INPUT METHOD ROUTINES - * 1069 * - X INPUT METHOD ROUTINES - *
922 * -------------------------------------------------------------------- */ 1070 * -------------------------------------------------------------------- */
923#ifdef USE_XIM 1071#ifdef USE_XIM
924/* INTPROTO */ 1072
925void 1073void
926rxvt_setSize(pR_ XRectangle * size) 1074rxvt_term::im_set_size (XRectangle *size)
927{ 1075{
928 size->x = R->TermWin.int_bwidth; 1076 size->x = TermWin.int_bwidth;
929 size->y = R->TermWin.int_bwidth; 1077 size->y = TermWin.int_bwidth;
930 size->width = Width2Pixel(R->TermWin.ncol); 1078 size->width = Width2Pixel (TermWin.ncol);
931 size->height = Height2Pixel(R->TermWin.nrow); 1079 size->height = Height2Pixel (TermWin.nrow);
932} 1080}
933 1081
934/* INTPROTO */
935void 1082void
936rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1083rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
937{ 1084{
938 *fg = R->PixColors[Color_fg]; 1085 *fg = PixColors[Color_fg];
939 *bg = R->PixColors[Color_bg]; 1086 *bg = PixColors[Color_bg];
940} 1087}
941 1088
942/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
943/* INTPROTO */
944Bool 1090bool
945rxvt_IMisRunning(pR) 1091rxvt_term::IMisRunning ()
946{ 1092{
947 char *p; 1093 char *p;
948 Atom atom; 1094 Atom atom;
949 Window win; 1095 Window win;
950 char server[IMBUFSIZ]; 1096 char server[IMBUFSIZ];
951 1097
952/* get current locale modifier */ 1098 /* get current locale modifier */
953 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1099 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1100 {
954 STRCPY(server, "@server="); 1101 STRCPY (server, "@server=");
955 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1102 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
956 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1103 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
957 *p = '\0'; 1104 *p = '\0';
958 1105
959 atom = XInternAtom(R->Xdisplay, server, False); 1106 atom = XInternAtom (display->display, server, False);
960 win = XGetSelectionOwner(R->Xdisplay, atom); 1107 win = XGetSelectionOwner (display->display, atom);
961 if (win != None) 1108 if (win != None)
962 return True; 1109 return True;
963 } 1110 }
964 return False; 1111 return False;
965} 1112}
966 1113
967/* EXTPROTO */
968void 1114void
969rxvt_IMSendSpot(pR) 1115rxvt_term::IMSendSpot ()
970{ 1116{
971 XPoint spot; 1117 XPoint spot;
972 XVaNestedList preedit_attr; 1118 XVaNestedList preedit_attr;
973 1119
974 if (R->Input_Context == NULL 1120 if (Input_Context == NULL
975 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1121 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
976 || !(R->event_type == KeyPress 1122 || ! (event_type == KeyPress
977 || R->event_type == Expose 1123 || event_type == Expose
978 || R->event_type == NoExpose 1124 || event_type == NoExpose
979 || R->event_type == SelectionNotify 1125 || event_type == SelectionNotify
980 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1126 || event_type == ButtonRelease || event_type == FocusIn)
981 || !rxvt_IMisRunning(aR)) 1127 || !IMisRunning ())
982 return; 1128 return;
983 1129
984 rxvt_setPosition(aR_ & spot); 1130 im_set_position (&spot);
985 1131
986 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1132 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
987 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1133 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
988 XFree(preedit_attr); 1134 XFree (preedit_attr);
989} 1135}
990 1136
991/* EXTPROTO */
992void 1137void
993rxvt_setTermFontSet(pR_ int idx)
994{
995 char *string;
996 long length;
997 int success = 0;
998
999 if (idx < 0 || idx >= MAX_NFONTS)
1000 return;
1001}
1002
1003/* INTPROTO */
1004void
1005rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1138rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1006 XRectangle * needed_rect) 1139 XRectangle * needed_rect)
1007{ 1140{
1008 int mbh, vtx = 0; 1141 int mbh, vtx = 0;
1009 1142
1010 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1143 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1011 vtx = scrollbar_TotalWidth(); 1144 vtx = scrollbar_TotalWidth ();
1145
1012 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1146 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1013 mbh -= R->TermWin.lineSpace; 1147 mbh -= TermWin.lineSpace;
1014 1148
1015 preedit_rect->x = needed_rect->width + vtx; 1149 preedit_rect->x = needed_rect->width + vtx;
1016 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1150 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1017 1151
1018 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1152 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1019 + vtx;
1020 preedit_rect->height = Height2Pixel(1); 1153 preedit_rect->height = Height2Pixel (1);
1021 1154
1022 status_rect->x = vtx; 1155 status_rect->x = vtx;
1023 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1156 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1024 1157
1025 status_rect->width = needed_rect->width ? needed_rect->width 1158 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1026 : Width2Pixel(R->TermWin.ncol + 1);
1027 status_rect->height = Height2Pixel(1); 1159 status_rect->height = Height2Pixel (1);
1028} 1160}
1029 1161
1030/* ARGSUSED */
1031/* INTPROTO */
1032void 1162void
1033rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1163rxvt_term::im_destroy ()
1034 __attribute__ ((unused)), XPointer call_data
1035 __attribute__ ((unused)))
1036{ 1164{
1037 dR; 1165 if (Input_Context)
1038 1166 {
1167 XDestroyIC (Input_Context);
1039 R->Input_Context = NULL; 1168 Input_Context = NULL;
1040/* To avoid Segmentation Fault in C locale: Solaris only? */ 1169 }
1041 if (STRCMP(R->locale, "C"))
1042 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1043 rxvt_IMInstantiateCallback, NULL);
1044}
1045 1170
1046/* 1171 if (input_method)
1047 * X manual pages and include files don't match on some systems:
1048 * some think this is an XIDProc and others an XIMProc so we can't
1049 * use the first argument - need to update this to be nice for
1050 * both types via some sort of configure detection
1051 */
1052/* ARGSUSED */
1053/* EXTPROTO */
1054void
1055rxvt_IMInstantiateCallback(Display * unused
1056 __attribute__ ((unused)), XPointer client_data
1057 __attribute__ ((unused)), XPointer call_data
1058 __attribute__ ((unused)))
1059{
1060 dR;
1061 int i, found, had_im;
1062 const char *p;
1063 char **s;
1064 char buf[IMBUFSIZ];
1065
1066 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1067 if (R->Input_Context)
1068 return;
1069
1070 found = had_im = 0;
1071 p = R->rs[Rs_inputMethod];
1072 if (p && *p) {
1073 had_im = 1;
1074 s = rxvt_splitcommastring(p);
1075 for (i = 0; s[i]; i++) {
1076 if (*s[i]) {
1077 STRCPY(buf, "@im=");
1078 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1079 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1080 && (rxvt_IM_get_IC(aR) == True)) {
1081 found = 1;
1082 break;
1083 }
1084 }
1085 }
1086 for (i = 0; s[i]; i++)
1087 free(s[i]);
1088 free(s);
1089 } 1172 {
1090 if (found) 1173 display->put_xim (input_method);
1091 return; 1174 input_method = 0;
1092
1093/* try with XMODIFIERS env. var. */
1094 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1095 rxvt_IM_get_IC(aR);
1096 return;
1097 } 1175 }
1098
1099/* try with no modifiers base IF the user didn't specify an IM */
1100 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1101 && rxvt_IM_get_IC(aR) == True)
1102 return;
1103} 1176}
1104 1177
1105/* 1178/*
1106 * Try to open a XIM with the current modifiers, then see if we can 1179 * Try to open a XIM with the current modifiers, then see if we can
1107 * open a suitable preedit type 1180 * open a suitable preedit type
1108 */ 1181 */
1109/* INTPROTO */
1110Bool 1182bool
1111rxvt_IM_get_IC(pR) 1183rxvt_term::IM_get_IC (const char *modifiers)
1112{ 1184{
1113 int i, j, found; 1185 int i, j, found;
1114 XIM xim; 1186 XIM xim;
1115 XPoint spot; 1187 XPoint spot;
1116 XRectangle rect, status_rect, needed_rect; 1188 XRectangle rect, status_rect, needed_rect;
1117 unsigned long fg, bg; 1189 unsigned long fg, bg;
1118 const char *p; 1190 const char *p;
1119 char **s; 1191 char **s;
1120 XIMStyles *xim_styles; 1192 XIMStyles *xim_styles;
1121 XVaNestedList preedit_attr, status_attr; 1193 XVaNestedList preedit_attr, status_attr;
1122 XIMCallback ximcallback;
1123 1194
1195 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1196 return false;
1197
1124 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1198 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1125 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1199 input_method = display->get_xim (locale, modifiers);
1126 if (xim == NULL) 1200 if (input_method == NULL)
1127 return False; 1201 return false;
1128 1202
1203 xim = input_method->xim;
1204
1129 xim_styles = NULL; 1205 xim_styles = NULL;
1130 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1206 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1131 || !xim_styles || !xim_styles->count_styles) { 1207 || !xim_styles || !xim_styles->count_styles)
1132 XCloseIM(xim); 1208 {
1209 display->put_xim (input_method);
1133 return False; 1210 return false;
1134 } 1211 }
1135 1212
1136 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1213 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1137 : "OverTheSpot,OffTheSpot,Root";
1138 s = rxvt_splitcommastring(p); 1214 s = rxvt_splitcommastring (p);
1139 for (i = found = 0; !found && s[i]; i++) { 1215 for (i = found = 0; !found && s[i]; i++)
1216 {
1140 if (!STRCMP(s[i], "OverTheSpot")) 1217 if (!STRCMP (s[i], "OverTheSpot"))
1141 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1218 input_style = (XIMPreeditPosition | XIMStatusNothing);
1142 else if (!STRCMP(s[i], "OffTheSpot")) 1219 else if (!STRCMP (s[i], "OffTheSpot"))
1143 R->input_style = (XIMPreeditArea | XIMStatusArea); 1220 input_style = (XIMPreeditArea | XIMStatusArea);
1144 else if (!STRCMP(s[i], "Root")) 1221 else if (!STRCMP (s[i], "Root"))
1145 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1222 input_style = (XIMPreeditNothing | XIMStatusNothing);
1146 1223
1147 for (j = 0; j < xim_styles->count_styles; j++) 1224 for (j = 0; j < xim_styles->count_styles; j++)
1148 if (R->input_style == xim_styles->supported_styles[j]) { 1225 if (input_style == xim_styles->supported_styles[j])
1226 {
1149 found = 1; 1227 found = 1;
1228 break;
1229 }
1230 }
1231
1232 for (i = 0; s[i]; i++)
1233 free (s[i]);
1234
1235 free (s);
1236 XFree (xim_styles);
1237
1238 if (!found)
1239 {
1240 display->put_xim (input_method);
1241 return false;
1242 }
1243
1244 preedit_attr = status_attr = NULL;
1245
1246 if (input_style & XIMPreeditPosition)
1247 {
1248 im_set_size (&rect);
1249 im_set_position (&spot);
1250 im_set_color (&fg, &bg);
1251
1252 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1253 XNSpotLocation, &spot,
1254 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, TermWin.fontset,
1256 NULL);
1257 }
1258 else if (input_style & XIMPreeditArea)
1259 {
1260 im_set_color (&fg, &bg);
1261
1262 /*
1263 * The necessary width of preedit area is unknown
1264 * until create input context.
1265 */
1266 needed_rect.width = 0;
1267
1268 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1269
1270 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1271 XNForeground, fg, XNBackground, bg,
1272 //XNFontSet, TermWin.fontset,
1273 NULL);
1274 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1275 XNForeground, fg, XNBackground, bg,
1276 //XNFontSet, TermWin.fontset,
1277 NULL);
1278 }
1279
1280 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1281 XNClientWindow, TermWin.parent[0],
1282 XNFocusWindow, TermWin.parent[0],
1283 preedit_attr ? XNPreeditAttributes : NULL,
1284 preedit_attr,
1285 status_attr ? XNStatusAttributes : NULL,
1286 status_attr, NULL);
1287 if (preedit_attr) XFree (preedit_attr);
1288 if (status_attr) XFree (status_attr);
1289
1290 if (Input_Context == NULL)
1291 {
1292 rxvt_print_error ("failed to create input context");
1293 display->put_xim (input_method);
1294 return false;
1295 }
1296
1297 if (input_style & XIMPreeditArea)
1298 IMSetStatusPosition ();
1299
1300 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1301 return true;
1302}
1303
1304void
1305rxvt_term::im_cb ()
1306{
1307 int i, found, had_im;
1308 const char *p;
1309 char **s;
1310 char buf[IMBUFSIZ];
1311
1312 im_destroy ();
1313
1314 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1315 if (Input_Context)
1316 return;
1317
1318#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1319 if (rs[Rs_imLocale])
1320 SET_LOCALE (rs[Rs_imLocale]);
1321#endif
1322
1323 p = rs[Rs_inputMethod];
1324 if (p && *p)
1325 {
1326 bool found = false;
1327
1328 s = rxvt_splitcommastring (p);
1329 for (i = 0; s[i]; i++)
1330 {
1331 if (*s[i])
1332 {
1333 STRCPY (buf, "@im=");
1334 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1335 if (IM_get_IC (buf))
1336 {
1337 found = true;
1150 break; 1338 break;
1339 }
1151 } 1340 }
1152 } 1341 }
1153 for (i = 0; s[i]; i++) 1342 for (i = 0; s[i]; i++)
1154 free(s[i]); 1343 free (s[i]);
1155 free(s); 1344 free (s);
1156 XFree(xim_styles);
1157 1345
1158 if (!found) { 1346 if (found)
1159 XCloseIM(xim); 1347 goto done;
1160 return False;
1161 } 1348 }
1162 1349
1163 ximcallback.callback = rxvt_IMDestroyCallback; 1350 /* try with XMODIFIERS env. var. */
1351 if (IM_get_IC (""))
1352 goto done;
1164 1353
1165/* XXX: not sure why we need this (as well as IC one below) */ 1354 /* try with no modifiers base IF the user didn't specify an IM */
1166 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1355 if (IM_get_IC ("@im=none"))
1356 goto done;
1167 1357
1168 preedit_attr = status_attr = NULL; 1358done:
1169 1359#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1170 if (R->input_style & XIMPreeditPosition) { 1360 if (rs[Rs_imLocale])
1171 rxvt_setSize(aR_ & rect); 1361 SET_LOCALE (locale);
1172 rxvt_setPosition(aR_ & spot); 1362#endif
1173 rxvt_setColor(aR_ & fg, &bg);
1174
1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1176 XNSpotLocation, &spot,
1177 XNForeground, fg, XNBackground, bg,
1178 //XNFontSet, R->TermWin.fontset,
1179 NULL);
1180 } else if (R->input_style & XIMPreeditArea) {
1181 rxvt_setColor(aR_ & fg, &bg);
1182
1183 /*
1184 * The necessary width of preedit area is unknown
1185 * until create input context.
1186 */
1187 needed_rect.width = 0;
1188
1189 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1190
1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1192 XNForeground, fg, XNBackground, bg,
1193 //XNFontSet, R->TermWin.fontset,
1194 NULL);
1195 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1196 XNForeground, fg, XNBackground, bg,
1197 //XNFontSet, R->TermWin.fontset,
1198 NULL);
1199 }
1200 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1201 XNClientWindow, R->TermWin.parent[0],
1202 XNFocusWindow, R->TermWin.parent[0],
1203 XNDestroyCallback, &ximcallback,
1204 preedit_attr ? XNPreeditAttributes : NULL,
1205 preedit_attr,
1206 status_attr ? XNStatusAttributes : NULL,
1207 status_attr, NULL);
1208 if (preedit_attr)
1209 XFree(preedit_attr);
1210 if (status_attr)
1211 XFree(status_attr);
1212 if (R->Input_Context == NULL) {
1213 rxvt_print_error("failed to create input context");
1214 XCloseIM(xim);
1215 return False;
1216 }
1217 if (R->input_style & XIMPreeditArea)
1218 rxvt_IMSetStatusPosition(aR);
1219 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1220 return True;
1221} 1363}
1222 1364
1223/* EXTPROTO */
1224void 1365void
1225rxvt_IMSetStatusPosition(pR) 1366rxvt_term::IMSetStatusPosition ()
1226{ 1367{
1227 XRectangle preedit_rect, status_rect, *needed_rect; 1368 XRectangle preedit_rect, status_rect, *needed_rect;
1228 XVaNestedList preedit_attr, status_attr; 1369 XVaNestedList preedit_attr, status_attr;
1229 1370
1230 if (R->Input_Context == NULL 1371 if (Input_Context == NULL
1231 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1372 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1232 || !rxvt_IMisRunning(aR)) 1373 || !IMisRunning ())
1233 return; 1374 return;
1234 1375
1235/* Getting the necessary width of preedit area */ 1376 /* Getting the necessary width of preedit area */
1236 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1377 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1237 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1378 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1238 XFree(status_attr); 1379 XFree (status_attr);
1239 1380
1240 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1381 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1241 1382
1242 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1383 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1243 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1384 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1244 1385
1245 XSetICValues(R->Input_Context, 1386 XSetICValues (Input_Context,
1246 XNPreeditAttributes, preedit_attr, 1387 XNPreeditAttributes, preedit_attr,
1247 XNStatusAttributes, status_attr, NULL); 1388 XNStatusAttributes, status_attr, NULL);
1248 1389
1249 XFree(preedit_attr); 1390 XFree (preedit_attr);
1250 XFree(status_attr); 1391 XFree (status_attr);
1251} 1392}
1252#endif /* USE_XIM */ 1393#endif /* USE_XIM */
1253 1394
1254/*----------------------------------------------------------------------*/ 1395/*----------------------------------------------------------------------*/
1255rxvt_t rxvt_current_term; 1396rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines