[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
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-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
56	static char curlocale[128], savelocale[128];	59	static char curlocale[128], savelocale[128];
57		60
58	bool	61	bool
59	rxvt_set_locale (const char *locale) NOTHROW	62	rxvt_set_locale (const char *locale) NOTHROW
60	{	63	{
		64	int size = strlen (locale) + 1;
		65
		66	if (size > sizeof (curlocale))
		67	rxvt_fatal ("locale string too long, aborting.\n");
		68
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	70	return false;
63		71
64	strncpy (curlocale, locale, 128);	72	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
66	return true;	74	return true;
67	}	75	}
68		76
69	void	77	void
…		…
83	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
84		92
85	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86	{	94	{
87	compose_char *cc;	95	compose_char *cc;
88		96
89	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
90	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
91	cc = (*this)[c1];	99	cc = (*this)[c1];
92	while (cc)	100	while (cc)
93	{	101	{
…		…
142		150
143	}	151	}
144	#endif	152	#endif
145		153
146	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
147	:	155	{
148	#if TRANSPARENT	156	#if HAVE_BG_PIXMAP
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150	#endif	176	#endif
151	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153	#endif	179	#endif
154	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif	182	#endif
169	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171	#endif	185	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	#ifndef NO_BELL	186	#ifndef NO_BELL
176	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177	#endif	188	#endif
178	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185	incr_ev (this, &rxvt_term::incr_cb)	196
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		198
189	termlist.push_back (this);	199	termlist.push_back (this);
190		200
191	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	203	#endif
194	}	204	}
195		205
196	// clean up the most important stuff, do not call x or free mem etc.	206	// clean up the most important stuff, do not call x or free mem etc.
197	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
198	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
199	{	210	{
200	if (cmd_pid)	211	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
202		213
		214	pty_ev.stop ();
203	delete pty; pty = 0;	215	delete pty; pty = 0;
204	}	216	}
205		217
206	rxvt_term::~rxvt_term ()	218	rxvt_term::~rxvt_term ()
207	{	219	{
…		…
216	#endif	228	#endif
217	delete fontset[0];	229	delete fontset[0];
218		230
219	if (display)	231	if (display)
220	{	232	{
221	dDisp;
222
223	selection_clear ();	233	selection_clear ();
224		234
225	#ifdef USE_XIM	235	#ifdef USE_XIM
226	im_destroy ();	236	im_destroy ();
227	#endif	237	#endif
228	#ifdef XTERM_SCROLLBAR	238	#ifdef XTERM_SCROLLBAR
229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230	if (ShadowGC) XFreeGC (disp, ShadowGC);	240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
231	#endif	241	#endif
232	#ifdef PLAIN_SCROLLBAR	242	#ifdef PLAIN_SCROLLBAR
233	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234	#endif	244	#endif
235	#ifdef NEXT_SCROLLBAR	245	#ifdef NEXT_SCROLLBAR
236	if (blackGC) XFreeGC (disp, blackGC);	246	if (blackGC) XFreeGC (dpy, blackGC);
237	if (whiteGC) XFreeGC (disp, whiteGC);	247	if (whiteGC) XFreeGC (dpy, whiteGC);
238	if (grayGC) XFreeGC (disp, grayGC);	248	if (grayGC) XFreeGC (dpy, grayGC);
239	if (darkGC) XFreeGC (disp, darkGC);	249	if (darkGC) XFreeGC (dpy, darkGC);
240	if (stippleGC) XFreeGC (disp, stippleGC);	250	if (stippleGC) XFreeGC (dpy, stippleGC);
241	if (dimple) XFreePixmap (disp, dimple);	251	if (dimple) XFreePixmap (dpy, dimple);
242	if (upArrow) XFreePixmap (disp, upArrow);	252	if (upArrow) XFreePixmap (dpy, upArrow);
243	if (downArrow) XFreePixmap (disp, downArrow);	253	if (downArrow) XFreePixmap (dpy, downArrow);
244	if (upArrowHi) XFreePixmap (disp, upArrowHi);	254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245	if (downArrowHi) XFreePixmap (disp, downArrowHi);	255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246	#endif	256	#endif
247	#ifdef RXVT_SCROLLBAR	257	#ifdef RXVT_SCROLLBAR
248	if (topShadowGC) XFreeGC (disp, topShadowGC);	258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
249	if (botShadowGC) XFreeGC (disp, botShadowGC);	259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251	#endif	261	#endif
252	if (gc) XFreeGC (disp, gc);	262	if (gc) XFreeGC (dpy, gc);
253		263
254	delete drawable;	264	delete drawable;
255	// destroy all windows	265	// destroy all windows
256	if (parent[0])	266	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	267	XDestroyWindow (dpy, parent[0]);
258	}
259		268
260	// TODO: free pixcolours, colours should become part of rxvt_display	269	for (int i = 0; i < TOTAL_COLORS; i++)
261	delete pix_colors_focused;	270	if (ISSET_PIXCOLOR (i))
		271	{
		272	pix_colors_focused [i].free (this);
262	#if OFF_FOCUS_FADING	273	#if OFF_FOCUS_FADING
263	delete pix_colors_unfocused;	274	pix_colors_unfocused [i].free (this);
264	#endif	275	#endif
		276	}
265		277
		278	clear ();
		279	}
		280
		281	#ifdef HAVE_BG_PIXMAP
		282	bgPixmap.destroy ();
		283	#endif
		284	display->flush (); /* ideally .put should do this */
266	displays.put (display);	285	displays.put (display);
267		286
268	scr_release ();	287	scr_release ();
269		288
270	/* clear all resources */	289	/* clear all resources */
…		…
283	delete argv;	302	delete argv;
284		303
285	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
286	delete keyboard;	305	delete keyboard;
287	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
288	}	310	}
289		311
290	// child has exited, usually destroys	312	// child has exited, usually destroys
291	void	313	void
292	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
293	{	315	{
294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295		317
296	cmd_pid = 0;	318	cmd_pid = 0;
297		319
298	if (!OPTION (Opt_hold))	320	if (!option (Opt_hold))
299	destroy ();	321	destroy ();
300	}	322	}
301		323
302	void	324	void
303	rxvt_term::destroy ()	325	rxvt_term::destroy ()
304	{	326	{
305	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
306	return;	328	return;
307		329
308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309		331
310	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
317	im_ev.stop (display);	339	im_ev.stop (display);
318	#endif	340	#endif
319	#if HAVE_SCROLLBARS	341	#if HAVE_SCROLLBARS
320	scrollbar_ev.stop (display);	342	scrollbar_ev.stop (display);
321	#endif	343	#endif
322	#if TRANSPARENT	344	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
323	rootwin_ev.stop (display);	345	rootwin_ev.stop (display);
324	#endif	346	#endif
325	incr_ev.stop ();	347	incr_ev.stop ();
326	termwin_ev.stop (display);	348	termwin_ev.stop (display);
327	vt_ev.stop (display);	349	vt_ev.stop (display);
328	}	350	}
329		351
330	check_ev.stop ();	352	flush_ev.stop ();
331	pty_ev.stop ();	353	pty_ev.stop ();
332	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
333	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
334	#endif	356	#endif
335	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
343	#endif	365	#endif
344	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
345	pointer_ev.stop ();	367	pointer_ev.stop ();
346	#endif	368	#endif
347		369
348	destroy_ev.start (0);	370	destroy_ev.start ();
349	}	371	}
350		372
351	void	373	void
352	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
353	{	375	{
354	make_current ();	376	make_current ();
355		377
356	delete this;	378	delete this;
357	}	379	}
…		…
368	{	390	{
369	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	391	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370	(*t)->emergency_cleanup ();	392	(*t)->emergency_cleanup ();
371	}	393	}
372		394
373	#if ENABLE_FRILLS	395	#if !ENABLE_MINIMAL
374	static void	396	static void
375	print_x_error (Display dpy, XErrorEvent event)	397	print_x_error (Display dpy, XErrorEvent event)
376	{	398	{
377	char buffer[BUFSIZ];	399	char buffer[BUFSIZ];
378	char mesg[BUFSIZ];	400	char mesg[BUFSIZ];
…		…
411	else	433	else
412	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413	mesg, BUFSIZ);	435	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415	}	437	}
416	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417	mesg, BUFSIZ);	439	mesg, BUFSIZ);
418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419	}	441	}
420	#endif	442	#endif
421		443
…		…
426	GET_R->allowedxerror = event->error_code;	448	GET_R->allowedxerror = event->error_code;
427	else	449	else
428	{	450	{
429	// GET_R is most likely not the terminal which caused the error,	451	// GET_R is most likely not the terminal which caused the error,
430	// so just output the error and continue	452	// so just output the error and continue
431	#if ENABLE_FRILLS	453	#if ENABLE_MINIMAL
		454	old_xerror_handler (display, event);
		455	#else
432	print_x_error (display, event);	456	print_x_error (display, event);
433	#else
434	old_xerror_handler (display, event);
435	#endif	457	#endif
436	}	458	}
437		459
438	return 0;	460	return 0;
439	}	461	}
…		…
446	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
447	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
448	}	470	}
449		471
450	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
451	bool	473	void
452	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
453	{	475	{
454	this->envv = envv;	476	this->envv = envv;
455		477
456	SET_R (this);	478	SET_R (this);
457	set_locale ("");	479	set_locale ("");
458	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
459		481
460	if (!init_vars ())	482	init_vars ();
461	return false;
462		483
463	init_secondary ();	484	init_secondary ();
464		485
465	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
466		487
467	#ifdef KEYSYM_RESOURCE	488	#ifdef KEYSYM_RESOURCE
468	keyboard->register_done ();	489	keyboard->register_done ();
469	#endif	490	#endif
470		491
471	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
472	if (OPTION (Opt_scrollBar))	493	if (option (Opt_scrollBar))
473	scrollBar.setIdle (); /* set existence for size calculations */	494	scrollBar.setIdle (); /* set existence for size calculations */
474	#endif	495	#endif
475		496
476	pty = ptytty::create ();	497	pty = ptytty::create ();
477		498
478	create_windows (argc, argv);	499	create_windows (argc, argv);
479		500
480	dDisp;
481
482	init_xlocale ();	501	init_xlocale ();
483		502
484	scr_reset (); // initialize screen	503	scr_reset (); // initialize screen
485		504
486	#if 0	505	#if 0
487	XSynchronize (disp, True);	506	XSynchronize (dpy, True);
488	#endif	507	#endif
489		508
490	#ifdef HAVE_SCROLLBARS	509	#ifdef HAVE_SCROLLBARS
491	if (OPTION (Opt_scrollBar))	510	if (option (Opt_scrollBar))
492	resize_scrollbar (); /* create and map scrollbar */	511	resize_scrollbar (); /* create and map scrollbar */
493	#endif	512	#endif
		513	#ifdef HAVE_BG_PIXMAP
		514	{
		515	bgPixmap.set_target (this);
		516
494	#ifdef TRANSPARENT	517	#ifdef ENABLE_TRANSPARENCY
495	if (OPTION (Opt_transparent))	518	if (option (Opt_transparent))
496	{	519	{
		520	bgPixmap.set_transparent ();
		521
		522	#ifdef HAVE_AFTERIMAGE
		523	if (rs [Rs_blurradius])
		524	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		525	#endif
		526	if (ISSET_PIXCOLOR (Color_tint))
		527	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		528
		529	if (rs [Rs_shade])
		530	bgPixmap.set_shade (rs [Rs_shade]);
		531
		532	bgPixmap.set_root_pixmap ();
497	XSelectInput (disp, display->root, PropertyChangeMask);	533	XSelectInput (dpy, display->root, PropertyChangeMask);
498	check_our_parents ();
499	rootwin_ev.start (display, display->root);	534	rootwin_ev.start (display, display->root);
500	}	535	}
		536	#endif
		537
		538	#ifdef BG_IMAGE_FROM_FILE
		539	if (rs[Rs_backgroundPixmap])
		540	{
		541	const char *p = rs[Rs_backgroundPixmap];
		542
		543	if ((p = strchr (p, ';')) != 0)
		544	{
		545	p++;
		546	bgPixmap.set_geometry (p);
		547	}
		548	else
		549	bgPixmap.set_defaultGeometry ();
		550
		551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		552	if (!bgPixmap.window_position_sensitive ())
		553	update_background ();
		554	}
		555	#endif
		556	}
		557	#endif
		558
		559	#if ENABLE_PERL
		560	rootwin_ev.start (display, display->root);
501	#endif	561	#endif
502		562
503	set_colorfgbg ();	563	set_colorfgbg ();
504		564
505	init_command (cmd_argv);	565	init_command (cmd_argv);
506		566
507	free (cmd_argv);	567	free (cmd_argv);
508		568
509	if (pty->pty >= 0)	569	if (pty->pty >= 0)
510	pty_ev.start (pty->pty, EVENT_READ);	570	pty_ev.start (pty->pty, ev::READ);
511
512	check_ev.start ();
513		571
514	HOOK_INVOKE ((this, HOOK_START, DT_END));	572	HOOK_INVOKE ((this, HOOK_START, DT_END));
515		573
516	#if ENABLE_XEMBED	574	#if ENABLE_XEMBED
517	if (rs[Rs_embed])	575	if (rs[Rs_embed])
518	{	576	{
519	long info[2] = { 0, XEMBED_MAPPED };	577	long info[2] = { 0, XEMBED_MAPPED };
520		578
521	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	579	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522	32, PropModeReplace, (unsigned char *)&info, 2);	580	32, PropModeReplace, (unsigned char *)&info, 2);
523	}	581	}
524	#endif	582	#endif
525		583
526	XMapWindow (disp, vt);	584	XMapWindow (dpy, vt);
527	XMapWindow (disp, parent[0]);	585	XMapWindow (dpy, parent[0]);
528		586
529	return true;	587	refresh_check ();
530	}	588	}
531		589
532	static struct sig_handlers	590	static struct sig_handlers
533	{	591	{
534	sig_watcher sw_term, sw_int;	592	ev::sig sw_term, sw_int;
535		593
536	/*	594	/*
537	* Catch a fatal signal and tidy up before quitting	595	* Catch a fatal signal and tidy up before quitting
538	*/	596	*/
539	void	597	void sig_term (ev::sig &w, int revents);
540	sig_term (sig_watcher &w)	598
		599	sig_handlers ()
541	{	600	{
542	rxvt_emergency_cleanup ();	601	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543	signal (w.signum, SIG_DFL);
544	kill (getpid (), w.signum);
545	}
546
547	sig_handlers ()
548	: sw_term (this, &sig_handlers::sig_term),
549	sw_int (this, &sig_handlers::sig_term)	602	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550	{
551	}	603	}
552	} sig_handlers;	604	} sig_handlers;
553		605
		606	void
		607	sig_handlers::sig_term (ev::sig &w, int revents)
		608	{
		609	rxvt_emergency_cleanup ();
		610	w.stop ();
		611	kill (getpid (), w.signum);
		612	}
		613
554	char **rxvt_environ; // startup environment	614	char **rxvt_environ; // startup environment
555		615
556	void	616	void
557	rxvt_init ()	617	rxvt_init ()
558	{	618	{
559	ptytty::init ();	619	ptytty::init ();
		620
		621	if (!ev_default_loop (0))
		622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560		623
561	rxvt_environ = environ;	624	rxvt_environ = environ;
562		625
563	signal (SIGHUP, SIG_IGN);	626	signal (SIGHUP, SIG_IGN);
564	signal (SIGPIPE, SIG_IGN);	627	signal (SIGPIPE, SIG_IGN);
565		628
566	sig_handlers.sw_term.start (SIGTERM);	629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567	sig_handlers.sw_int.start (SIGINT);	630	sig_handlers.sw_int.start (SIGINT); ev_unref ();
568		631
569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
570	/* signal (SIGURG, SIG_DFL); */	633	/* signal (SIGURG, SIG_DFL); */
571		634
572	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
574	XSetIOErrorHandler (rxvt_xioerror_handler);	637	XSetIOErrorHandler (rxvt_xioerror_handler);
575		638
576	XrmInitialize ();	639	XrmInitialize ();
577	}	640	}
578		641
579	/* ------------------------------------------------------------------------- *
580	* MEMORY ALLOCATION WRAPPERS *
581	* ------------------------------------------------------------------------- */
582	void *
583	rxvt_malloc (size_t size)
584	{
585	void *p = malloc (size);
586
587	if (!p)
588	rxvt_fatal ("memory allocation failure. aborting.\n");
589
590	return p;
591	}
592
593	void *
594	rxvt_calloc (size_t number, size_t size)
595	{
596	void *p = calloc (number, size);
597
598	if (!p)
599	rxvt_fatal ("memory allocation failure. aborting.\n");
600
601	return p;
602	}
603
604	void *
605	rxvt_realloc (void *ptr, size_t size)
606	{
607	void *p = realloc (ptr, size);
608
609	if (!p)
610	rxvt_fatal ("memory allocation failure. aborting.\n");
611
612	return p;
613	}
614
615	/----------------------------------------------------------------------/	642	/----------------------------------------------------------------------/
616	/*	643	/*
617	* window size/position calculcations for XSizeHint and other storage.	644	* window size/position calculations for XSizeHint and other storage.
618	* if width/height are non-zero then override calculated width/height	645	* if width/height are non-zero then override calculated width/height
619	*/	646	*/
620	void	647	void
621	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	648	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622	{	649	{
623	short recalc_x, recalc_y;	650	short recalc_x, recalc_y;
624	int x, y, sb_w, flags;	651	int x, y, sb_w, flags;
625	unsigned int w, h;	652	unsigned int w, h;
626	unsigned int max_width, max_height;	653	unsigned int max_width, max_height;
627	dDisp;
628		654
629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	655	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
630	szHint.win_gravity = NorthWestGravity;	656	szHint.win_gravity = NorthWestGravity;
631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	657	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632		658
…		…
694		720
695	if (scrollBar.state)	721	if (scrollBar.state)
696	{	722	{
697	sb_w = scrollbar_TotalWidth ();	723	sb_w = scrollbar_TotalWidth ();
698	szHint.base_width += sb_w;	724	szHint.base_width += sb_w;
		725
699	if (!OPTION (Opt_scrollBar_right))	726	if (!option (Opt_scrollBar_right))
700	window_vt_x += sb_w;	727	window_vt_x += sb_w;
701	}	728	}
702		729
703	szHint.width_inc = fwidth;	730	szHint.width_inc = fwidth;
704	szHint.height_inc = fheight;	731	szHint.height_inc = fheight;
705	szHint.min_width = szHint.base_width + szHint.width_inc;	732	szHint.min_width = szHint.base_width + szHint.width_inc;
706	szHint.min_height = szHint.base_height + szHint.height_inc;	733	szHint.min_height = szHint.base_height + szHint.height_inc;
707		734
708	if (newwidth && newwidth - szHint.base_width < max_width)	735	if (newwidth && newwidth - szHint.base_width < max_width)
709	{	736	{
710	szHint.width = newwidth;	737	szHint.width = newwidth;
…		…
725	{	752	{
726	min_it (height, max_height);	753	min_it (height, max_height);
727	szHint.height = szHint.base_height + height;	754	szHint.height = szHint.base_height + height;
728	}	755	}
729		756
730	if (scrollBar.state && OPTION (Opt_scrollBar_right))	757	if (scrollBar.state && option (Opt_scrollBar_right))
731	window_sb_x = szHint.width - sb_w;	758	window_sb_x = szHint.width - sb_w;
732		759
733	if (recalc_x)	760	if (recalc_x)
734	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	761	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		762
735	if (recalc_y)	763	if (recalc_y)
736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	764	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737		765
738	ncol = width / fwidth;	766	ncol = width / fwidth;
739	nrow = height / fheight;	767	nrow = height / fheight;
740	}	768	}
741		769
…		…
757	ws.ws_xpixel = width;	785	ws.ws_xpixel = width;
758	ws.ws_ypixel = height;	786	ws.ws_ypixel = height;
759	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	787	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
760		788
761	#if 0	789	#if 0
762	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	790	// TIOCSWINSZ is supposed to do this automatically and correctly
763	if (cmd_pid) /* force through to the command */	791	if (cmd_pid) /* force through to the command */
764	kill (-cmd_pid, SIGWINCH);	792	kill (-cmd_pid, SIGWINCH);
765	#endif	793	#endif
766	}	794	}
767		795
…		…
796	delete fontset[0];	824	delete fontset[0];
797	fontset[0] = fs;	825	fontset[0] = fs;
798		826
799	prop = (*fs)[1]->properties ();	827	prop = (*fs)[1]->properties ();
800	prop.height += lineSpace;	828	prop.height += lineSpace;
		829
801	fs->set_prop (prop);	830	fs->set_prop (prop, false);
802		831
803	fwidth = prop.width;	832	fwidth = prop.width;
804	fheight = prop.height;	833	fheight = prop.height;
805	fbase = prop.ascent;	834	fbase = prop.ascent;
806		835
…		…
815	{	844	{
816	fontset[style] = fs = new rxvt_fontset (this);	845	fontset[style] = fs = new rxvt_fontset (this);
817	rxvt_fontprop prop2 = prop;	846	rxvt_fontprop prop2 = prop;
818		847
819	if (res)	848	if (res)
820	prop2.weight = prop2.slant = rxvt_fontprop::unset;	849	{
		850	fs->populate (res);
		851	fs->set_prop (prop2, false);
		852	}
821	else	853	else
822	{	854	{
823	res = fontset[0]->fontdesc;	855	fs->populate (fontset[0]->fontdesc);
824		856
825	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	857	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	858	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		859
		860	fs->set_prop (prop2, true);
827	}	861	}
828		862
829	fs->populate (res);
830	fs->set_prop (prop2);
831	}	863	}
832	#else	864	#else
833	fontset[style] = fontset[0];	865	fontset[style] = fontset[0];
834	#endif	866	#endif
835	}	867	}
…		…
837	if (parent[0])	869	if (parent[0])
838	{	870	{
839	resize_all_windows (0, 0, 0);	871	resize_all_windows (0, 0, 0);
840	scr_remap_chars ();	872	scr_remap_chars ();
841	scr_touch (true);	873	scr_touch (true);
842	}	874	}
843		875
844	return true;	876	return true;
845	}	877	}
846		878
		879	void
847	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	880	rxvt_term::set_string_property (Atom prop, const char *str, int len)
848	{	881	{
849	XChangeProperty (display->display, parent[0],	882	XChangeProperty (dpy, parent[0],
850	prop, XA_STRING, 8, PropModeReplace,	883	prop, XA_STRING, 8, PropModeReplace,
851	(const unsigned char *)str, len >= 0 ? len : strlen (str));	884	(const unsigned char *)str, len >= 0 ? len : strlen (str));
852	}	885	}
853		886
		887	void
854	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	888	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855	{	889	{
856	wchar_t *ws = rxvt_mbstowcs (str, len);	890	wchar_t *ws = rxvt_mbstowcs (str, len);
857	char *s = rxvt_wcstoutf8 (ws);	891	char *s = rxvt_wcstoutf8 (ws);
858		892
859	XChangeProperty (display->display, parent[0],	893	XChangeProperty (dpy, parent[0],
860	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	894	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861	(const unsigned char *)s, strlen (s));	895	(const unsigned char *)s, strlen (s));
862		896
863	free (s);	897	free (s);
864	free (ws);	898	free (ws);
…		…
883	#if ENABLE_EWMH	917	#if ENABLE_EWMH
884	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	918	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885	#endif	919	#endif
886	}	920	}
887		921
		922	void
		923	rxvt_term::set_window_color (int idx, const char *color)
		924	{
888	#ifdef XTERM_COLOR_CHANGE	925	#ifdef XTERM_COLOR_CHANGE
889	void
890	rxvt_term::set_window_color (int idx, const char *color)
891	{
892	rxvt_color xcol;	926	rxvt_color xcol;
893	int i;	927	int i;
894		928
895	if (color == NULL \|\| *color == '\0')	929	if (color == NULL \|\| *color == '\0')
896	return;	930	return;
897		931
		932	color = strdup (color);
		933	allocated.push_back ((void *)color);
		934	rs[Rs_color + idx] = color;
		935
898	/* handle color aliases */	936	/* handle color aliases */
899	if (isdigit (*color))	937	if (isdigit (*color))
900	{	938	{
901	i = atoi (color);	939	i = atoi (color);
902		940
903	if (i >= 8 && i <= 15)	941	if (i >= 8 && i <= 15)
		942	{
904	{ /* bright colors */	943	/* bright colors */
905	i -= 8;
906	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	944	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907	SET_PIXCOLOR (idx);
908	goto done;	945	goto done;
909	}	946	}
910		947
911	if (i >= 0 && i <= 7)	948	if (i >= 0 && i <= 7)
		949	{
912	{ /* normal colors */	950	/* normal colors */
913	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	951	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914	SET_PIXCOLOR (idx);
915	goto done;	952	goto done;
916	}	953	}
917	}	954	}
918		955
919	if (!rXParseAllocColor (&xcol, color))	956	set_color (xcol, color);
920	return;
921
922	/* XStoreColor (display->display, display->cmap, XColor); /
923		957
924	/*	958	/*
925	* FIXME: should free colors here, but no idea how to do it so instead,	959	* FIXME: should free colors here, but no idea how to do it so instead,
926	* so just keep gobbling up the colormap	960	* so just keep gobbling up the colormap
927	*/	961	*/
928	# if 0
929	for (i = Color_Black; i <= Color_White; i++)
930	if (pix_colors[idx] == pix_colors[i])
931	break;
932	if (i > Color_White)
933	{
934	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936	DisplayPlanes (display->display, display->screen));
937	}
938	# endif
939		962
940	pix_colors_focused[idx] = xcol;	963	pix_colors_focused[idx] = xcol;
941	SET_PIXCOLOR (idx);
942		964
943	/* XSetWindowAttributes attr; */
944	/* Cursor cursor; */
945	done:	965	done:
946
947	#if OFF_FOCUS_FADING
948	if (rs[Rs_fade])
949	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950	#endif
951
952	/TODO: handle Color_BD, scrollbar background, etc. /	966	/TODO: handle Color_BD, scrollbar background, etc. /
953		967
		968	update_fade_color (idx);
954	recolour_cursor ();	969	recolour_cursor ();
955	scr_recolour ();	970	scr_recolour ();
		971	#endif /* XTERM_COLOR_CHANGE */
956	}	972	}
957
958	#else
959	# define set_window_color (idx,color) ((void)0)
960	#endif /* XTERM_COLOR_CHANGE */
961		973
962	void	974	void
963	rxvt_term::recolour_cursor ()	975	rxvt_term::recolour_cursor ()
964	{	976	{
965	XColor xcol[2];	977	XColor fg, bg;
966		978
967	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	979	(ISSET_PIXCOLOR (Color_pointer_fg)
968	? pix_colors_focused[Color_pointer_fg]	980	? pix_colors_focused[Color_pointer_fg]
969	: pix_colors_focused[Color_fg];	981	: pix_colors_focused[Color_fg]).get (fg);
		982
970	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	983	(ISSET_PIXCOLOR (Color_pointer_bg)
971	? pix_colors_focused[Color_pointer_bg]	984	? pix_colors_focused[Color_pointer_bg]
972	: pix_colors_focused[Color_bg];	985	: pix_colors_focused[Color_bg]).get (bg);
973		986
974	XQueryColors (display->display, display->cmap, xcol, 2);	987	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976	}	988	}
977		989
978	/----------------------------------------------------------------------/	990	/----------------------------------------------------------------------/
979	/*	991	/*
980	* find if fg/bg matches any of the normal (low-intensity) colors	992	* find if fg/bg matches any of the normal (low-intensity) colors
981	*/	993	*/
982	void	994	void
983	rxvt_term::set_colorfgbg ()	995	rxvt_term::set_colorfgbg ()
984	{	996	{
985	unsigned int i;	997	unsigned int i;
986	const char *xpmb = "\0";	998	const char *xpmb = "";
987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	999	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988		1000
989	strcpy (fstr, "default");	1001	strcpy (fstr, "default");
990	strcpy (bstr, "default");	1002	strcpy (bstr, "default");
991	for (i = Color_Black; i <= Color_White; i++)	1003	for (i = Color_Black; i <= Color_White; i++)
…		…
997		1009
998	for (i = Color_Black; i <= Color_White; i++)	1010	for (i = Color_Black; i <= Color_White; i++)
999	if (pix_colors[Color_bg] == pix_colors[i])	1011	if (pix_colors[Color_bg] == pix_colors[i])
1000	{	1012	{
1001	sprintf (bstr, "%d", (i - Color_Black));	1013	sprintf (bstr, "%d", (i - Color_Black));
1002	#ifdef XPM_BACKGROUND	1014	#ifdef BG_IMAGE_FROM_FILE
1003	xpmb = "default;";	1015	xpmb = "default;";
1004	#endif	1016	#endif
1005	break;	1017	break;
1006	}	1018	}
1007		1019
1008	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1020	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009	}	1021	}
1010		1022
1011	/----------------------------------------------------------------------/	1023	/----------------------------------------------------------------------/
1012		1024
1013	int	1025	bool
1014	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1026	rxvt_term::set_color (rxvt_color &color, const char *name)
1015	{	1027	{
1016	if (!screen_in_out->set (display, colour))	1028	if (color.set (this, name))
1017	{
1018	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019	return false;
1020	}
1021
1022	return true;	1029	return true;
		1030
		1031	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1032	return false;
		1033	}
		1034
		1035	void
		1036	rxvt_term::alias_color (int dst, int src)
		1037	{
		1038	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023	}	1039	}
1024		1040
1025	/* -------------------------------------------------------------------- *	1041	/* -------------------------------------------------------------------- *
1026	* - WINDOW RESIZING - *	1042	* - WINDOW RESIZING - *
1027	* -------------------------------------------------------------------- */	1043	* -------------------------------------------------------------------- */
…		…
1029	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1045	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030	{	1046	{
1031	int fix_screen;	1047	int fix_screen;
1032	int old_width = szHint.width;	1048	int old_width = szHint.width;
1033	int old_height = szHint.height;	1049	int old_height = szHint.height;
1034	dDisp;
1035		1050
1036	window_calc (newwidth, newheight);	1051	window_calc (newwidth, newheight);
		1052
		1053	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037	XSetWMNormalHints (disp, parent[0], &szHint);	1054	XSetWMNormalHints (dpy, parent[0], &szHint);
1038		1055
1039	if (!ignoreparent)	1056	if (!ignoreparent)
1040	{	1057	{
1041	#ifdef SMART_RESIZE	1058	#ifdef SMART_RESIZE
1042	/*	1059	/*
…		…
1046	int x, y, x1, y1;	1063	int x, y, x1, y1;
1047	int dx, dy;	1064	int dx, dy;
1048	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1065	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049	Window unused_cr;	1066	Window unused_cr;
1050		1067
1051	XTranslateCoordinates (disp, parent[0], display->root,	1068	XTranslateCoordinates (dpy, parent[0], display->root,
1052	0, 0, &x, &y, &unused_cr);	1069	0, 0, &x, &y, &unused_cr);
1053	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1070	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1071	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055	/*	1072	/*
1056	* if display->root isn't the parent window, a WM will probably have offset	1073	* if display->root isn't the parent window, a WM will probably have offset
1057	* our position for handles and decorations. Counter it	1074	* our position for handles and decorations. Counter it
1058	*/	1075	*/
…		…
1060	{	1077	{
1061	x -= x1;	1078	x -= x1;
1062	y -= y1;	1079	y -= y1;
1063	}	1080	}
1064		1081
1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;	1082	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1083	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067	dx = old_width - szHint.width;	1084	dx = old_width - szHint.width;
1068	dy = old_height - szHint.height;	1085	dy = old_height - szHint.height;
1069		1086
1070	/* Check position of the center of the window */	1087	/* Check position of the center of the window */
1071	if (x < x1) /* left half */	1088	if (x < x1) /* left half */
…		…
1075	if (y < y1) /* top half */	1092	if (y < y1) /* top half */
1076	dy = 0;	1093	dy = 0;
1077	else if (y == y1) /* exact center */	1094	else if (y == y1) /* exact center */
1078	dy /= 2;	1095	dy /= 2;
1079		1096
1080	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1097	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081	szHint.width, szHint.height);	1098	szHint.width, szHint.height);
1082	#else	1099	#else
1083	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1100	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084	#endif	1101	#endif
1085	}	1102	}
1086		1103
1087	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1104	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1088		1105
1089	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1106	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1090	{	1107	{
1091	if (scrollBar.state)	1108	if (scrollBar.state)
1092	{	1109	{
1093	XMoveResizeWindow (disp, scrollBar.win,	1110	XMoveResizeWindow (dpy, scrollBar.win,
1094	window_sb_x, 0,	1111	window_sb_x, 0,
1095	scrollbar_TotalWidth (), szHint.height);	1112	scrollbar_TotalWidth (), szHint.height);
1096	resize_scrollbar ();	1113	resize_scrollbar ();
1097	}	1114	}
1098		1115
1099	XMoveResizeWindow (disp, vt,	1116	XMoveResizeWindow (dpy, vt,
1100	window_vt_x, window_vt_y,	1117	window_vt_x, window_vt_y,
1101	width, height);	1118	width, height);
1102		1119
		1120	#ifdef HAVE_BG_PIXMAP
		1121	if (bgPixmap.window_size_sensitive ())
		1122	update_background ();
		1123	#endif
		1124
1103	scr_clear ();	1125	scr_clear ();
1104	#ifdef XPM_BACKGROUND
1105	resize_pixmap ();
1106	#endif
1107	}	1126	}
1108		1127
1109	if (fix_screen \|\| old_height == 0)	1128	if (fix_screen \|\| old_height == 0)
1110	scr_reset ();	1129	scr_reset ();
1111		1130
1112	#ifdef XPM_BACKGROUND	1131	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113	if (pixmap)	1132	//scr_touch (false);
		1133
		1134	#ifdef HAVE_BG_PIXMAP
		1135	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1136	// if (bgPixmap.pixmap)
1114	scr_touch (false);	1137	// scr_touch (false);
1115	#endif	1138	#endif
1116		1139
1117	#ifdef USE_XIM	1140	#ifdef USE_XIM
1118	IMSetStatusPosition ();	1141	IMSetPosition ();
1119	#endif	1142	#endif
1120	}	1143	}
1121		1144
1122	/*	1145	/*
1123	* Set the width/height of the vt window in characters. Units are pixels.	1146	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1128	{	1151	{
1129	XWindowAttributes wattr;	1152	XWindowAttributes wattr;
1130		1153
1131	if (newwidth == 0 \|\| newheight == 0)	1154	if (newwidth == 0 \|\| newheight == 0)
1132	{	1155	{
1133	XGetWindowAttributes (display->display, display->root, &wattr);	1156	XGetWindowAttributes (dpy, display->root, &wattr);
1134		1157
1135	if (newwidth == 0)	1158	if (newwidth == 0)
1136	newwidth = wattr.width - szHint.base_width;	1159	newwidth = wattr.width - szHint.base_width;
1137	if (newheight == 0)	1160	if (newheight == 0)
1138	newheight = wattr.height - szHint.base_height;	1161	newheight = wattr.height - szHint.base_height;
…		…
1152	#ifdef USE_XIM	1175	#ifdef USE_XIM
1153		1176
1154	void	1177	void
1155	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1178	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156	{	1179	{
1157	fg = pix_colors[Color_fg];	1180	fg = pix_colors [Color_fg];
1158	bg = pix_colors[Color_bg];	1181	bg = pix_colors [Color_bg];
1159	}	1182	}
1160		1183
1161	void	1184	void
1162	rxvt_term::im_set_size (XRectangle &size)	1185	rxvt_term::im_set_size (XRectangle &size)
1163	{	1186	{
…		…
1200	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1223	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201		1224
1202	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1225	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203	*p = '\0';	1226	*p = '\0';
1204		1227
1205	atom = XInternAtom (display->display, server, False);	1228	atom = XInternAtom (dpy, server, False);
1206	win = XGetSelectionOwner (display->display, atom);	1229	win = XGetSelectionOwner (dpy, atom);
1207		1230
1208	if (win != None)	1231	if (win != None)
1209	return True;	1232	return True;
1210	}	1233	}
1211		1234
…		…
1290	if (term->rs[Rs_imLocale])	1313	if (term->rs[Rs_imLocale])
1291	SET_LOCALE (term->locale);	1314	SET_LOCALE (term->locale);
1292	}	1315	}
1293	else	1316	else
1294	str = (void *)text->string.wide_char;	1317	str = (void *)text->string.wide_char;
1295		1318
1296	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1319	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297	DT_INT, call_data->caret,	1320	DT_INT, call_data->caret,
1298	DT_INT, call_data->chg_first,	1321	DT_INT, call_data->chg_first,
1299	DT_INT, call_data->chg_length,	1322	DT_INT, call_data->chg_length,
1300	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1323	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1435	"*",	1458	"*",
1436	fheight,	1459	fheight,
1437	fheight + 1, fheight - 1,	1460	fheight + 1, fheight - 1,
1438	fheight - 2, fheight + 2);	1461	fheight - 2, fheight + 2);
1439		1462
1440	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1463	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441	&missing_charset_list, &missing_charset_count, &def_string);	1464	&missing_charset_list, &missing_charset_count, &def_string);
1442		1465
1443	if (missing_charset_list)	1466	if (missing_charset_list)
1444	XFreeStringList (missing_charset_list);	1467	XFreeStringList (missing_charset_list);
1445		1468
…		…
1520	preedit_attr,	1543	preedit_attr,
1521	status_attr ? XNStatusAttributes : NULL,	1544	status_attr ? XNStatusAttributes : NULL,
1522	status_attr, NULL);	1545	status_attr, NULL);
1523		1546
1524	if (preedit_attr) XFree (preedit_attr);	1547	if (preedit_attr) XFree (preedit_attr);
1525	if (status_attr) XFree (status_attr);	1548	if (status_attr) XFree (status_attr);
1526	if (fs) XFreeFontSet (display->display, fs);	1549	if (fs) XFreeFontSet (dpy, fs);
1527		1550
1528	if (Input_Context == NULL)	1551	if (Input_Context == NULL)
1529	{	1552	{
1530	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1553	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531	im_destroy ();	1554	im_destroy ();
…		…
1536	// unfortunately, only the focus window is used by XIM, hard to fix	1559	// unfortunately, only the focus window is used by XIM, hard to fix
1537	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1560	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538	vt_select_input ();	1561	vt_select_input ();
1539	#endif	1562	#endif
1540		1563
1541	if (input_style & XIMPreeditArea)
1542	IMSetStatusPosition ();	1564	IMSetPosition ();
1543		1565
1544	return true;	1566	return true;
1545	}	1567	}
1546		1568
1547	void	1569	void
…		…
1605	SET_LOCALE (locale);	1627	SET_LOCALE (locale);
1606	#endif	1628	#endif
1607	}	1629	}
1608		1630
1609	void	1631	void
1610	rxvt_term::IMSetStatusPosition ()	1632	rxvt_term::IMSetPosition ()
1611	{	1633	{
1612	XRectangle preedit_rect, status_rect, *needed_rect;	1634	XRectangle preedit_rect, status_rect, *needed_rect;
1613	XVaNestedList preedit_attr, status_attr;	1635	XVaNestedList preedit_attr, status_attr;
1614		1636
1615	if (!Input_Context	1637	if (!Input_Context
1616	\|\| !focus	1638	\|\| !focus
1617	\|\| !(input_style & XIMPreeditArea)	1639	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1618	\|\| !IMisRunning ())	1640	\|\| !IMisRunning ())
1619	return;	1641	return;
1620		1642
		1643	if (input_style & XIMPreeditPosition)
		1644	{
		1645	im_set_size (preedit_rect);
		1646	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1647
		1648	XSetICValues (Input_Context,
		1649	XNPreeditAttributes, preedit_attr, NULL);
		1650	}
		1651	else
		1652	{
1621	/* Getting the necessary width of preedit area */	1653	/* Getting the necessary width of preedit area */
1622	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1654	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1655	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624	XFree (status_attr);	1656	XFree (status_attr);
1625		1657
1626	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1658	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627	XFree (needed_rect);	1659	XFree (needed_rect);
1628		1660
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1661	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1662	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631		1663
1632	XSetICValues (Input_Context,	1664	XSetICValues (Input_Context,
1633	XNPreeditAttributes, preedit_attr,	1665	XNPreeditAttributes, preedit_attr,
1634	XNStatusAttributes, status_attr, NULL);	1666	XNStatusAttributes, status_attr,
		1667	NULL);
1635		1668
		1669	XFree (status_attr);
		1670	}
		1671
1636	XFree (preedit_attr);	1672	XFree (preedit_attr);
1637	XFree (status_attr);
1638	}	1673	}
1639	#endif /* USE_XIM */	1674	#endif /* USE_XIM */
		1675
		1676	void
		1677	rxvt_term::get_window_origin (int &x, int &y)
		1678	{
		1679	Window cr;
		1680	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1681	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1682	}
		1683
		1684	Pixmap
		1685	rxvt_term::get_pixmap_property (int prop_id)
		1686	{
		1687	if (prop_id > 0 && prop_id < NUM_XA)
		1688	if (xa[prop_id])
		1689	{
		1690	int aformat;
		1691	unsigned long nitems, bytes_after;
		1692	Atom atype;
		1693	unsigned char *prop = NULL;
		1694	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1695	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1696	&nitems, &bytes_after, &prop);
		1697	if (result == Success && prop && atype == XA_PIXMAP)
		1698	return (Pixmap )prop;
		1699	}
		1700
		1701	return None;
		1702	}
		1703
		1704	#ifdef HAVE_BG_PIXMAP
		1705	# if TRACE_PIXMAPS
		1706	# undef update_background
		1707	void
		1708	rxvt_term::trace_update_background (const char *file, int line)
		1709	{
		1710	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1711	update_background ();
		1712	}
		1713	# endif
		1714
		1715	void
		1716	rxvt_term::update_background ()
		1717	{
		1718	if (update_background_ev.is_active ())
		1719	return;
		1720
		1721	bgPixmap.invalidate ();
		1722
		1723	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1724
		1725	if (to_wait <= 0.)
		1726	bgPixmap.render ();
		1727	else
		1728	update_background_ev.start (to_wait);
		1729	}
		1730
		1731	void
		1732	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1733	{
		1734	make_current ();
		1735
		1736	update_background_ev.stop ();
		1737	bgPixmap.render ();
		1738	refresh_check ();
		1739	}
		1740
		1741	#endif /* HAVE_BG_PIXMAP */
1640		1742
1641	/----------------------- end-of-file (C source) -----------------------/	1743	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC vs. Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC