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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.244 by sasha, Fri Aug 17 22:01:32 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC

…		…
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-2008 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"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	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)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		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
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),
161	#endif
162	#ifdef CURSOR_BLINK
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	201	#endif
202	}	202	}
203		203
204	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
206	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
207	{	208	{
208	if (cmd_pid)	209	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
210		211
211	pty_ev.stop ();	212	pty_ev.stop ();
…		…
223	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
224	delete fontset[i];	225	delete fontset[i];
225	#endif	226	#endif
226	delete fontset[0];	227	delete fontset[0];
227		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
228	if (display)	233	if (display)
229	{	234	{
230	selection_clear ();	235	selection_clear ();
231		236
232	#ifdef USE_XIM	237	#ifdef USE_XIM
233	im_destroy ();	238	im_destroy ();
234	#endif	239	#endif
235	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
236	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237	if (ShadowGC) XFreeGC (dpy, ShadowGC);
238	#endif
239	#ifdef PLAIN_SCROLLBAR
240	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241	#endif
242	#ifdef NEXT_SCROLLBAR
243	if (blackGC) XFreeGC (dpy, blackGC);
244	if (whiteGC) XFreeGC (dpy, whiteGC);
245	if (grayGC) XFreeGC (dpy, grayGC);
246	if (darkGC) XFreeGC (dpy, darkGC);
247	if (stippleGC) XFreeGC (dpy, stippleGC);
248	if (dimple) XFreePixmap (dpy, dimple);
249	if (upArrow) XFreePixmap (dpy, upArrow);
250	if (downArrow) XFreePixmap (dpy, downArrow);
251	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253	#endif
254	#ifdef RXVT_SCROLLBAR
255	if (topShadowGC) XFreeGC (dpy, topShadowGC);
256	if (botShadowGC) XFreeGC (dpy, botShadowGC);
257	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258	#endif
259	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
260		242
261	delete drawable;	243	delete drawable;
262	// destroy all windows	244	// destroy all windows
263	if (parent[0])	245	if (parent[0])
…		…
271	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
272	#endif	254	#endif
273	}	255	}
274		256
275	clear ();	257	clear ();
276	}
277		258
278	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	260	displays.put (display);
		261	}
284		262
285	scr_release ();	263	scr_release ();
286		264
287	/* clear all resources */	265	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
300	delete argv;	278	delete argv;
301		279
302	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	281	delete keyboard;
304	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
305	}	286	}
306		287
307	// child has exited, usually destroys	288	// child has exited, usually destroys
308	void	289	void
309	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
310	{	291	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		293
313	cmd_pid = 0;	294	cmd_pid = 0;
314		295
…		…
317	}	298	}
318		299
319	void	300	void
320	rxvt_term::destroy ()	301	rxvt_term::destroy ()
321	{	302	{
322	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
323	return;	304	return;
324		305
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		307
327	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
331	if (display)	312	if (display)
332	{	313	{
333	#if USE_XIM	314	#if USE_XIM
334	im_ev.stop (display);	315	im_ev.stop (display);
335	#endif	316	#endif
336	#if HAVE_SCROLLBARS
337	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
338	#endif
339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
340	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
341	#endif	320	#endif
342	incr_ev.stop ();	321	incr_ev.stop ();
343	termwin_ev.stop (display);	322	termwin_ev.stop (display);
344	vt_ev.stop (display);	323	vt_ev.stop (display);
345	}	324	}
346		325
347	check_ev.stop ();	326	flush_ev.stop ();
348	pty_ev.stop ();	327	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
351	#endif	330	#endif
352	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
360	#endif	339	#endif
361	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	341	pointer_ev.stop ();
363	#endif	342	#endif
364		343
365	destroy_ev.start (0);	344	destroy_ev.start ();
366	}	345	}
367		346
368	void	347	void
369	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	349	{
371	make_current ();	350	make_current ();
372		351
373	delete this;	352	delete this;
374	}	353	}
…		…
428	else	407	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	409	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	411	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	413	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	415	}
437	#endif	416	#endif
438		417
…		…
462	DisplayString (display));	441	DisplayString (display));
463	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
465	}	444	}
466		445
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{
471	this->envv = envv;
472
473	SET_R (this);
474	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(
476
477	if (!init_vars ())
478	return false;
479
480	init_secondary ();
481
482	const char **cmd_argv = init_resources (argc, argv);
483
484	#ifdef KEYSYM_RESOURCE
485	keyboard->register_done ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
490	scrollBar.setIdle (); /* set existence for size calculations */
491	#endif
492
493	pty = ptytty::create ();
494
495	create_windows (argc, argv);
496
497	init_xlocale ();
498
499	scr_reset (); // initialize screen
500
501	#if 0
502	XSynchronize (dpy, True);
503	#endif
504
505	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */
508	#endif
509	#ifdef HAVE_BG_PIXMAP
510	{
511	bgPixmap.set_target (this);
512
513	#ifdef ENABLE_TRANSPARENCY
514	if (option (Opt_transparent))
515	{
516	bgPixmap.set_transparent ();
517	#ifdef HAVE_AFTERIMAGE
518	if (rs [Rs_blurradius])
519	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520	#endif
521	if (ISSET_PIXCOLOR (Color_tint))
522	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523	if (rs [Rs_shade])
524	bgPixmap.set_shade (rs [Rs_shade]);
525
526	bgPixmap.set_root_pixmap ();
527	XSelectInput (dpy, display->root, PropertyChangeMask);
528	rootwin_ev.start (display, display->root);
529	}
530	#endif
531
532	#ifdef XPM_BACKGROUND
533	if (rs[Rs_backgroundPixmap] != NULL)
534	{
535	const char *p = rs[Rs_backgroundPixmap];
536
537	if ((p = strchr (p, ';')) != NULL)
538	{
539	p++;
540	bgPixmap.set_geometry (p);
541	}
542	else
543	bgPixmap.set_defaultGeometry ();
544
545	bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546	}
547	/* do not want to render Pixmap yet if we are size/position dependant -
548	* wait for ConfigureNotify at least
549	* TODO: this does not work for some reason when transparency is disabled !!!!
550	*/
551	if (!bgPixmap.window_size_sensitive ())
552	update_background();
553	#endif
554	}
555	#endif
556
557	#if ENABLE_PERL
558	rootwin_ev.start (display, display->root);
559	#endif
560
561	set_colorfgbg ();
562
563	init_command (cmd_argv);
564
565	free (cmd_argv);
566
567	if (pty->pty >= 0)
568	pty_ev.start (pty->pty, EVENT_READ);
569
570	check_ev.start ();
571
572	HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574	#if ENABLE_XEMBED
575	if (rs[Rs_embed])
576	{
577	long info[2] = { 0, XEMBED_MAPPED };
578
579	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580	32, PropModeReplace, (unsigned char *)&info, 2);
581	}
582	#endif
583
584	XMapWindow (dpy, vt);
585	XMapWindow (dpy, parent[0]);
586
587	return true;
588	}
589
590	static struct sig_handlers	446	static struct sig_handlers
591	{	447	{
592	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
593		449
594	/*	450	/*
595	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
596	*/	452	*/
597	void	453	void sig_term (ev::sig &w, int revents);
598	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
599	{	456	{
600	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
601	signal (w.signum, SIG_DFL);
602	kill (getpid (), w.signum);
603	}
604
605	sig_handlers ()
606	: sw_term (this, &sig_handlers::sig_term),
607	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
608	{
609	}	459	}
610	} sig_handlers;	460	} sig_handlers;
611		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
612	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
613		471
614	void	472	void
615	rxvt_init ()	473	rxvt_init ()
616	{	474	{
617	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
618		479
619	rxvt_environ = environ;	480	rxvt_environ = environ;
620		481
621	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
622	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
623		484
624	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
625	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
626		487
627	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
628	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
629		490
630	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
631	// TODO: handle this with exceptions and tolerate the memory loss	492	// TODO: handle this with exceptions and tolerate the memory loss
632	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
633		494
634	XrmInitialize ();	495	XrmInitialize ();
635	}
636
637	/* ------------------------------------------------------------------------- *
638	* MEMORY ALLOCATION WRAPPERS *
639	* ------------------------------------------------------------------------- */
640	void *
641	rxvt_malloc (size_t size)
642	{
643	void *p = malloc (size);
644
645	if (!p)
646	rxvt_fatal ("memory allocation failure. aborting.\n");
647
648	return p;
649	}
650
651	void *
652	rxvt_calloc (size_t number, size_t size)
653	{
654	void *p = calloc (number, size);
655
656	if (!p)
657	rxvt_fatal ("memory allocation failure. aborting.\n");
658
659	return p;
660	}
661
662	void *
663	rxvt_realloc (void *ptr, size_t size)
664	{
665	void *p = realloc (ptr, size);
666
667	if (!p)
668	rxvt_fatal ("memory allocation failure. aborting.\n");
669
670	return p;
671	}	496	}
672		497
673	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
674	/*	499	/*
675	* window size/position calculations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
…		…
677	*/	502	*/
678	void	503	void
679	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
680	{	505	{
681	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
682	int x, y, sb_w, flags;	507	int x, y, flags;
683	unsigned int w, h;	508	unsigned int w, h;
684	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
685		510
686	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
687	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
697	if (rs[Rs_geometry])	522	if (rs[Rs_geometry])
698	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
699		524
700	if (flags & WidthValue)	525	if (flags & WidthValue)
701	{	526	{
		527	if (!w)
		528	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		529
702	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	530	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
703	szHint.flags \|= USSize;	531	szHint.flags \|= USSize;
704	}	532	}
705		533
706	if (flags & HeightValue)	534	if (flags & HeightValue)
707	{	535	{
		536	if (!h)
		537	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		538
708	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	539	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
709	szHint.flags \|= USSize;	540	szHint.flags \|= USSize;
710	}	541	}
711		542
712	if (flags & XValue)	543	if (flags & XValue)
713	{	544	{
…		…
744	max_width = MAX_COLS * fwidth;	575	max_width = MAX_COLS * fwidth;
745	max_height = MAX_ROWS * fheight;	576	max_height = MAX_ROWS * fheight;
746		577
747	szHint.base_width = szHint.base_height = 2 * int_bwidth;	578	szHint.base_width = szHint.base_height = 2 * int_bwidth;
748		579
749	sb_w = 0;
750	window_vt_x = window_vt_y = int_bwidth;	580	window_vt_x = window_vt_y = int_bwidth;
751		581
752	if (scrollBar.state)	582	if (scrollBar.state)
753	{	583	{
754	sb_w = scrollbar_TotalWidth ();	584	int sb_w = scrollBar.total_width ();
755	szHint.base_width += sb_w;	585	szHint.base_width += sb_w;
756		586
757	if (!option (Opt_scrollBar_right))	587	if (!option (Opt_scrollBar_right))
758	window_vt_x += sb_w;	588	window_vt_x += sb_w;
759	}	589	}
…		…
782	else	612	else
783	{	613	{
784	min_it (height, max_height);	614	min_it (height, max_height);
785	szHint.height = szHint.base_height + height;	615	szHint.height = szHint.base_height + height;
786	}	616	}
787
788	if (scrollBar.state && option (Opt_scrollBar_right))
789	window_sb_x = szHint.width - sb_w;
790		617
791	if (recalc_x)	618	if (recalc_x)
792	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793		620
794	if (recalc_y)	621	if (recalc_y)
…		…
816	ws.ws_xpixel = width;	643	ws.ws_xpixel = width;
817	ws.ws_ypixel = height;	644	ws.ws_ypixel = height;
818	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	645	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
819		646
820	#if 0	647	#if 0
821	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	648	// TIOCSWINSZ is supposed to do this automatically and correctly
822	if (cmd_pid) /* force through to the command */	649	if (cmd_pid) /* force through to the command */
823	kill (-cmd_pid, SIGWINCH);	650	kill (-cmd_pid, SIGWINCH);
824	#endif	651	#endif
825	}	652	}
826		653
…		…
900	if (parent[0])	727	if (parent[0])
901	{	728	{
902	resize_all_windows (0, 0, 0);	729	resize_all_windows (0, 0, 0);
903	scr_remap_chars ();	730	scr_remap_chars ();
904	scr_touch (true);	731	scr_touch (true);
905	}	732	}
906		733
907	return true;	734	return true;
908	}	735	}
909		736
		737	void
910	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	738	rxvt_term::set_string_property (Atom prop, const char *str, int len)
911	{	739	{
912	XChangeProperty (dpy, parent[0],	740	XChangeProperty (dpy, parent[0],
913	prop, XA_STRING, 8, PropModeReplace,	741	prop, XA_STRING, 8, PropModeReplace,
914	(const unsigned char *)str, len >= 0 ? len : strlen (str));	742	(const unsigned char *)str, len >= 0 ? len : strlen (str));
915	}	743	}
916		744
		745	void
917	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	746	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918	{	747	{
919	wchar_t *ws = rxvt_mbstowcs (str, len);	748	wchar_t *ws = rxvt_mbstowcs (str, len);
920	char *s = rxvt_wcstoutf8 (ws);	749	char *s = rxvt_wcstoutf8 (ws);
921		750
922	XChangeProperty (dpy, parent[0],	751	XChangeProperty (dpy, parent[0],
…		…
946	#if ENABLE_EWMH	775	#if ENABLE_EWMH
947	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	776	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948	#endif	777	#endif
949	}	778	}
950		779
		780	void
		781	rxvt_term::set_window_color (int idx, const char *color)
		782	{
951	#ifdef XTERM_COLOR_CHANGE	783	#ifdef XTERM_COLOR_CHANGE
952	void
953	rxvt_term::set_window_color (int idx, const char *color)
954	{
955	rxvt_color xcol;	784	rxvt_color xcol;
956	int i;	785
957
958	if (color == NULL \|\| *color == '\0')	786	if (color == NULL \|\| *color == '\0')
959	return;	787	return;
960		788
961	color = strdup (color);	789	color = strdup (color);
962	allocated.push_back ((void *)color);	790	allocated.push_back ((void *)color);
963	rs[Rs_color + idx] = color;	791	rs[Rs_color + idx] = color;
964		792
965	/* handle color aliases */	793	/* handle color aliases */
966	if (isdigit (*color))	794	if (isdigit (*color))
967	{	795	{
968	i = atoi (color);	796	int i = atoi (color);
969		797
970	if (i >= 8 && i <= 15)	798	if (i >= 8 && i <= 15)
		799	{
971	{ /* bright colors */	800	/* bright colors */
972	i -= 8;
973	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	801	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
974	goto done;	802	goto done;
975	}	803	}
976		804
977	if (i >= 0 && i <= 7)	805	if (i >= 0 && i <= 7)
		806	{
978	{ /* normal colors */	807	/* normal colors */
979	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	808	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
980	goto done;	809	goto done;
981	}	810	}
982	}	811	}
983		812
…		…
988	* so just keep gobbling up the colormap	817	* so just keep gobbling up the colormap
989	*/	818	*/
990		819
991	pix_colors_focused[idx] = xcol;	820	pix_colors_focused[idx] = xcol;
992		821
993	/* XSetWindowAttributes attr; */
994	/* Cursor cursor; */
995	done:	822	done:
996	/TODO: handle Color_BD, scrollbar background, etc. /	823	/TODO: handle Color_BD, scrollbar background, etc. /
997		824
998	update_fade_color (idx);	825	update_fade_color (idx);
999	recolour_cursor ();	826	recolour_cursor ();
1000	scr_recolour ();	827	scr_recolour ();
		828	#endif /* XTERM_COLOR_CHANGE */
1001	}	829	}
1002
1003	#else
1004	# define set_window_color (idx,color) ((void)0)
1005	#endif /* XTERM_COLOR_CHANGE */
1006		830
1007	void	831	void
1008	rxvt_term::recolour_cursor ()	832	rxvt_term::recolour_cursor ()
1009	{	833	{
1010	XColor fg, bg;	834	XColor fg, bg;
…		…
1026	*/	850	*/
1027	void	851	void
1028	rxvt_term::set_colorfgbg ()	852	rxvt_term::set_colorfgbg ()
1029	{	853	{
1030	unsigned int i;	854	unsigned int i;
1031	const char *xpmb = "\0";	855	const char *xpmb = "";
1032	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	856	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1033		857
1034	strcpy (fstr, "default");	858	strcpy (fstr, "default");
1035	strcpy (bstr, "default");	859	strcpy (bstr, "default");
1036	for (i = Color_Black; i <= Color_White; i++)	860	for (i = Color_Black; i <= Color_White; i++)
…		…
1042		866
1043	for (i = Color_Black; i <= Color_White; i++)	867	for (i = Color_Black; i <= Color_White; i++)
1044	if (pix_colors[Color_bg] == pix_colors[i])	868	if (pix_colors[Color_bg] == pix_colors[i])
1045	{	869	{
1046	sprintf (bstr, "%d", (i - Color_Black));	870	sprintf (bstr, "%d", (i - Color_Black));
1047	#ifdef XPM_BACKGROUND	871	#ifdef BG_IMAGE_FROM_FILE
1048	xpmb = "default;";	872	xpmb = "default;";
1049	#endif	873	#endif
1050	break;	874	break;
1051	}	875	}
1052		876
…		…
1137	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1138		962
1139	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1140	{	964	{
1141	if (scrollBar.state)	965	if (scrollBar.state)
1142	{	966	scrollBar.resize ();
1143	XMoveResizeWindow (dpy, scrollBar.win,
1144	window_sb_x, 0,
1145	scrollbar_TotalWidth (), szHint.height);
1146	resize_scrollbar ();
1147	}
1148		967
1149	XMoveResizeWindow (dpy, vt,	968	XMoveResizeWindow (dpy, vt,
1150	window_vt_x, window_vt_y,	969	window_vt_x, window_vt_y,
1151	width, height);	970	width, height);
1152		971
1153	#ifdef XPM_BACKGROUND	972	#ifdef HAVE_BG_PIXMAP
1154	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155	if (bgPixmap.window_size_sensitive ())	973	if (bgPixmap.window_size_sensitive ())
1156	update_background ();	974	update_background ();
1157	#endif	975	#endif
1158		976
1159	scr_clear ();	977	scr_clear ();
1160	}	978	}
1161		979
…		…
1347	if (term->rs[Rs_imLocale])	1165	if (term->rs[Rs_imLocale])
1348	SET_LOCALE (term->locale);	1166	SET_LOCALE (term->locale);
1349	}	1167	}
1350	else	1168	else
1351	str = (void *)text->string.wide_char;	1169	str = (void *)text->string.wide_char;
1352		1170
1353	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1171	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354	DT_INT, call_data->caret,	1172	DT_INT, call_data->caret,
1355	DT_INT, call_data->chg_first,	1173	DT_INT, call_data->chg_first,
1356	DT_INT, call_data->chg_length,	1174	DT_INT, call_data->chg_length,
1357	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1175	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1676		1494
1677	if (input_style & XIMPreeditPosition)	1495	if (input_style & XIMPreeditPosition)
1678	{	1496	{
1679	im_set_size (preedit_rect);	1497	im_set_size (preedit_rect);
1680	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1498	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681		1499
1682	XSetICValues (Input_Context,	1500	XSetICValues (Input_Context,
1683	XNPreeditAttributes, preedit_attr, NULL);	1501	XNPreeditAttributes, preedit_attr, NULL);
1684	}	1502	}
1685	else	1503	else
1686	{	1504	{
…		…
1703	XFree (status_attr);	1521	XFree (status_attr);
1704	}	1522	}
1705		1523
1706	XFree (preedit_attr);	1524	XFree (preedit_attr);
1707	}	1525	}
1708	#endif /* USE_XIM */	1526	#endif /* USE_XIM */
		1527
		1528	void
		1529	rxvt_term::get_window_origin (int &x, int &y)
		1530	{
		1531	Window cr;
		1532	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1533	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1534	}
		1535
		1536	Pixmap
		1537	rxvt_term::get_pixmap_property (int prop_id)
		1538	{
		1539	if (prop_id > 0 && prop_id < NUM_XA)
		1540	if (xa[prop_id])
		1541	{
		1542	int aformat;
		1543	unsigned long nitems, bytes_after;
		1544	Atom atype;
		1545	unsigned char *prop = NULL;
		1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1548	&nitems, &bytes_after, &prop);
		1549	if (result == Success && prop && atype == XA_PIXMAP)
		1550	return (Pixmap )prop;
		1551	}
		1552
		1553	return None;
		1554	}
		1555
		1556	#ifdef HAVE_BG_PIXMAP
		1557	# if TRACE_PIXMAPS
		1558	# undef update_background
		1559	void
		1560	rxvt_term::trace_update_background (const char *file, int line)
		1561	{
		1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1563	update_background ();
		1564	}
		1565	# endif
		1566
		1567	void
		1568	rxvt_term::update_background ()
		1569	{
		1570	if (update_background_ev.is_active ())
		1571	return;
		1572
		1573	bgPixmap.invalidate ();
		1574
		1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1576
		1577	if (to_wait <= 0.)
		1578	bgPixmap.render ();
		1579	else
		1580	update_background_ev.start (to_wait);
		1581	}
		1582
		1583	void
		1584	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1585	{
		1586	make_current ();
		1587
		1588	update_background_ev.stop ();
		1589	bgPixmap.render ();
		1590	refresh_check ();
		1591	}
		1592
		1593	#endif /* HAVE_BG_PIXMAP */
1709		1594
1710	/----------------------- end-of-file (C source) -----------------------/	1595	/----------------------- 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.244 by sasha, Fri Aug 17 22:01:32 2007 UTC vs. Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.244 by sasha, Fri Aug 17 22:01:32 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC