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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines