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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

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

Diff Legend

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