pekwm - commit ee68c56627c537cdff047fd4301231e81678cfaf

Claes Nästén
2008-02-15 14:17 ee68c..8cfaf

Re-indent and minor testing of pekwm::manager.

    Re-indent to a line width of 112 instead of 80, caused most log messages to
    fit on one line.
    
    Added x11::window:map_all, not to be commonly used but is practical where
    there's many child windows.

src/Makefile.am ( +3 -0 lines )
src/pekwm_client.cpp ( +3 -6 lines )
src/pekwm_client.h ( +1 -1 lines )
src/pekwm_frame.cpp ( +4 -8 lines )
src/pekwm_frame_group.cpp ( +3 -3 lines )
src/pekwm_manager.cpp ( +33 -45 lines )
src/x11_display.cpp ( +2 -3 lines )
src/x11_font.h ( +1 -0 lines )
src/x11_window.cpp ( +26 -21 lines )
src/x11_window.h ( +1 -0 lines )

src/pekwm_manager.cpp

26	@@ -26,6 +26,8 @@
26	#include "config.h"
27	#endif // HAVE_CONFIG_H
28
29	#include <iostream>
30
31	#include "toolkit_exception.h"
32	#include "pekwm.h"
33	#include "pekwm_action.h"
...
121	@@ -119,7 +121,7 @@
121	while (! m_shutdown) {
122	// Look for new event, waiting max EVENT_TIMEOUT milliseconds.
123	try {
122	if (m_x_display->event_next (&event, EVENT_TIMEOUT)) {
125	if (m_x_display->event_next (&event, 0)) { // FIXME: Use timeout, does not work
126	switch (event.type) {
127	case MapRequest:
128	handle_map_request (&event);
...
179	@@ -177,14 +179,12 @@
179	}
180	}
181	} catch (toolkit::exception &ex) {
180	LOG.msg (toolkit::log::LOG_WARNING,
181	"failed to get event with error %s", ex.get_msg ());
184	LOG.msg (toolkit::log::LOG_WARNING, "failed to get event with error %s", ex.get_msg ());
185	}
186
187	// Handle timers, other processing.
188	while ((action = m_timer->get_timed_out ()) != 0) {
187	LOG.msg (toolkit::log::LOG_DEBUG,
188	"handle timer event %p", action);
191	LOG.msg (toolkit::log::LOG_DEBUG, "handle timer event %p", action);
192	handle_action (action);
193	}
194
...
209	@@ -209,14 +209,12 @@
209	pekwm::client *client = pekwm::client::find (ev->xmaprequest.window);
210
211	if (client) {
212	LOG.msg (toolkit::log::LOG_DEBUG,
213	"manager::handle_map_request, map %d found client %p",
214	LOG.msg (toolkit::log::LOG_DEBUG, "manager::handle_map_request, map %d found client %p",
215	ev->xmap.window, client);
216	} else {
217	client = create_client (ev->xmap.window);
218
219	LOG.msg (toolkit::log::LOG_DEBUG,
220	"manager::handle_map_request, map %d new client %p",
221	LOG.msg (toolkit::log::LOG_DEBUG, "manager::handle_map_request, map %d new client %p",
222	ev->xmap.window, client);
223	}
224	}
...
230	@@ -232,8 +230,7 @@
230	// Start by looking for window.
231	pekwm::client *client = pekwm::client::find (ev->xunmap.window);
232
235	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
236	"manager::handle_unmap_notify, unmap %d found client %p",
235	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_unmap_notify, unmap %d found client %p",
236	ev->xunmap.window, client);
237	}
238
...
245	@@ -248,8 +245,7 @@
245	// Find the client destroyed
246	pekwm::client *client = pekwm::client::find (ev->xdestroywindow.window);
247
251	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
252	"manager::handle_destroy_notify, destroy %d found client %p",
250	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_destroy_notify, destroy %d found client %p",
251	ev->xdestroywindow.window, client);
252	}
253
...
257	@@ -261,8 +257,7 @@
257	void
258	manager::handle_configure_request (XEvent *ev)
259	{
264	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
265	"manager::handle_configure_request");
262	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_configure_request");
263	}
264
265	/**
...
268	@@ -273,8 +268,7 @@
268	void
269	manager::handle_client_message (XEvent *ev)
270	{
276	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
277	"manager::handle_client_message");
273	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_client_message");
274	}
275
276	/**
...
279	@@ -285,8 +279,7 @@
279	void
280	manager::handle_colormap_notify (XEvent *ev)
281	{
288	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
289	"manager::handle_colormap_notify");
284	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_colormap_notify");
285	}
286
287	/**
...
290	@@ -297,8 +290,7 @@
290	void
291	manager::handle_property_notify (XEvent *ev)
292	{
300	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
301	"manager::handle_property_notify");
295	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_property_notify");
296	}
297
298	/**
...
301	@@ -309,8 +301,7 @@
301	void
302	manager::handle_expose (XEvent *ev)
303	{
312	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
313	"manager::handle_expose");
306	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_expose");
307	}
308
309	/**
...
312	@@ -321,8 +312,7 @@
312	void
313	manager::handle_key_press (XEvent *ev)
314	{
324	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
325	"manager::handle_key_press");
317	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_key_press");
318	}
319
320	/**
...
323	@@ -333,8 +323,7 @@
323	void
324	manager::handle_key_release (XEvent *ev)
325	{
336	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
337	"manager::handle_key_release");
328	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_key_release");
329	}
330
331	/**
...
334	@@ -345,8 +334,7 @@
334	void
335	manager::handle_button_press (XEvent *ev)
336	{
348	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
349	"manager::handle_button_press");
339	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_button_press");
340	}
341
342	/**
...
345	@@ -357,8 +345,7 @@
345	void
346	manager::handle_button_release (XEvent *ev)
347	{
360	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
361	"manager::handle_button_release");
350	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_button_release");
351	}
352
353	/**
...
356	@@ -369,8 +356,7 @@
356	void
357	manager::handle_motion_notify (XEvent *ev)
358	{
372	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
373	"manager::handle_motion_notify");
361	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_motion_notify");
362	}
363
364	/**
...
367	@@ -381,8 +367,7 @@
367	void
368	manager::handle_enter_notify (XEvent *ev)
369	{
384	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
385	"manager::handle_enter_notify");
372	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_enter_notify");
373	}
374
375	/**
...
378	@@ -393,8 +378,7 @@
378	void
379	manager::handle_leave_notify (XEvent *ev)
380	{
396	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
397	"manager::handle_leave_notify");
383	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_leave_notify");
384	}
385
386	/**
...
389	@@ -405,8 +389,7 @@
389	void
390	manager::handle_focus_in (XEvent *ev)
391	{
408	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
409	"manager::handle_focus_in");
394	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_focus_in");
395	}
396
397	/**
...
400	@@ -417,8 +400,7 @@
400	void
401	manager::handle_focus_out (XEvent *ev)
402	{
420	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
421	"manager::handle_focus_out");
405	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "manager::handle_focus_out");
406	}
407
408	/**
...
464	@@ -482,19 +464,22 @@
464	try {
465	// Get attributes to figure if it's a client
466	x11::window_attributes attr (m_x_display, x11_window);
485	if (! attr.get_x11_attributes ()->override_redirect
486	&& attr.get_x11_attributes ()->map_state != IsUnmapped) {
469	if (! attr.get_x11_attributes ()->override_redirect) {
470	// && attr.get_x11_attributes ()->map_state != IsUnmapped) {
471
472	// No window was found, this is a new window.
473	if (is_dockapp (x11_window)) {
474	client = new pekwm::client_dockapp (m_display, x11_window);
475	} else {
476	client = new pekwm::client_app (m_display, x11_window);
477
478	// Initialize the client and make it visible
479	init_client (client);
480	client->map();
481	}
482	}
483	} catch (toolkit::exception &ex) {
502	LOG.msg (toolkit::log::LOG_WARNING,
503	"failed to create client for window %d with error %s",
486	LOG.msg (toolkit::log::LOG_WARNING, "failed to create client for window %d with error %s",
487	x11_window, ex.get_msg ());
488	}
489
...
563	@@ -578,6 +563,9 @@
563	frame->map ();
564	frame_group->map ();
565
566	// Set the client active
567	frame_group->activate_client (client);
568
569	return frame_group;
570	}
571	}
...

src/x11_window.cpp

99	@@ -99,9 +99,8 @@
99	m_height = height;
100	m_depth = depth;
101
102	LOG.msg (toolkit::log::LOG_DEBUG,
103	"Creating new X11 window with size: %dx%d @ %dx%d",
104	m_width, m_height, m_x, m_y);
105	LOG.msg (toolkit::log::LOG_DEBUG, "Creating new X11 window %p with size: %dx%d @ %dx%d",
106	this, m_width, m_height, m_x, m_y);
107
108	// Get visual from parent if no visual set.
109	if (! m_x_visual) {
...
112	@@ -113,7 +112,8 @@
112	XCreateWindow (m_x_display->get_x11_display (),
113	m_parent->get_x11_window (),
114	m_x, m_y, m_width, m_height, 0 /* border width */,
116	m_depth, m_window_class, m_x_visual->get_x11_visual (),
116	// FIXME: m_depth, m_window_class, m_x_visual->get_x11_visual (),
117	CopyFromParent, m_window_class, CopyFromParent,
118	attributes.get_value_mask (),
119	attributes.get_x11_attributes ());
120
...
138	@@ -138,8 +138,7 @@
138	int
139	window::move (int x, int y)
140	{
141	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
142	"window::move, %p move to @ %dx%d", this, x, y);
143	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::move, %p move to @ %dx%d", this, x, y);
144
145	m_x = x;
146	m_y = y;
...
156	@@ -157,17 +156,14 @@
156	int
157	window::resize (unsigned int width, unsigned int height) throw (toolkit::exception&)
158	{
160	assert (width);
161	assert (height);
161	assert (width && height);
162
164	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
165	"window::resize, %p resize to %dx%d", this, width, height);
165	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::resize, %p resize to %dx%d", this, width, height);
166
167	m_width = width;
168	m_height = height;
169
171	return XResizeWindow (m_x_display->get_x11_display (), m_x11_window,
172	width, height);
172	return XResizeWindow (m_x_display->get_x11_display (), m_x11_window, width, height);
173	}
174
175	/**
...
174	@@ -178,14 +174,27 @@
174	int
175	window::map (void)
176	{
181	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
182	"window::map, mapping %p", this);
179	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::map, mapping %p", this);
180
181	m_state = x11::window::WINDOW_STATE_UNFOCUSED;
182	return XMapWindow (m_x_display->get_x11_display (), m_x11_window);
183	}
184
185	/**
186	* Maps the window and all it's sub windows.
187	*
188	* @return XMapSubwindows return value.
189	*/
190	int
191	window::map_all (void)
192	{
193	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::map_all, mapping %p", this);
194
195	m_state = x11::window::WINDOW_STATE_UNFOCUSED;
196	return XMapSubwindows (m_x_display->get_x11_display (), m_x11_window);
197	}
198
199	/**
200	* Unmaps the window.
201	*
202	* @return XUnmapWindow return value.
...
202	@@ -193,8 +202,7 @@
202	int
203	window::unmap (void)
204	{
196	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
197	"window::unmap, unmapping %p", this);
207	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::unmap, unmapping %p", this);
208
209	m_state = x11::window::WINDOW_STATE_UNMAPPED;
210	return XUnmapWindow (m_x_display->get_x11_display (), m_x11_window);
...
221	@@ -213,16 +221,13 @@
221	{
222	assert (parent);
223
216	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
217	"window::reparent, %p to %p @ %dx%d", this, parent, x, y);
226	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "window::reparent, %p to %p @ %dx%d", this, parent, x, y);
227
228	// Assign new parent
229	m_parent = parent;
230
231	// Reparent
224	return XReparentWindow (m_x_display->get_x11_display (),
225	m_x11_window, parent->get_x11_window (),
226	x, y);
235	return XReparentWindow (m_x_display->get_x11_display (), m_x11_window, parent->get_x11_window (), x, y);
236	}
237
238	/**
...

src/x11_font.h

32	@@ -32,6 +32,7 @@
32	#include <string>
33
34	extern "C" {
35	#include <X11/Xlib.h>
36	#ifdef HAVE_XFT
37	#include <X11/Xft/Xft.h>
38	#endif // HAVE_XFT
...

src/pekwm_frame.cpp

82	@@ -82,13 +82,11 @@
82	// Make sure client does not already exist, fatal error.
83	assert (! has_client (client));
84
85	LOG.msg (toolkit::log::LOG_DEBUG,
86	"frame::add_client, adding %p to %p", client, this);
87	LOG.msg (toolkit::log::LOG_DEBUG, "frame::add_client, adding %p to %p", client, this);
88
89	if (init) {
90	// FIXME: Implement proper removal of decor
91	resize (client->get_width (),
92	client->get_height () + m_title.get_height ());
93	resize (client->get_width (), client->get_height () + m_title.get_height ());
94	} else {
95	client->resize (get_client_width (client), get_client_height (client));
96	}
...
119	@@ -121,14 +119,12 @@
119	{
120	assert (! has_client (client));
121
124	LOG.msg (toolkit::log::LOG_DEBUG,
125	"frame::activate_client, activating %p in %p", client, this);
124	LOG.msg (toolkit::log::LOG_DEBUG, "frame::activate_client, activating %p in %p", client, this);
125
126	m_act_client = client;
127
128	// Update size
131	m_act_client->resize (get_client_width (m_act_client),
132	get_client_height (m_act_client));
131	m_act_client->resize (get_client_width (m_act_client), get_client_height (m_act_client));
132
133	// Raise above other clients in window.
134	m_act_client->raise ();
...

src/pekwm_frame_group.cpp

61	@@ -61,6 +61,7 @@
61	frame_group::activate_client (pekwm::client *client)
62	{
63	// FIXME: Implement frame_group::activate_client
64	client->map();
65	return false;
66	}
67
...
90	@@ -89,8 +90,7 @@
90	// Make sure frame does not already exist, fatal error.
91	assert (! has_frame (frame));
92
92	LOG.msg (toolkit::log::LOG_DEBUG,
93	"frame_group::add_frame, adding %p to %p", this, this);
95	LOG.msg (toolkit::log::LOG_DEBUG, "frame_group::add_frame, adding %p to %p", this, this);
96
97	if (init) {
98	resize (frame->get_width (), frame->get_height ());
...
128	@@ -128,6 +128,6 @@
128	frame_group::resize (unsigned int width, unsigned int height) throw (toolkit::exception&)
129	{
130	// FIXME: Implement frame_group::resize
131	return 1;
132	return x11::window::resize (width, height);
133	}
134	}
...

src/pekwm_client.h

51	@@ -51,7 +51,7 @@
51	/** Find client with window x11_window. */
52	static pekwm::client *find (Window x11_window) {
53	std::map<Window, pekwm::client*>::iterator it (m_client_map.find(x11_window));
54	return (it == m_client_map.end()) ? it->second : 0;
55	return (it == m_client_map.end()) ? 0 : it->second;
56	}
57
58	protected:
...

src/x11_display.cpp

107	@@ -107,13 +107,12 @@
107
108	select_status = select (1, &rdfs, NULL, NULL, &tv);
109	if (select_status == -1) {
110	throw toolkit::exception (toolkit::exception::EXC_WARNING,
111	"select failed");
112	throw toolkit::exception (toolkit::exception::EXC_WARNING, "select failed");
113	}
114	}
115
116	// FIXME: Select is not working, figure out why.
117	if (true \|\| select_status) {
118	if (select_status) {
119	XNextEvent (m_x11_display, event);
120	got_event = true;
121	}
...

src/pekwm_client.cpp

74	@@ -74,8 +74,7 @@
74	pekwm::atom_handler *ah = m_display->get_atom_handler ();
75
76	if (ah->get_utf8_string (this, pekwm::ATOM_NET_WM_NAME, m_name)) {
77	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
78	"client::get_name, got _NET_WM_NAME %s", m_name.to_utf8 ());
79	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "client::get_name, got _NET_WM_NAME %s", m_name.to_utf8 ());
80	} else {
81	XTextProperty tp;
82
...
83	@@ -84,8 +83,7 @@
83	if (tp.encoding == XA_STRING) {
84	m_name.from_utf8 (reinterpret_cast<char*> (tp.value));
85
87	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE,
88	"client::get_name, got WM_NAME %s", m_name.to_utf8 ());
88	LOG.msg (toolkit::log::LOG_DEBUG_VERBOSE, "client::get_name, got WM_NAME %s", m_name.to_utf8 ());
89	} else {
90	// FIXME: Implement XmbTextPropertyToTextList handling
91	}
...
93	@@ -95,8 +93,7 @@
93	}
94
95	} else {
98	LOG.msg (toolkit::log::LOG_WARNING,
99	"client::get_name, failed gett WM_NAME");
98	LOG.msg (toolkit::log::LOG_WARNING, "client::get_name, failed gett WM_NAME");
99	}
100	}
101	}
...

src/x11_window.h

92	@@ -92,6 +92,7 @@
92	virtual int resize (unsigned int width, unsigned int height) throw (toolkit::exception&);
93
94	virtual int map (void);
95	virtual int map_all (void);
96	virtual int unmap (void);
97	virtual int reparent (x11::window *parent, int x, int y);
98
...

src/Makefile.am

58	@@ -58,5 +58,8 @@
58	pekwm_CXXFLAGS = ${CXXFLAGS} ${xft_CFLAGS}
59	pekwm_LDFLAGS = ${LDFLAGS} ${xft_LIBS}
60
61	check-syntax:
62	${CXX} -o nul ${CXXFLAGS} ${xft_CFLAGS} -S ${CHK_SOURCES}
63
64	distclean-local:
65	rm -f \~ .\#
...