ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
		11	use CFClient::Texture;
10		12
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		14
		15	our $LAYOUT;
13	our $ROOT;	16	our $ROOT;
14	our $TOOLTIP;	17	our $TOOLTIP;
15	our $BUTTON_STATE;	18	our $BUTTON_STATE;
16		19
17	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
18		21
19	sub check_tooltip {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20	if (!$GRAB) {	23	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
25	$TOOLTIP->{owner} = $widget;	29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
26		32
27	my $tip = $widget->{tooltip};	33	my $tip = $widget->{tooltip};
28		34
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	35	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		36
31	$TOOLTIP->set_tooltip_from ($widget);	37	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	38	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	39	}
43		40
44	return;	41	return;
45	}	42	}
46	}	43	}
47	}	44	}
48		45
49	$TOOLTIP->hide;	46	$TOOLTIP->hide;
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
		48	});
		49
		50	sub get_layout {
		51	my $layout;
		52
		53	for (grep { $_->{name} } values %WIDGET) {
		54	my $win = $layout->{$_->{name}} = { };
		55
		56	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		57	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		58	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		59	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		60
		61	$win->{show} = $_->{visible} && $_->{is_toplevel};
		62	}
		63
		64	$layout
		65	}
		66
		67	sub set_layout {
		68	my ($layout) = @_;
		69
		70	$LAYOUT = $layout;
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
69	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
70		90
71	$GRAB = $widget;	91	$GRAB = $widget;
72	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
73		93
74	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
102		118
103	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
104	}	120	}
105	}	121	}
106		122
107	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
108	my ($ev) = @_;	124	my ($ev) = @_;
…		…
114	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
115		131
116	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	$TOOLTIP_WATCHER->start;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
144		158
145	$_->update	159	$_->update
146	for @widgets;	160	for @widgets;
147	}	161	}
148		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
149	# call when resolution changes etc.	171	# call when resolution changes etc.
150	sub rescale_widgets {	172	sub rescale_widgets {
151	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
152		174
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
		177	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		178	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		179
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	180	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	181	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	182	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	183	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	184	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	185	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	186
		187	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		188	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		189
166	}	190	}
167
168	$widget->reconfigure;
169	}	191	}
		192
		193	reconfigure_widgets;
170	}	194	}
171		195
172	#############################################################################	196	#############################################################################
173		197
174	package CFClient::UI::Base;	198	package CFClient::UI::Base;
…		…
179		203
180	sub new {	204	sub new {
181	my $class = shift;	205	my $class = shift;
182		206
183	my $self = bless {	207	my $self = bless {
184	x => 0,	208	x => "center",
185	y => 0,	209	y => "center",
186	z => 0,	210	z => 0,
		211	w => undef,
		212	h => undef,
187	can_events => 1,	213	can_events => 1,
188	@_	214	@_
189	}, $class;	215	}, $class;
190		216
		217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		218
191	for (keys %$self) {	219	for (keys %$self) {
192	if (/^connect_(.*)$/) {	220	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	221	$self->connect ($1 => delete $self->{$_});
194	}	222	}
195	}	223	}
196		224
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		230
		231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		233
		234	$self->show if $layout->{show};
		235	}
198		236
199	$self	237	$self
200	}	238	}
201		239
202	sub destroy {	240	sub destroy {
…		…
206	%$self = ();	244	%$self = ();
207	}	245	}
208		246
209	sub show {	247	sub show {
210	my ($self) = @_;	248	my ($self) = @_;
		249
211	return if $self->{parent};	250	return if $self->{parent};
212		251
213	$CFClient::UI::ROOT->add ($self);	252	$CFClient::UI::ROOT->add ($self);
214	}	253	}
215		254
216	sub show_centered {	255	sub set_visible {
217	my ($self) = @_;	256	my ($self) = @_;
		257
218	return if $self->{parent};	258	return if $self->{visible};
219		259
220	$self->show;	260	$self->{root} = $self->{parent}{root};
		261	$self->{visible} = $self->{parent}{visible} + 1;
221		262
222	$CFClient::UI::ROOT->on_post_alloc (	263	$self->emit (visibility_change => 1);
223	"centered $self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},
226	);
227	}
228		264
229	sub hide {	265	$self->realloc if !exists $self->{req_w};
		266
		267	$_->set_visible for $self->children;
		268	}
		269
		270	sub set_invisible {
230	my ($self) = @_;	271	my ($self) = @_;
		272
		273	return unless $self->{visible};
		274
		275	$_->set_invisible for $self->children;
		276
		277	delete $self->{root};
		278	delete $self->{visible};
231		279
232	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
234		282
		283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
		284	if $TOOLTIP->{owner} == $self;
		285
		286	$self->focus_out;
		287
		288	$self->emit (visibility_change => 0);
		289	}
		290
		291	sub set_visibility {
		292	my ($self, $visible) = @_;
		293
		294	return if $self->{visible} == $visible;
		295
		296	$visible ? $self->hide
		297	: $self->show;
		298	}
		299
		300	sub toggle_visibility {
		301	my ($self) = @_;
		302
		303	$self->{visible}
		304	? $self->hide
		305	: $self->show;
		306	}
		307
		308	sub hide {
		309	my ($self) = @_;
		310
		311	$self->set_invisible;
		312
235	$self->{parent}->remove ($self)	313	$self->{parent}->remove ($self)
236	if $self->{parent};	314	if $self->{parent};
237	}	315	}
238		316
239	sub move {	317	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
241		319
242	$self->{x} = int $x;	320	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	321	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
245		323
246	$self->update;	324	$self->update;
247	}	325	}
248		326
249	sub set_size {	327	sub set_size {
250	my ($self, $w, $h) = @_;	328	my ($self, $w, $h) = @_;
251		329
252	$self->{user_w} = $w;	330	$self->{force_w} = $w;
253	$self->{user_h} = $h;	331	$self->{force_h} = $h;
254		332
255	$self->check_size;	333	$self->realloc;
256	}	334	}
257		335
258	sub size_request {	336	sub size_request {
259	require Carp;	337	require Carp;
260	Carp::confess "size_request is abstract";	338	Carp::confess "size_request is abstract";
…		…
262		340
263	sub configure {	341	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	342	my ($self, $x, $y, $w, $h) = @_;
265		343
266	if ($self->{aspect}) {	344	if ($self->{aspect}) {
		345	my ($ow, $oh) = ($w, $h);
		346
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	347	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	348	$h = List::Util::min $h, int $w / $self->{aspect};
269		349
270	# use alignment to adjust x, y	350	# use alignment to adjust x, y
271		351
272	$x += int +($w - $w2) * 0.5;	352	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	353	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	354	}
277		355
278	if ($self->{x} != $x || $self->{y} != $y) {	356	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	357	$self->{x} = $x;
280	$self->{y} = $y;	358	$self->{y} = $y;
281	$self->update;	359	$self->update;
282	}	360	}
283		361
284	if ($self->{w} != $w || $self->{h} != $h) {	362	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	363	return unless $self->{visible};
		364
		365	$self->{alloc_w} = $w;
		366	$self->{alloc_h} = $h;
		367
		368	$self->{root}{size_alloc}{$self+0} = $self;
286	}	369	}
287	}	370	}
288		371
289	sub size_allocate {	372	sub size_allocate {
290	# nothing to be done	373	# nothing to be done
291	}	374	}
292		375
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
301	}	382	}
302		383
303	sub set_max_size {	384	sub set_max_size {
304	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
305		386
306	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
308	}	391	}
309		392
310	sub set_tooltip {	393	sub set_tooltip {
311	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
312		395
		396	$tooltip =~ s/^\s+//;
		397	$tooltip =~ s/\s+$//;
		398
		399	return if $self->{tooltip} eq $tooltip;
		400
313	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
314		402
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
317	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
318	}	406	}
319	}	407	}
320		408
321	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
322	sub coord2local {	410	sub coord2local {
…		…
338	return if $FOCUS == $self;	426	return if $FOCUS == $self;
339	return unless $self->{can_focus};	427	return unless $self->{can_focus};
340		428
341	my $focus = $FOCUS; $FOCUS = $self;	429	my $focus = $FOCUS; $FOCUS = $self;
342		430
343	$self->emit (focus_in => $focus);	431	$self->_emit (focus_in => $focus);
344		432
345	$focus->update if $focus;	433	$focus->update if $focus;
346	$FOCUS->update;	434	$FOCUS->update;
347	}	435	}
348		436
…		…
351		439
352	return unless $FOCUS == $self;	440	return unless $FOCUS == $self;
353		441
354	my $focus = $FOCUS; undef $FOCUS;	442	my $focus = $FOCUS; undef $FOCUS;
355		443
356	$self->emit (focus_out => $focus);	444	$self->_emit (focus_out => $focus);
357		445
358	$focus->update if $focus; #?	446	$focus->update if $focus; #?
359	}
360		447
		448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		449	unless $FOCUS;
		450	}
		451
361	sub mouse_motion { }	452	sub mouse_motion { 0 }
362	sub button_up { }	453	sub button_up { 0 }
363	sub key_down { }	454	sub key_down { 0 }
364	sub key_up { }	455	sub key_up { 0 }
365		456
366	sub button_down {	457	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
368		459
369	$self->focus_in;	460	$self->focus_in;
370	}
371		461
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	462	0
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	463	}
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	464
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	465	sub find_widget {
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	466	my ($self, $x, $y) = @_;
		467
		468	return () unless $self->{can_events};
		469
		470	return $self
		471	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		472	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		473
		474	()
		475	}
		476
		477	sub set_parent {
		478	my ($self, $parent) = @_;
		479
		480	Scalar::Util::weaken ($self->{parent} = $parent);
		481	$self->set_visible if $parent->{visible};
		482	}
		483
		484	sub connect {
		485	my ($self, $signal, $cb) = @_;
		486
		487	push @{ $self->{signal_cb}{$signal} }, $cb;
		488	}
		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
		496	sub emit {
		497	my ($self, $signal, @args) = @_;
		498
		499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
		501	}
		502
		503	sub visibility_change {
		504	#my ($self, $visible) = @_;
		505	}
		506
		507	sub realloc {
		508	my ($self) = @_;
		509
		510	if ($self->{visible}) {
		511	return if $self->{root}{realloc}{$self+0};
		512
		513	$self->{root}{realloc}{$self+0} = $self;
		514	$self->{root}->update;
		515	} else {
		516	delete $self->{req_w};
		517	delete $self->{req_h};
		518	}
		519	}
		520
		521	sub update {
		522	my ($self) = @_;
		523
		524	$self->{parent}->update
		525	if $self->{parent};
		526	}
		527
		528	sub reconfigure {
		529	my ($self) = @_;
		530
		531	$self->realloc;
		532	$self->update;
		533	}
		534
		535	# using global variables seems a bit hacky, but passing through all drawing
		536	# functions seems pointless.
		537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377		538
378	sub draw {	539	sub draw {
379	my ($self) = @_;	540	my ($self) = @_;
380		541
381	return unless $self->{h} && $self->{w};	542	return unless $self->{h} && $self->{w};
		543
		544	# update screen rectangle
		545	local $draw_x = $draw_x + $self->{x};
		546	local $draw_y = $draw_y + $self->{y};
		547	local $draw_w = $draw_x + $self->{w};
		548	local $draw_h = $draw_y + $self->{h};
		549
		550	# skip widgets that are entirely outside the drawing area
		551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382		553
383	glPushMatrix;	554	glPushMatrix;
384	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
385	$self->_draw;
386	glPopMatrix;
387		556
388	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
389	my ($x, $y) = @$self{qw(x y)};
390
391	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392	glEnable GL_BLEND;	559	glEnable GL_BLEND;
393	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394	glBegin GL_QUADS;	561	glBegin GL_QUADS;
395	glVertex $x , $y;
396	glVertex $x + $self->{w}, $y;
397	glVertex $x + $self->{w}, $y + $self->{h};
398	glVertex $x , $y + $self->{h};
399	glEnd;
400	glDisable GL_BLEND;
401	}
402
403	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;
405	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	562	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	563	glVertex $self->{w}, 0;
410	glVertex $self->{w}, $self->{h};	564	glVertex $self->{w}, $self->{h};
411	glVertex 0 , $self->{h};	565	glVertex 0 , $self->{h};
412	glEnd;	566	glEnd;
		567	glDisable GL_BLEND;
		568	}
		569
		570	if ($ENV{CFPLUS_DEBUG} & 1) {
		571	glPushMatrix;
		572	glColor 1, 1, 0, 1;
		573	glTranslate 0.375, 0.375;
		574	glBegin GL_LINE_LOOP;
		575	glVertex 0 , 0;
		576	glVertex $self->{w} - 1, 0;
		577	glVertex $self->{w} - 1, $self->{h} - 1;
		578	glVertex 0 , $self->{h} - 1;
		579	glEnd;
413	glPopMatrix;	580	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
416	}	586	}
417		587
418	sub _draw {	588	sub _draw {
419	my ($self) = @_;	589	my ($self) = @_;
420		590
421	warn "no draw defined for $self\n";	591	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	592	}
473		593
474	sub DESTROY {	594	sub DESTROY {
475	my ($self) = @_;	595	my ($self) = @_;
476		596
…		…
508		628
509	if ($color && (@$color < 4 || $color->[3])) {	629	if ($color && (@$color < 4 || $color->[3])) {
510	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
511		631
512	glEnable GL_BLEND;	632	glEnable GL_BLEND;
513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514	glColor @$color;	634	glColor_premultiply @$color;
515		635
516	glBegin GL_QUADS;	636	glBegin GL_QUADS;
517	glVertex 0 , 0;	637	glVertex 0 , 0;
518	glVertex 0 , $h;	638	glVertex 0 , $h;
519	glVertex $w, $h;	639	glVertex $w, $h;
…		…
534	my ($class, %arg) = @_;	654	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	655	$class->SUPER::new (can_events => 0, %arg);
536	}	656	}
537		657
538	sub size_request {	658	sub size_request {
539	(0, 0)	659	my ($self) = @_;
		660
		661	($self->{w} + 0, $self->{h} + 0)
540	}	662	}
541		663
542	sub draw { }	664	sub draw { }
543		665
544	#############################################################################	666	#############################################################################
…		…
548	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
549		671
550	sub new {	672	sub new {
551	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
552		674
553	my $children = delete $arg{children} || [];	675	my $children = delete $arg{children};
554		676
555	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
556	children => [],	678	children => [],
557	can_events => 0,	679	can_events => 0,
558	%arg,	680	%arg,
559	);	681	);
		682
560	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
561		685
562	$self	686	$self
563	}	687	}
564		688
565	sub add {	689	sub add {
…		…
573	$self->{children} = [	697	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	698	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	699	@{$self->{children}}, @widgets
576	];	700	];
577		701
578	$self->check_size (1);	702	$self->realloc;
579	$self->update;
580	}	703	}
581		704
582	sub children {	705	sub children {
583	@{ $_[0]{children} }	706	@{ $_[0]{children} }
584	}	707	}
…		…
589	delete $child->{parent};	712	delete $child->{parent};
590	$child->hide;	713	$child->hide;
591		714
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	715	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		716
594	$self->check_size;	717	$self->realloc;
595	$self->update;
596	}	718	}
597		719
598	sub clear {	720	sub clear {
599	my ($self) = @_;	721	my ($self) = @_;
600		722
…		…
604	for (@$children) {	726	for (@$children) {
605	delete $_->{parent};	727	delete $_->{parent};
606	$_->hide;	728	$_->hide;
607	}	729	}
608		730
609	$self->check_size;	731	$self->realloc;
610	$self->update;
611	}	732	}
612		733
613	sub find_widget {	734	sub find_widget {
614	my ($self, $x, $y) = @_;	735	my ($self, $x, $y) = @_;
615		736
616	$x -= $self->{x};	737	$x -= $self->{x};
617	$y -= $self->{y};	738	$y -= $self->{y};
618		739
619	my $res;	740	my $res;
620		741
621	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
622	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
623	and return $res;	744	and return $res;
624	}	745	}
625		746
626	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
675	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	797	}
677		798
678	#############################################################################	799	#############################################################################
679		800
		801	# back-buffered drawing area
		802
680	package CFClient::UI::Window;	803	package CFClient::UI::Window;
681		804
682	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
683		806
684	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
702	$self->SUPER::size_allocate ($w, $h);	825	$self->SUPER::size_allocate ($w, $h);
703	$self->update;	826	$self->update;
704	}	827	}
705		828
706	sub _render {	829	sub _render {
		830	my ($self) = @_;
		831
707	$_[0]{children}[0]->draw;	832	$self->{children}[0]->draw;
708	}	833	}
709		834
710	sub render_child {	835	sub render_child {
711	my ($self) = @_;	836	my ($self) = @_;
712		837
713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714	glClearColor 0, 0, 0, 0;	839	glClearColor 0, 0, 0, 0;
715	glClear GL_COLOR_BUFFER_BIT;	840	glClear GL_COLOR_BUFFER_BIT;
716		841
		842	{
		843	package CFClient::UI::Base;
		844
		845	($draw_x, $draw_y, $draw_w, $draw_h) =
		846	(0, 0, $self->{w}, $self->{h});
		847	}
		848
717	$self->_render;	849	$self->_render;
718	};	850	};
719	}	851	}
720		852
721	sub _draw {	853	sub _draw {
722	my ($self) = @_;	854	my ($self) = @_;
723		855
724	my ($w, $h) = ($self->w, $self->h);	856	my ($w, $h) = @$self{qw(w h)};
725		857
726	my $tex = $self->{texture}	858	my $tex = $self->{texture}
727	or return;	859	or return;
728		860
729	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
732		864
733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734		866
735	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
736	}	868	}
…		…
739		871
740	package CFClient::UI::ViewPort;	872	package CFClient::UI::ViewPort;
741		873
742	our @ISA = CFClient::UI::Window::;	874	our @ISA = CFClient::UI::Window::;
743		875
		876	sub new {
		877	my $class = shift;
		878
		879	$class->SUPER::new (
		880	scroll_x => 0,
		881	scroll_y => 1,
		882	@_,
		883	)
		884	}
		885
744	sub size_request {	886	sub size_request {
745	my ($self) = @_;	887	my ($self) = @_;
746		888
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748		890
749	@$self{qw(child_w child_h)}	891	$w = 10 if $self->{scroll_x};
		892	$h = 10 if $self->{scroll_y};
		893
		894	($w, $h)
750	}	895	}
751		896
752	sub size_allocate {	897	sub size_allocate {
753	my ($self, $w, $h) = @_;	898	my ($self, $w, $h) = @_;
754		899
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	900	my $child = $self->child;
756	# $w = $self->{w};	901
		902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		904
757	$self->child->configure (0, 0, $cw, $ch);	905	$self->child->configure (0, 0, $w, $h);
758	$self->update;	906	$self->update;
759	}	907	}
760		908
761	sub set_offset {	909	sub set_offset {
762	my ($self, $x, $y) = @_;	910	my ($self, $x, $y) = @_;
…		…
796	}	944	}
797		945
798	sub _render {	946	sub _render {
799	my ($self) = @_;	947	my ($self) = @_;
800		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
801	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802		953
803	$self->SUPER::_render;	954	$self->SUPER::_render;
804	}	955	}
805		956
…		…
808	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
809		960
810	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
811		962
812	sub new {	963	sub new {
813	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
814		967
815	my $self;	968	my $self;
816		969
817	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
818	vertical => 1,	971	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	972	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	973	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	974	$self->{vp}->set_offset (0, $_[1]);
822	},	975	},
823	;	976	;
824		977
825	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
827	slider => $slider,	980	slider => $slider,
828	@_,	981	%arg,
829	);	982	);
830		983
831	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});
833	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
834		986
835	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
		994	}
		995
		996	sub update {
		997	my ($self) = @_;
		998
		999	$self->SUPER::update;
		1000
		1001	# todo: overwrite size_allocate of child
		1002	my $child = $self->{vp}->child;
		1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1004	}
		1005
		1006	sub size_allocate {
		1007	my ($self, $w, $h) = @_;
		1008
		1009	$self->SUPER::size_allocate ($w, $h);
		1010
		1011	my $child = $self->{vp}->child;
		1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	1013	}
837		1014
838	#TODO# update range on size_allocate depending on child	1015	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	1016	# update viewport offset on scroll
840		1017
…		…
860		1037
861	if ($self->{bg}) {	1038	if ($self->{bg}) {
862	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
863		1040
864	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
865	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
867		1044
868	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
869	glVertex 0 , 0;	1046	glVertex 0 , 0;
870	glVertex 0 , $h;	1047	glVertex 0 , $h;
871	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
884		1061
885	our @ISA = CFClient::UI::Bin::;	1062	our @ISA = CFClient::UI::Bin::;
886		1063
887	use CFClient::OpenGL;	1064	use CFClient::OpenGL;
888		1065
889	my @tex =	1066	my $bg =
		1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1068	mipmap => 1, wrap => 1;
		1069
		1070	my @border =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1073
893	sub new {	1074	sub new {
894	my $class = shift;	1075	my ($class, %arg) = @_;
895		1076
896	# TODO: user_x, user_y, overwrite moveto?	1077	my $title = delete $arg{title};
897		1078
898	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1082	border => 0.6,
902	toplevel => 1,
903	can_events => 1,	1083	can_events => 1,
904	@_	1084	min_w => 16,
		1085	min_h => 16,
		1086	%arg,
905	);	1087	);
906		1088
907	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
908	align => 0,	1090	align => 0,
909	valign => 1,	1091	valign => 1,
910	text => $self->{title},	1092	text => $title,
911	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
912		1095
913	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914	}	1104	}
915		1105
916	sub border {	1106	sub border {
917	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
918	}	1108	}
919		1109
920	sub size_request {	1110	sub size_request {
921	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
922		1115
923	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
924		1117
925	(	1118	(
926	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
929	}	1122	}
930		1123
931	sub size_allocate {	1124	sub size_allocate {
932	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
933		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
934	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
935	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
936		1137
937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938	if $self->{title};
939
940	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
941	}	1139	}
942		1140
943	sub button_down {	1141	sub button_down {
944	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
945		1143
…		…
961	my ($ev, $x, $y) = @_;	1159	my ($ev, $x, $y) = @_;
962		1160
963	my $dx = $ev->{x} - $ox;	1161	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
965		1163
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1166
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969	$self->check_size;	1168	$self->realloc;
970	};	1169	};
971		1170
972	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1175	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
978		1177
979	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
980		1179
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982	$self->update;	1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
984	}	1188	1
985	}	1189	}
986		1190
987	sub button_up {	1191	sub button_up {
988	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
989		1193
990	delete $self->{motion};	1194	!!delete $self->{motion}
991	}	1195	}
992		1196
993	sub mouse_motion {	1197	sub mouse_motion {
994	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
995		1199
996	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
997	}	1203	}
998		1204
999	sub _draw {	1205	sub _draw {
1000	my ($self) = @_;	1206	my ($self) = @_;
1001		1207
		1208	my $child = $self->{children}[0];
		1209
1002	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1003	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1004		1212
1005	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1215
1008	my $border = $self->border;	1216	my $border = $self->border;
1009		1217
1010	glColor @{ $self->{border_bg} };	1218	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1223
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1225	glColor @{ $self->{bg} };
1018		1226
1019	# TODO: repeat texture not scale	1227	# TODO: repeat texture not scale
		1228	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1229	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1230	$bg->{t} = $ch / $bg->{h};
1022
1023	glColor @{ $self->{bg} };
1024
1025	$bg->{s} = $rep_x;
1026	$bg->{t} = $rep_y;
1027	$bg->{wrap_mode} = 1;
1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1232	}
1030		1233
1031	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1032		1235
1033	$self->{title}->draw if $self->{title};
1034
1035	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1036	}	1242	}
1037		1243
1038	#############################################################################	1244	#############################################################################
1039		1245
1040	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1048	sub new {	1254	sub new {
1049	my $class = shift;	1255	my $class = shift;
1050		1256
1051	$class->SUPER::new (	1257	$class->SUPER::new (
1052	col_expand => [],	1258	col_expand => [],
1053	@_	1259	@_,
1054	)	1260	)
		1261	}
		1262
		1263	sub children {
		1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1265	}
1056		1266
1057	sub add {	1267	sub add {
1058	my ($self, $x, $y, $child) = @_;	1268	my ($self, $x, $y, $child) = @_;
1059		1269
1060	$child->set_parent ($self);	1270	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1271	$self->{children}[$y][$x] = $child;
1062		1272
1063	$child->check_size;	1273	$self->realloc;
1064	}	1274	}
1065		1275
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# TODO: move to container class maybe? send childs a signal on removal?	1276	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1277	sub clear {
1072	my ($self) = @_;	1278	my ($self) = @_;
1073		1279
1074	my @children = $self->children;	1280	my @children = $self->children;
1075	delete $self->{children};	1281	delete $self->{children};
…		…
1077	for (@children) {	1283	for (@children) {
1078	delete $_->{parent};	1284	delete $_->{parent};
1079	$_->hide;	1285	$_->hide;
1080	}	1286	}
1081		1287
1082	$self->update;	1288	$self->realloc;
1083	}	1289	}
1084		1290
1085	sub get_wh {	1291	sub get_wh {
1086	my ($self) = @_;	1292	my ($self) = @_;
1087		1293
…		…
1118	sub size_allocate {	1324	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1120		1326
1121	my ($ws, $hs) = $self->get_wh;	1327	my ($ws, $hs) = $self->get_wh;
1122		1328
1123	my $req_w = sum @$ws;	1329	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1330	my $req_h = (sum @$hs) || 1;
1125		1331
1126	# TODO: nicer code && do row_expand	1332	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1333	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1334	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1335	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1389	}
1184	}	1390	}
1185		1391
1186	#############################################################################	1392	#############################################################################
1187		1393
1188	package CFClient::UI::HBox;	1394	package CFClient::UI::Box;
1189
1190	# TODO: wrap into common Box base class
1191		1395
1192	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Container::;
1193		1397
1194	sub size_request {	1398	sub size_request {
1195	my ($self) = @_;	1399	my ($self) = @_;
1196		1400
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$self->{vertical}
1198		1402	? (
1199	(	1403	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1200	(List::Util::sum map $_->[0], @alloc),	1404	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201	(List::Util::max map $_->[1], @alloc),	1405	)
1202	)	1406	: (
		1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1409	)
1203	}	1410	}
1204		1411
1205	sub size_allocate {	1412	sub size_allocate {
1206	my ($self, $w, $h) = @_;	1413	my ($self, $w, $h) = @_;
1207		1414
1208	($h, $w) = ($w, $h);	1415	my $space = $self->{vertical} ? $h : $w;
1209
1210	my $children = $self->{children};	1416	my $children = $self->{children};
1211		1417
1212	my @h = map $_->{req_w}, @$children;	1418	my @req;
1213		1419
1214	my $req_h = List::Util::sum @h;	1420	if ($self->{homogeneous}) {
1215		1421	@req = ($space / (@$children || 1)) x @$children;
1216	if ($req_h > $h) {
1217	# ah well, not enough space
1218	$_ *= $h / $req_h for @h;
1219	} else {	1422	} else {
		1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1424	my $req = List::Util::sum @req;
		1425
		1426	if ($req > $space) {
		1427	# ah well, not enough space
		1428	$_ *= $space / $req for @req;
		1429	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;	1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221	$exp ||= 1;
1222		1431
		1432	$space = ($space - $req) / $expand; # remaining space to give away
		1433
		1434	$req[$_] += $space * $children->[$_]{expand}
1223	for (0 .. $#$children) {	1435	for 0 .. $#$children;
1224	my $child = $children->[$_];
1225
1226	my $alloc_h = $h[$_];
1227	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228	$h[$_] = $alloc_h;
1229	}	1436	}
1230	}	1437	}
1231		1438
1232	CFClient::UI::harmonize \@h;	1439	CFClient::UI::harmonize \@req;
1233		1440
1234	my $y = 0;	1441	my $pos = 0;
1235	for (0 .. $#$children) {	1442	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];	1443	my $alloc = $req[$_];
1238	$child->configure ($y, 0, $h, $w);	1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239		1445
1240	$y += $h;	1446	$pos += $alloc;
1241	}	1447	}
1242		1448
1243	1	1449	1
1244	}	1450	}
1245		1451
1246	#############################################################################	1452	#############################################################################
1247		1453
		1454	package CFClient::UI::HBox;
		1455
		1456	our @ISA = CFClient::UI::Box::;
		1457
		1458	sub new {
		1459	my $class = shift;
		1460
		1461	$class->SUPER::new (
		1462	vertical => 0,
		1463	@_,
		1464	)
		1465	}
		1466
		1467	#############################################################################
		1468
1248	package CFClient::UI::VBox;	1469	package CFClient::UI::VBox;
1249		1470
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1471	our @ISA = CFClient::UI::Box::;
1253		1472
1254	sub size_request {	1473	sub new {
1255	my ($self) = @_;	1474	my $class = shift;
1256		1475
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1476	$class->SUPER::new (
1258		1477	vertical => 1,
1259	(	1478	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1479	)
1263	}
1264
1265	sub size_allocate {
1266	my ($self, $w, $h) = @_;
1267
1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270	my $children = $self->{children};
1271
1272	my @h = map $_->{req_h}, @$children;
1273
1274	my $req_h = List::Util::sum @h;
1275
1276	if ($req_h > $h) {
1277	# ah well, not enough space
1278	$_ *= $h / $req_h for @h;
1279	} else {
1280	my $exp = List::Util::sum map $_->{expand}, @$children;
1281	$exp ||= 1;
1282
1283	for (0 .. $#$children) {
1284	my $child = $children->[$_];
1285
1286	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287	}
1288	}
1289
1290	CFClient::UI::harmonize \@h;
1291
1292	my $y = 0;
1293	for (0 .. $#$children) {
1294	my $child = $children->[$_];
1295	my $h = $h[$_];
1296	$child->configure (0, $y, $w, $h);
1297
1298	$y += $h;
1299	}
1300
1301	1
1302	}	1480	}
1303		1481
1304	#############################################################################	1482	#############################################################################
1305		1483
1306	package CFClient::UI::Label;	1484	package CFClient::UI::Label;
…		…
1323	ellipsise => 3, # end	1501	ellipsise => 3, # end
1324	layout => (new CFClient::Layout),	1502	layout => (new CFClient::Layout),
1325	fontsize => 1,	1503	fontsize => 1,
1326	align => -1,	1504	align => -1,
1327	valign => -1,	1505	valign => -1,
1328	padding => 2,	1506	padding_x => 2,
		1507	padding_y => 2,
1329	can_events => 0,	1508	can_events => 0,
1330	%arg	1509	%arg
1331	);	1510	);
1332		1511
1333	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1360		1539
1361	delete $self->{texture};	1540	delete $self->{texture};
1362	$self->SUPER::update;	1541	$self->SUPER::update;
1363	}	1542	}
1364		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1365	sub set_text {	1551	sub set_text {
1366	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1367		1553
1368	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1369	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1370		1556
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1373		1559
		1560	delete $self->{size_req};
		1561	$self->realloc;
1374	$self->update;	1562	$self->update;
1375	$self->check_size;
1376	}	1563	}
1377		1564
1378	sub set_markup {	1565	sub set_markup {
1379	my ($self, $markup) = @_;	1566	my ($self, $markup) = @_;
1380		1567
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1572
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1388		1575
		1576	delete $self->{size_req};
		1577	$self->realloc;
1389	$self->update;	1578	$self->update;
1390	$self->check_size;
1391	}	1579	}
1392		1580
1393	sub size_request {	1581	sub size_request {
1394	my ($self) = @_;	1582	my ($self) = @_;
1395		1583
		1584	$self->{size_req} ||= do {
1396	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1397	$self->{layout}->set_width ($self->{max_w} || -1);	1586	$self->{layout}->set_width ($self->{max_w} || -1);
1398	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1399	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1590
1402	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1403		1592
1404	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1405	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1406	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407		1596
1408	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1409		1598
1410	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1411	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1412	}	1604	};
1413		1605
1414	(	1606	@{ $self->{size_req} }
1415	$w + $self->{padding} * 2,
1416	$h + $self->{padding} * 2,
1417	)
1418	}	1607	}
1419		1608
1420	sub size_allocate {	1609	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1422		1611
		1612	delete $self->{ox};
		1613
1423	delete $self->{texture};	1614	delete $self->{texture}
		1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424	}	1616	}
1425		1617
1426	sub set_fontsize {	1618	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1619	my ($self, $fontsize) = @_;
1428		1620
1429	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1622	delete $self->{texture};
1431		1623
1432	$self->update;	1624	$self->realloc;
1433	$self->check_size;	1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1434	}	1633	}
1435		1634
1436	sub _draw {	1635	sub _draw {
1437	my ($self) = @_;	1636	my ($self) = @_;
1438		1637
…		…
1444	$self->{layout}->set_width ($self->{w});	1643	$self->{layout}->set_width ($self->{w});
1445	$self->{layout}->set_ellipsise ($self->{ellipsise});	1644	$self->{layout}->set_ellipsise ($self->{ellipsise});
1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448		1647
1449	my $tex = new_from_layout CFClient::Texture $self->{layout};	1648	new_from_layout CFClient::Texture $self->{layout}
		1649	};
1450		1650
		1651	unless (exists $self->{ox}) {
1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453	: ($self->{w} - $tex->{w}) * 0.5);	1654	: ($self->{w} - $tex->{w}) * 0.5);
1454		1655
1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1458
1459	$tex
1460	};	1659	};
1461		1660
1462	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464		1662
1465	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1467	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470	}	1670	}
1471		1671
1472	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1473	}	1673	}
…		…
1502		1702
1503	delete $self->{cur_h};	1703	delete $self->{cur_h};
1504		1704
1505	return if $self->{text} eq $text;	1705	return if $self->{text} eq $text;
1506		1706
1507	delete $self->{texture};
1508
1509	$self->{last_activity} = $::NOW;	1707	$self->{last_activity} = $::NOW;
1510	$self->{text} = $text;	1708	$self->{text} = $text;
1511		1709
1512	$text =~ s/./*/g if $self->{hidden};	1710	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1711	$self->{layout}->set_text ("$text ");
		1712	delete $self->{size_req};
1514		1713
1515	$self->emit (changed => $self->{text});	1714	$self->_emit (changed => $self->{text});
		1715
		1716	$self->realloc;
		1717	$self->update;
1516	}	1718	}
1517		1719
1518	sub set_text {	1720	sub set_text {
1519	my ($self, $text) = @_;	1721	my ($self, $text) = @_;
1520		1722
1521	$self->{cursor} = length $text;	1723	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1724	$self->_set_text ($text);
1523	$self->update;
1524	$self->check_size;
1525	}	1725	}
1526		1726
1527	sub get_text {	1727	sub get_text {
1528	$_[0]{text}	1728	$_[0]{text}
1529	}	1729	}
…		…
1532	my ($self) = @_;	1732	my ($self) = @_;
1533		1733
1534	my ($w, $h) = $self->SUPER::size_request;	1734	my ($w, $h) = $self->SUPER::size_request;
1535		1735
1536	($w + 1, $h) # add 1 for cursor	1736	($w + 1, $h) # add 1 for cursor
1537	}
1538
1539	sub size_allocate {
1540	my ($self, $w, $h) = @_;
1541
1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543	}	1737	}
1544		1738
1545	sub key_down {	1739	sub key_down {
1546	my ($self, $ev) = @_;	1740	my ($self, $ev) = @_;
1547		1741
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1756	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1757	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1758	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1759	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1760	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1761	$self->_emit ('escape');
1568	} elsif ($uni) {	1762	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1763	substr $text, $self->{cursor}++, 0, chr $uni;
		1764	} else {
		1765	return 0;
1570	}	1766	}
1571		1767
1572	$self->_set_text ($text);	1768	$self->_set_text ($text);
1573	$self->update;	1769
1574	$self->check_size;	1770	$self->realloc;
		1771
		1772	1
1575	}	1773	}
1576		1774
1577	sub focus_in {	1775	sub focus_in {
1578	my ($self) = @_;	1776	my ($self) = @_;
1579		1777
…		…
1594	utf8::encode $text;	1792	utf8::encode $text;
1595	$self->{cursor} = length substr $text, 0, $idx;	1793	$self->{cursor} = length substr $text, 0, $idx;
1596		1794
1597	$self->_set_text ($self->{text});	1795	$self->_set_text ($self->{text});
1598	$self->update;	1796	$self->update;
		1797
		1798	1
1599	}	1799	}
1600		1800
1601	sub mouse_motion {	1801	sub mouse_motion {
1602	my ($self, $ev, $x, $y) = @_;	1802	my ($self, $ev, $x, $y) = @_;
1603	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1803	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1804
		1805	0
1604	}	1806	}
1605		1807
1606	sub _draw {	1808	sub _draw {
1607	my ($self) = @_;	1809	my ($self) = @_;
1608		1810
1609	local $self->{fg} = $self->{fg};	1811	local $self->{fg} = $self->{fg};
1610		1812
1611	if ($FOCUS == $self) {	1813	if ($FOCUS == $self) {
1612	glColor @{$self->{active_bg}};	1814	glColor_premultiply @{$self->{active_bg}};
1613	$self->{fg} = $self->{active_fg};	1815	$self->{fg} = $self->{active_fg};
1614	} else {	1816	} else {
1615	glColor @{$self->{bg}};	1817	glColor_premultiply @{$self->{bg}};
1616	}	1818	}
1617		1819
1618	glEnable GL_BLEND;	1820	glEnable GL_BLEND;
1619	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1821	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620	glBegin GL_QUADS;	1822	glBegin GL_QUADS;
1621	glVertex 0 , 0;	1823	glVertex 0 , 0;
1622	glVertex 0 , $self->{h};	1824	glVertex 0 , $self->{h};
1623	glVertex $self->{w}, $self->{h};	1825	glVertex $self->{w}, $self->{h};
1624	glVertex $self->{w}, 0;	1826	glVertex $self->{w}, 0;
…		…
1659	if ($sym == 13) {	1861	if ($sym == 13) {
1660	unshift @{$self->{history}},	1862	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1863	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1864	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1865	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1866	$self->_emit (activate => $txt);
1665	$self->update;	1867	$self->update;
1666		1868
1667	} elsif ($sym == CFClient::SDLK_UP) {	1869	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1870	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1871	$self->{history_saveback} = $self->get_text;
…		…
1685	} else {	1887	} else {
1686	$self->set_text ($self->{history_saveback});	1888	$self->set_text ($self->{history_saveback});
1687	}	1889	}
1688		1890
1689	} else {	1891	} else {
1690	$self->SUPER::key_down ($ev);	1892	return $self->SUPER::key_down ($ev)
		1893	}
		1894
1691	}	1895	1
1692
1693	}	1896	}
1694		1897
1695	#############################################################################	1898	#############################################################################
1696		1899
1697	package CFClient::UI::Button;	1900	package CFClient::UI::Button;
…		…
1706		1909
1707	sub new {	1910	sub new {
1708	my $class = shift;	1911	my $class = shift;
1709		1912
1710	$class->SUPER::new (	1913	$class->SUPER::new (
1711	padding => 4,	1914	padding_x => 4,
		1915	padding_y => 4,
1712	fg => [1, 1, 1],	1916	fg => [1, 1, 1],
1713	active_fg => [0, 0, 1],	1917	active_fg => [0, 0, 1],
1714	can_hover => 1,	1918	can_hover => 1,
1715	align => 0,	1919	align => 0,
1716	valign => 0,	1920	valign => 0,
1717	can_events => 1,	1921	can_events => 1,
1718	@_	1922	@_
1719	)	1923	)
1720	}	1924	}
1721		1925
		1926	sub activate { }
		1927
1722	sub button_up {	1928	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1929	my ($self, $ev, $x, $y) = @_;
1724		1930
		1931	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1932	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1933	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");	1934
1728	}	1935	1
1729	}	1936	}
1730		1937
1731	sub _draw {	1938	sub _draw {
1732	my ($self) = @_;	1939	my ($self) = @_;
1733		1940
1734	local $self->{fg} = $self->{fg};	1941	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736	if ($GRAB == $self) {
1737	$self->{fg} = $self->{active_fg};
1738	}
1739		1942
1740	glEnable GL_TEXTURE_2D;	1943	glEnable GL_TEXTURE_2D;
1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1944	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742	glColor 0, 0, 0, 1;	1945	glColor 0, 0, 0, 1;
1743		1946
…		…
1762		1965
1763	sub new {	1966	sub new {
1764	my $class = shift;	1967	my $class = shift;
1765		1968
1766	$class->SUPER::new (	1969	$class->SUPER::new (
1767	padding => 2,	1970	padding_x => 2,
		1971	padding_y => 2,
1768	fg => [1, 1, 1],	1972	fg => [1, 1, 1],
1769	active_fg => [1, 1, 0],	1973	active_fg => [1, 1, 0],
1770	bg => [0, 0, 0, 0.2],	1974	bg => [0, 0, 0, 0.2],
1771	active_bg => [1, 1, 1, 0.5],	1975	active_bg => [1, 1, 1, 0.5],
1772	state => 0,	1976	state => 0,
…		…
1776	}	1980	}
1777		1981
1778	sub size_request {	1982	sub size_request {
1779	my ($self) = @_;	1983	my ($self) = @_;
1780		1984
1781	($self->{padding} * 2 + 6) x 2	1985	(6) x 2
1782	}	1986	}
1783		1987
1784	sub button_down {	1988	sub button_down {
1785	my ($self, $ev, $x, $y) = @_;	1989	my ($self, $ev, $x, $y) = @_;
1786		1990
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789	$self->{state} = !$self->{state};	1993	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1994	$self->_emit (changed => $self->{state});
		1995	} else {
		1996	return 0
		1997	}
		1998
1791	}	1999	1
1792	}	2000	}
1793		2001
1794	sub _draw {	2002	sub _draw {
1795	my ($self) = @_;	2003	my ($self) = @_;
1796		2004
1797	$self->SUPER::_draw;	2005	$self->SUPER::_draw;
1798		2006
1799	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2007	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800		2008
1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2009	my ($w, $h) = @$self{qw(w h)};
		2010
		2011	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802		2012
1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2013	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804		2014
1805	my $tex = $self->{state} ? $tex[1] : $tex[0];	2015	my $tex = $self->{state} ? $tex[1] : $tex[0];
1806		2016
…		…
1961		2171
1962	my $h1 = $self->{h} * (1 - $ycut1);	2172	my $h1 = $self->{h} * (1 - $ycut1);
1963	my $h2 = $self->{h} * (1 - $ycut2);	2173	my $h2 = $self->{h} * (1 - $ycut2);
1964		2174
1965	glEnable GL_BLEND;	2175	glEnable GL_BLEND;
1966	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967	glEnable GL_TEXTURE_2D;	2178	glEnable GL_TEXTURE_2D;
1968	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2179	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969		2180
1970	glBindTexture GL_TEXTURE_2D, $t1->{name};	2181	glBindTexture GL_TEXTURE_2D, $t1->{name};
1971	glBegin GL_QUADS;	2182	glBegin GL_QUADS;
…		…
2071	fg => [1, 1, 1],	2282	fg => [1, 1, 1],
2072	active_fg => [0, 0, 0],	2283	active_fg => [0, 0, 0],
2073	bg => [0, 0, 0, 0.2],	2284	bg => [0, 0, 0, 0.2],
2074	active_bg => [1, 1, 1, 0.5],	2285	active_bg => [1, 1, 1, 0.5],
2075	range => [0, 0, 100, 10, 0],	2286	range => [0, 0, 100, 10, 0],
2076	req_w => $::WIDTH / 80,	2287	min_w => $::WIDTH / 80,
2077	req_h => $::WIDTH / 80,	2288	min_h => $::WIDTH / 80,
2078	vertical => 0,	2289	vertical => 0,
2079	can_hover => 1,	2290	can_hover => 1,
2080	inner_pad => 0.02,	2291	inner_pad => 0.02,
2081	@_	2292	@_
2082	);	2293	);
…		…
2085	$self->update;	2296	$self->update;
2086		2297
2087	$self	2298	$self
2088	}	2299	}
2089		2300
		2301	sub changed { }
		2302
2090	sub set_range {	2303	sub set_range {
2091	my ($self, $range) = @_;	2304	my ($self, $range) = @_;
2092		2305
2093	$self->{range} = $range;	2306	($range, $self->{range}) = ($self->{range}, $range);
2094		2307
2095	$self->update;	2308	$self->update
		2309	if "@$range" ne "@{$self->{range}}";
2096	}	2310	}
2097		2311
2098	sub set_value {	2312	sub set_value {
2099	my ($self, $value) = @_;	2313	my ($self, $value) = @_;
2100		2314
…		…
2111	if $unit;	2325	if $unit;
2112		2326
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2327	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2328
2115	if ($value != $old_value) {	2329	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2330	$self->_emit (changed => $value);
2117	$self->update;	2331	$self->update;
2118	}	2332	}
2119	}	2333	}
2120		2334
2121	sub size_request {	2335	sub size_request {
2122	my ($self) = @_;	2336	my ($self) = @_;
2123		2337
2124	my $w = $self->{req_w};	2338	($self->{req_w}, $self->{req_h})
2125	my $h = $self->{req_h};
2126
2127	$self->{vertical} ? ($h, $w) : ($w, $h)
2128	}	2339	}
2129		2340
2130	sub button_down {	2341	sub button_down {
2131	my ($self, $ev, $x, $y) = @_;	2342	my ($self, $ev, $x, $y) = @_;
2132		2343
2133	$self->SUPER::button_down ($ev, $x, $y);	2344	$self->SUPER::button_down ($ev, $x, $y);
2134		2345
2135	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136		2347
2137	$self->mouse_motion ($ev, $x, $y);	2348	$self->mouse_motion ($ev, $x, $y)
2138	}	2349	}
2139		2350
2140	sub mouse_motion {	2351	sub mouse_motion {
2141	my ($self, $ev, $x, $y) = @_;	2352	my ($self, $ev, $x, $y) = @_;
2142		2353
…		…
2146	my (undef, $lo, $hi, $page) = @{$self->{range}};	2357	my (undef, $lo, $hi, $page) = @{$self->{range}};
2147		2358
2148	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2359	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149		2360
2150	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2361	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2362	} else {
		2363	return 0;
		2364	}
		2365
2151	}	2366	1
2152	}	2367	}
2153		2368
2154	sub update {	2369	sub update {
2155	my ($self) = @_;	2370	my ($self) = @_;
2156		2371
2157	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2372	delete $self->{knob_w};
		2373	$self->SUPER::update;
		2374	}
		2375
		2376	sub _draw {
		2377	my ($self) = @_;
		2378
		2379	unless ($self->{knob_w}) {
2158	$self->set_value ($self->{range}[0]);	2380	$self->set_value ($self->{range}[0]);
2159		2381
2160	my ($value, $lo, $hi, $page) = @{$self->{range}};	2382	my ($value, $lo, $hi, $page) = @{$self->{range}};
2161	my $range = ($hi - $page - $lo) || 1e-100;	2383	my $range = ($hi - $page - $lo) || 1e-100;
2162		2384
…		…
2168	$value = ($value - $lo) / $range;	2390	$value = ($value - $lo) / $range;
2169	$value = $value * $self->{scale} + $self->{offset};	2391	$value = $value * $self->{scale} + $self->{offset};
2170		2392
2171	$self->{knob_x} = $value - $knob_w * 0.5;	2393	$self->{knob_x} = $value - $knob_w * 0.5;
2172	$self->{knob_w} = $knob_w;	2394	$self->{knob_w} = $knob_w;
2173	});	2395	}
2174
2175	$self->SUPER::update;
2176	}
2177
2178	sub _draw {
2179	my ($self) = @_;
2180		2396
2181	$self->SUPER::_draw ();	2397	$self->SUPER::_draw ();
2182		2398
2183	glScale $self->{w}, $self->{h};	2399	glScale $self->{w}, $self->{h};
2184		2400
…		…
2378		2594
2379	delete $self->{texture};	2595	delete $self->{texture};
2380	}	2596	}
2381		2597
2382	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2598	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383	glClearColor 0.5, 0.5, 0.5, 0;	2599	glClearColor 0, 0, 0, 0;
2384	glClear GL_COLOR_BUFFER_BIT;	2600	glClear GL_COLOR_BUFFER_BIT;
2385		2601
2386	my $top = int $self->{children}[1]{range}[0];	2602	my $top = int $self->{children}[1]{range}[0];
2387		2603
2388	my $y0 = $top;	2604	my $y0 = $top;
…		…
2423	sub _draw {	2639	sub _draw {
2424	my ($self) = @_;	2640	my ($self) = @_;
2425		2641
2426	glEnable GL_TEXTURE_2D;	2642	glEnable GL_TEXTURE_2D;
2427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428	glColor 1, 1, 1, 1;	2644	glColor 0, 0, 0, 1;
2429	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2645	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430	glDisable GL_TEXTURE_2D;	2646	glDisable GL_TEXTURE_2D;
2431		2647
2432	$self->{children}[1]->draw;	2648	$self->{children}[1]->draw;
2433		2649
2434	}	2650	}
…		…
2483		2699
2484	sub new {	2700	sub new {
2485	my $class = shift;	2701	my $class = shift;
2486		2702
2487	my $self = $class->SUPER::new (	2703	my $self = $class->SUPER::new (
2488	state => 0,	2704	state => 0,
2489	connect_activate => \&toggle_flopper,	2705	on_activate => \&toggle_flopper,
2490	@_	2706	@_
2491	);	2707	);
2492		2708
2493	if ($self->{state}) {
2494	$self->{state} = 0;
2495	$self->toggle_flopper;
2496	}
2497
2498	$self	2709	$self
2499	}	2710	}
2500		2711
2501	sub toggle_flopper {	2712	sub toggle_flopper {
2502	my ($self) = @_;	2713	my ($self) = @_;
2503		2714
2504	# TODO: use animation	2715	$self->{other}->toggle_visibility;
2505	if ($self->{state} = !$self->{state}) {
2506	$CFClient::UI::ROOT->add ($self->{other});
2507	$self->{other}->move ($self->coord2global (0, $self->{h}));
2508	$self->emit ("open");
2509	} else {
2510	$CFClient::UI::ROOT->remove ($self->{other});
2511	$self->emit ("close");
2512	}
2513
2514	$self->emit (changed => $self->{state});
2515	}	2716	}
2516		2717
2517	#############################################################################	2718	#############################################################################
2518		2719
2519	package CFClient::UI::Tooltip;	2720	package CFClient::UI::Tooltip;
…		…
2532	}	2733	}
2533		2734
2534	sub set_tooltip_from {	2735	sub set_tooltip_from {
2535	my ($self, $widget) = @_;	2736	my ($self, $widget) = @_;
2536		2737
		2738	my $tooltip = $widget->{tooltip};
		2739
		2740	if ($ENV{CFPLUS_DEBUG} & 2) {
		2741	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2742	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2743	. "req $widget->{req_w} $widget->{req_h}\n"
		2744	. "visible $widget->{visible}";
		2745	}
		2746
2537	$self->add (new CFClient::UI::Label	2747	$self->add (new CFClient::UI::Label
2538	markup => $widget->{tooltip},	2748	markup => $tooltip,
2539	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2749	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540	fontsize => 0.8,	2750	fontsize => 0.8,
2541	fg => [0, 0, 0, 1],	2751	fg => [0, 0, 0, 1],
2542	ellipsise => 0,	2752	ellipsise => 0,
2543	font => ($widget->{tooltip_font} || $::FONT_PROP),	2753	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2554		2764
2555	sub size_allocate {	2765	sub size_allocate {
2556	my ($self, $w, $h) = @_;	2766	my ($self, $w, $h) = @_;
2557		2767
2558	$self->SUPER::size_allocate ($w - 4, $h - 4);	2768	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2769	}
		2770
		2771	sub visibility_change {
		2772	my ($self, $visible) = @_;
		2773
		2774	return unless $visible;
		2775
		2776	$self->{root}->on_post_alloc ("move_$self" => sub {
		2777	my $widget = $self->{owner}
		2778	or return;
		2779
		2780	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2781
		2782	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2783	if $x + $self->{w} > $::WIDTH;
		2784
		2785	$self->move_abs ($x, $y);
		2786	});
2559	}	2787	}
2560		2788
2561	sub _draw {	2789	sub _draw {
2562	my ($self) = @_;	2790	my ($self) = @_;
2563		2791
…		…
2580	glVertex $w, $h;	2808	glVertex $w, $h;
2581	glVertex $w, 0;	2809	glVertex $w, 0;
2582	glEnd;	2810	glEnd;
2583		2811
2584	glTranslate 2 - 0.375, 2 - 0.375;	2812	glTranslate 2 - 0.375, 2 - 0.375;
		2813
2585	$self->SUPER::_draw;	2814	$self->SUPER::_draw;
2586	}	2815	}
2587		2816
2588	#############################################################################	2817	#############################################################################
2589		2818
…		…
2595		2824
2596	sub new {	2825	sub new {
2597	my $class = shift;	2826	my $class = shift;
2598		2827
2599	my $self = $class->SUPER::new (	2828	my $self = $class->SUPER::new (
2600	aspect => 1,	2829	aspect => 1,
		2830	can_events => 0,
2601	@_,	2831	@_,
2602	);	2832	);
2603		2833
2604	if ($self->{anim} && $self->{animspeed}) {	2834	if ($self->{anim} && $self->{animspeed}) {
2605	Scalar::Util::weaken (my $widget = $self);	2835	Scalar::Util::weaken (my $widget = $self);
…		…
2647	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2877	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648		2878
2649	if ($tex) {	2879	if ($tex) {
2650	glEnable GL_TEXTURE_2D;	2880	glEnable GL_TEXTURE_2D;
2651	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2881	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652	glColor 1, 1, 1, 1;	2882	glColor 0, 0, 0, 1;
2653	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654	glDisable GL_TEXTURE_2D;	2884	glDisable GL_TEXTURE_2D;
2655	}	2885	}
2656	}	2886	}
2657		2887
…		…
2664	$self->SUPER::DESTROY;	2894	$self->SUPER::DESTROY;
2665	}	2895	}
2666		2896
2667	#############################################################################	2897	#############################################################################
2668		2898
2669	package CFClient::UI::InventoryItem;	2899	package CFClient::UI::Buttonbar;
2670		2900
2671	our @ISA = CFClient::UI::HBox::;	2901	our @ISA = CFClient::UI::HBox::;
2672		2902
2673	sub _item_to_desc {	2903	# TODO: should actualyl wrap buttons and other goodies.
2674	my ($item) = @_;
2675
2676	my $desc =
2677	$item->{nrof} < 2
2678	? $item->{name}
2679	: "$item->{nrof} × $item->{name_pl}";
2680
2681	$item->{flags} & Crossfire::Protocol::F_OPEN
2682	and $desc .= " (open)";
2683	$item->{flags} & Crossfire::Protocol::F_APPLIED
2684	and $desc .= " (applied)";
2685	$item->{flags} & Crossfire::Protocol::F_UNPAID
2686	and $desc .= " (unpaid)";
2687	$item->{flags} & Crossfire::Protocol::F_MAGIC
2688	and $desc .= " (magic)";
2689	$item->{flags} & Crossfire::Protocol::F_CURSED
2690	and $desc .= " (cursed)";
2691	$item->{flags} & Crossfire::Protocol::F_DAMNED
2692	and $desc .= " (damned)";
2693	$item->{flags} & Crossfire::Protocol::F_LOCKED
2694	and $desc .= " *";
2695
2696	$desc
2697	}
2698
2699	sub new {
2700	my $class = shift;
2701
2702	my %args = @_;
2703
2704	my $item = delete $args{item};
2705
2706	my $desc = _item_to_desc ($item);
2707
2708	my $self = $class->SUPER::new (
2709	can_hover => 1,
2710	can_events => 1,
2711	tooltip => ((CFClient::UI::Label::escape $desc)
2712	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713	connect_button_down => sub {
2714	my ($self, $ev, $x, $y) = @_;
2715
2716	# todo: maybe put examine on 1? but should just be a tooltip :(
2717	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718	my $targ = $::CONN->{player}{tag};
2719
2720	if ($item->{container} == $::CONN->{player}{tag}) {
2721	$targ = $main::OPENCONT;
2722	}
2723
2724	$::CONN->send ("move $targ $item->{tag} 0");
2725	} elsif ($ev->{button} == 1) {
2726	$::CONN->send ("examine $item->{tag}");
2727	} elsif ($ev->{button} == 2) {
2728	$::CONN->send ("apply $item->{tag}");
2729	} elsif ($ev->{button} == 3) {
2730	my @menu_items = (
2731	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734	(
2735	$item->{flags} & Crossfire::Protocol::F_LOCKED
2736	? (
2737	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738	)
2739	: (
2740	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742	)
2743	),
2744	);
2745
2746	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747	}
2748
2749	1
2750	},
2751	%args
2752	);
2753
2754
2755	$self->add (new CFClient::UI::Face
2756	can_events => 0,
2757	face => $item->{face},
2758	anim => $item->{anim},
2759	animspeed => $item->{animspeed},
2760	);
2761
2762	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764	$self->{item} = $item;
2765
2766	$self->update_item;
2767
2768	$self
2769	}
2770
2771	sub update_item {
2772	my ($self) = @_;
2773
2774	my $desc = _item_to_desc ($self->{item});
2775
2776	$self->{name_lbl}->set_text ($desc);
2777	}
2778
2779	#############################################################################
2780
2781	package CFClient::UI::Inventory;
2782
2783	our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785	sub new {
2786	my $class = shift;
2787
2788	my $self = $class->SUPER::new (
2789	scrolled => (new CFClient::UI::Table),
2790	@_,
2791	);
2792
2793	$self
2794	}
2795
2796	sub set_items {
2797	my ($self, $items) = @_;
2798
2799	$self->{scrolled}->clear;
2800	return unless $items;
2801
2802	my @items = sort {
2803	($a->{type} <=> $b->{type})
2804	or ($a->{name} cmp $b->{name})
2805	} @$items;
2806
2807	$self->{real_items} = \@items;
2808
2809	for my $item (@items) {
2810	$item->{item} = $item;
2811	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812	$item->update_item ();
2813	}
2814
2815	my $i = 0;
2816	for (@items) {
2817	$self->{scrolled}->add (0, $i, $_);
2818	my $nrof = $_->{item}->{nrof} || 1;
2819	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820	}
2821
2822	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823	}
2824
2825	sub size_request {
2826	my ($self) = @_;
2827	($self->{req_w}, $self->{req_h});
2828	}
2829		2904
2830	#############################################################################	2905	#############################################################################
2831		2906
2832	package CFClient::UI::Menu;	2907	package CFClient::UI::Menu;
2833		2908
…		…
2867		2942
2868	# popup given the event (must be a mouse button down event currently)	2943	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	2944	sub popup {
2870	my ($self, $ev) = @_;	2945	my ($self, $ev) = @_;
2871		2946
2872	$self->emit ("popdown");	2947	$self->_emit ("popdown");
2873		2948
2874	# maybe save $GRAB? must be careful about events...	2949	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	2950	$GRAB = $self;
2876	$self->{button} = $ev->{button};	2951	$self->{button} = $ev->{button};
2877		2952
2878	$self->show;	2953	$self->show;
2879	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2954	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880	}	2955	}
2881		2956
2882	sub mouse_motion {	2957	sub mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	2958	my ($self, $ev, $x, $y) = @_;
2884		2959
2885	# TODO: should use vbox->find_widget or so	2960	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	2962	$self->{hover} = $self->{item}{$HOVER};
		2963
		2964	0
2888	}	2965	}
2889		2966
2890	sub button_up {	2967	sub button_up {
2891	my ($self, $ev, $x, $y) = @_;	2968	my ($self, $ev, $x, $y) = @_;
2892		2969
2893	if ($ev->{button} == $self->{button}) {	2970	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	2971	undef $GRAB;
2895	$self->hide;	2972	$self->hide;
2896		2973
2897	$self->emit ("popdown");	2974	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2975	$self->{hover}[1]->() if $self->{hover};
		2976	} else {
		2977	return 0
		2978	}
		2979
2899	}	2980	1
2900	}	2981	}
2901		2982
2902	#############################################################################	2983	#############################################################################
2903		2984
2904	package CFClient::UI::Statusbox;	2985	package CFClient::UI::Multiplexer;
2905		2986
2906	our @ISA = CFClient::UI::VBox::;	2987	our @ISA = CFClient::UI::Container::;
2907		2988
2908	sub new {	2989	sub new {
2909	my $class = shift;	2990	my $class = shift;
2910		2991
2911	$class->SUPER::new (	2992	my $self = $class->SUPER::new (
		2993	@_,
		2994	);
		2995
		2996	$self->{current} = $self->{children}[0]
		2997	if @{ $self->{children} };
		2998
		2999	$self
		3000	}
		3001
		3002	sub add {
		3003	my ($self, @widgets) = @_;
		3004
		3005	$self->SUPER::add (@widgets);
		3006
		3007	$self->{current} = $self->{children}[0]
		3008	if @{ $self->{children} };
		3009	}
		3010
		3011	sub set_current_page {
		3012	my ($self, $page_or_widget) = @_;
		3013
		3014	my $widget = ref $page_or_widget
		3015	? $page_or_widget
		3016	: $self->{children}[$page_or_widget];
		3017
		3018	$self->{current} = $widget;
		3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3020
		3021	$self->_emit (page_changed => $self->{current});
		3022
		3023	$self->realloc;
		3024	}
		3025
		3026	sub visible_children {
		3027	$_[0]{current}
		3028	}
		3029
		3030	sub size_request {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->size_request
		3034	}
		3035
		3036	sub size_allocate {
		3037	my ($self, $w, $h) = @_;
		3038
		3039	$self->{current}->configure (0, 0, $w, $h);
		3040	}
		3041
		3042	sub _draw {
		3043	my ($self) = @_;
		3044
		3045	$self->{current}->draw;
		3046	}
		3047
		3048	#############################################################################
		3049
		3050	package CFClient::UI::Notebook;
		3051
		3052	our @ISA = CFClient::UI::VBox::;
		3053
		3054	sub new {
		3055	my $class = shift;
		3056
		3057	my $self = $class->SUPER::new (
		3058	buttonbar => (new CFClient::UI::Buttonbar),
		3059	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3060	# filter => # will be put between multiplexer and $self
		3061	@_,
		3062	);
		3063
		3064	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3065	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3066
		3067	$self
		3068	}
		3069
		3070	sub add {
		3071	my ($self, $title, $widget, $tooltip) = @_;
		3072
		3073	Scalar::Util::weaken $self;
		3074
		3075	$self->{buttonbar}->add (new CFClient::UI::Button
		3076	markup => $title,
		3077	tooltip => $tooltip,
		3078	on_activate => sub { $self->set_current_page ($widget) },
		3079	);
		3080
		3081	$self->{multiplexer}->add ($widget);
		3082	}
		3083
		3084	sub set_current_page {
		3085	my ($self, $page) = @_;
		3086
		3087	$self->{multiplexer}->set_current_page ($page);
		3088	$self->_emit (page_changed => $self->{multiplexer}{current});
		3089	}
		3090
		3091	#############################################################################
		3092
		3093	package CFClient::UI::Statusbox;
		3094
		3095	our @ISA = CFClient::UI::VBox::;
		3096
		3097	sub new {
		3098	my $class = shift;
		3099
		3100	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3101	fontsize => 0.8,
2913	@_,	3102	@_,
2914	)	3103	);
		3104
		3105	Scalar::Util::weaken (my $this = $self);
		3106
		3107	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3108
		3109	$self
2915	}	3110	}
2916		3111
2917	sub reorder {	3112	sub reorder {
2918	my ($self) = @_;	3113	my ($self) = @_;
2919	my $NOW = time;	3114	my $NOW = Time::HiRes::time;
		3115
		3116	# freeze display when hovering over any label
		3117	return if $CFClient::UI::TOOLTIP->{owner}
		3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3119	values %{ $self->{item} };
2920		3120
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3121	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3123	}
2924		3124
…		…
2927	my @items = sort {	3127	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3128	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3129	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3130	} values %{ $self->{item} };
2931		3131
		3132	$self->{timer}->interval (1);
		3133
2932	my $count = 10 + 1;	3134	my $count = 10 + 1;
2933	for my $item (@items) {	3135	for my $item (@items) {
2934	last unless --$count;	3136	last unless --$count;
2935		3137
2936	push @widgets, $item->{label} ||= do {	3138	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3139	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3140	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3141	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3142	: $item->{text};
2941		3143
…		…
2949	tooltip => $item->{tooltip},	3151	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3152	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3153	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3154	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3155	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3156	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3157	can_events => 1,
2956	can_hover => 1	3158	can_hover => 1
2957	};	3159	};
		3160
		3161	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3162	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3163	$label->update;
		3164	$label->set_max_size (undef, $label->{req_h} * $diff)
		3165	if $diff < 1;
		3166	$self->{timer}->interval (1/30);
		3167	} else {
		3168	$label->{fg}[3] = $item->{fg}[3] || 1;
		3169	}
		3170
		3171	push @widgets, $label;
2958	}	3172	}
2959		3173
2960	$self->clear;	3174	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3175	$self->SUPER::add (reverse @widgets);
2962	}	3176	}
…		…
2965	my ($self, $text, %arg) = @_;	3179	my ($self, $text, %arg) = @_;
2966		3180
2967	$text =~ s/^\s+//;	3181	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3182	$text =~ s/\s+$//;
2969		3183
		3184	return unless $text;
		3185
2970	my $timeout = time + ((delete $arg{timeout}) || 60);	3186	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971		3187
2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3188	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973		3189
2974	if (my $item = $self->{item}{$group}) {	3190	if (my $item = $self->{item}{$group}) {
2975	if ($item->{text} eq $text) {	3191	if ($item->{text} eq $text) {
…		…
3005		3221
3006	$self->reorder;	3222	$self->reorder;
3007	$self->SUPER::reconfigure;	3223	$self->SUPER::reconfigure;
3008	}	3224	}
3009		3225
		3226	sub DESTROY {
		3227	my ($self) = @_;
		3228
		3229	$self->{timer}->cancel;
		3230
		3231	$self->SUPER::DESTROY;
		3232	}
		3233
3010	#############################################################################	3234	#############################################################################
3011		3235
3012	package CFClient::UI::Root;	3236	package CFClient::UI::Inventory;
3013		3237
3014	our @ISA = CFClient::UI::Container::;	3238	our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016	use CFClient::OpenGL;
3017		3239
3018	sub new {	3240	sub new {
3019	my $class = shift;	3241	my $class = shift;
3020		3242
3021	$class->SUPER::new (	3243	my $self = $class->SUPER::new (
		3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3245	@_,
		3246	);
		3247
		3248	$self
		3249	}
		3250
		3251	sub set_items {
		3252	my ($self, $items) = @_;
		3253
		3254	$self->{child}->clear;
		3255	return unless $items;
		3256
		3257	my @items = sort {
		3258	($a->{type} <=> $b->{type})
		3259	or ($a->{name} cmp $b->{name})
		3260	} @$items;
		3261
		3262	$self->{real_items} = \@items;
		3263
		3264	my $row = 0;
		3265	for my $item (@items) {
		3266	CFClient::Item::update_widgets $item;
		3267
		3268	$self->{child}->add (0, $row, $item->{face_widget});
		3269	$self->{child}->add (1, $row, $item->{desc_widget});
		3270	$self->{child}->add (2, $row, $item->{weight_widget});
		3271
		3272	$row++;
		3273	}
		3274	}
		3275
		3276	#############################################################################
		3277
		3278	package CFClient::UI::BindEditor;
		3279
		3280	our @ISA = CFClient::UI::FancyFrame::;
		3281
		3282	sub new {
		3283	my $class = shift;
		3284
		3285	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3286
		3287	$self->add (my $vb = new CFClient::UI::VBox);
		3288
		3289
		3290	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3291	text => "start recording",
		3292	tooltip => "Start/Stops recording of actions."
		3293	."All subsequent actions after the recording started will be captured."
		3294	."The actions are displayed after the record was stopped."
		3295	."To bind the action you have to click on the 'Bind' button",
		3296	on_activate => sub {
		3297	unless ($self->{recording}) {
		3298	$self->start;
		3299	} else {
		3300	$self->stop;
		3301	}
		3302	});
		3303
		3304	$vb->add (new CFClient::UI::Label text => "Actions:");
		3305	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3306
		3307	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3308	$vb->add (my $hb = new CFClient::UI::HBox);
		3309	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3310	$hb->add (new CFClient::UI::Button
		3311	text => "bind",
		3312	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3313	on_activate => sub {
		3314	$self->ask_for_bind;
		3315	});
		3316
		3317	$vb->add (my $hb = new CFClient::UI::HBox);
		3318	$hb->add (new CFClient::UI::Button
		3319	text => "ok",
		3320	expand => 1,
		3321	tooltip => "This closes the binding editor and saves the binding",
		3322	on_activate => sub {
		3323	$self->hide;
		3324	$self->commit;
		3325	});
		3326
		3327	$hb->add (new CFClient::UI::Button
		3328	text => "cancel",
		3329	expand => 1,
		3330	tooltip => "This closes the binding editor without saving",
		3331	on_activate => sub {
		3332	$self->hide;
		3333	$self->{binding_cancel}->()
		3334	if $self->{binding_cancel};
		3335	});
		3336
		3337	$self->update_binding_widgets;
		3338
		3339	$self
		3340	}
		3341
		3342	sub commit {
		3343	my ($self) = @_;
		3344	my ($mod, $sym, $cmds) = $self->get_binding;
		3345	if ($sym != 0 && @$cmds > 0) {
		3346	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3347	."'. Don't forget 'Save Config'!");
		3348	$self->{binding_change}->($mod, $sym, $cmds)
		3349	if $self->{binding_change};
		3350	} else {
		3351	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3352	$self->{binding_cancel}->()
		3353	if $self->{binding_cancel};
		3354	}
		3355	}
		3356
		3357	sub start {
		3358	my ($self) = @_;
		3359
		3360	$self->{rec_btn}->set_text ("stop recording");
		3361	$self->{recording} = 1;
		3362	$self->clear_command_list;
		3363	$::CONN->start_record if $::CONN;
		3364	}
		3365
		3366	sub stop {
		3367	my ($self) = @_;
		3368
		3369	$self->{rec_btn}->set_text ("start recording");
		3370	$self->{recording} = 0;
		3371
		3372	my $rec;
		3373	$rec = $::CONN->stop_record if $::CONN;
		3374	return unless ref $rec eq 'ARRAY';
		3375	$self->set_command_list ($rec);
		3376	}
		3377
		3378
		3379	sub ask_for_bind_and_commit {
		3380	my ($self) = @_;
		3381	$self->ask_for_bind (1);
		3382	}
		3383
		3384	sub ask_for_bind {
		3385	my ($self, $commit) = @_;
		3386
		3387	CFClient::Binder::open_binding_dialog (sub {
		3388	my ($mod, $sym) = @_;
		3389	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3390	$self->update_binding_widgets;
		3391	$self->commit if $commit;
		3392	});
		3393	}
		3394
		3395	# $mod and $sym are the modifiers and key symbol
		3396	# $cmds is a array ref of strings (the commands)
		3397	# $cb is the callback that is executed on OK
		3398	# $ccb is the callback that is executed on CANCEL and
		3399	# when the binding was unsuccessful on OK
		3400	sub set_binding {
		3401	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3402
		3403	$self->clear_command_list;
		3404	$self->{recording} = 0;
		3405	$self->{rec_btn}->set_text ("start recording");
		3406
		3407	$self->{binding} = [$mod, $sym];
		3408	$self->{commands} = $cmds;
		3409
		3410	$self->{binding_change} = $cb;
		3411	$self->{binding_cancel} = $ccb;
		3412
		3413	$self->update_binding_widgets;
		3414	}
		3415
		3416	# this is a shortcut method that asks for a binding
		3417	# and then just binds it.
		3418	sub do_quick_binding {
		3419	my ($self, $cmds) = @_;
		3420	$self->set_binding (undef, undef, $cmds, sub {
		3421	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3422	});
		3423	$self->ask_for_bind (1);
		3424	}
		3425
		3426	sub update_binding_widgets {
		3427	my ($self) = @_;
		3428	my ($mod, $sym, $cmds) = $self->get_binding;
		3429	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3430	$self->set_command_list ($cmds);
		3431	}
		3432
		3433	sub get_binding {
		3434	my ($self) = @_;
		3435	return (
		3436	$self->{binding}->[0],
		3437	$self->{binding}->[1],
		3438	[ grep { defined $_ } @{$self->{commands}} ]
		3439	);
		3440	}
		3441
		3442	sub clear_command_list {
		3443	my ($self) = @_;
		3444	$self->{cmdbox}->clear ();
		3445	}
		3446
		3447	sub set_command_list {
		3448	my ($self, $cmds) = @_;
		3449
		3450	$self->{cmdbox}->clear ();
		3451	$self->{commands} = $cmds;
		3452
		3453	my $idx = 0;
		3454
		3455	for (@$cmds) {
		3456	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3457
		3458	my $i = $idx;
		3459	$hb->add (new CFClient::UI::Label text => $_);
		3460	$hb->add (new CFClient::UI::Button
		3461	text => "delete",
		3462	tooltip => "Deletes the action from the record",
		3463	on_activate => sub {
		3464	$self->{cmdbox}->remove ($hb);
		3465	$cmds->[$i] = undef;
		3466	});
		3467
		3468
		3469	$idx++
		3470	}
		3471	}
		3472
		3473	#############################################################################
		3474
		3475	package CFClient::UI::SpellList;
		3476
		3477	our @ISA = CFClient::UI::Table::;
		3478
		3479	sub new {
		3480	my $class = shift;
		3481
		3482	my $self = $class->SUPER::new (
		3483	binding => [],
		3484	commands => [],
3022	@_,	3485	@_,
3023	)	3486	)
3024	}	3487	}
3025		3488
3026	sub configure {	3489	# XXX: Do sorting? Argl...
3027	my ($self, $x, $y, $w, $h) = @_;	3490	sub add_spell {
3028
3029	$self->{w} = $w;
3030	$self->{h} = $h;
3031	}
3032
3033	sub check_size {
3034	my ($self) = @_;	3491	my ($self, $spell) = @_;
		3492	$self->{spells}->{$spell->{name}} = $spell;
3035		3493
3036	$self->size_allocate ($self->{w}, $self->{h})	3494	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3037	if $self->{w};	3495	face => $spell->{face},
		3496	can_hover => 1,
		3497	can_events => 1,
		3498	tooltip => $spell->{message});
		3499
		3500	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3501	text => $spell->{name},
		3502	can_hover => 1,
		3503	can_events => 1,
		3504	tooltip => $spell->{message},
		3505	expand => 1);
		3506
		3507	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3508	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3509	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3510	expand => 1);
		3511
		3512	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3513	text => "bind to key",
		3514	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3515	}
		3516
		3517	sub rebuild_spell_list {
		3518	my ($self) = @_;
		3519	$self->{tbl_idx} = 0;
		3520	$self->add_spell ($_) for values %{$self->{spells}};
		3521	}
		3522
		3523	sub remove_spell {
		3524	my ($self, $spell) = @_;
		3525	delete $self->{spells}->{$spell->{name}};
		3526	$self->rebuild_spell_list;
		3527	}
		3528
		3529	#############################################################################
		3530
		3531	package CFClient::UI::Root;
		3532
		3533	our @ISA = CFClient::UI::Container::;
		3534
		3535	use List::Util qw(min max);
		3536
		3537	use CFClient::OpenGL;
		3538
		3539	sub new {
		3540	my $class = shift;
		3541
		3542	my $self = $class->SUPER::new (
		3543	visible => 1,
		3544	@_,
		3545	);
		3546
		3547	Scalar::Util::weaken ($self->{root} = $self);
		3548
		3549	$self
3038	}	3550	}
3039		3551
3040	sub size_request {	3552	sub size_request {
3041	my ($self) = @_;	3553	my ($self) = @_;
3042		3554
3043	($self->{w}, $self->{h})	3555	($self->{w}, $self->{h})
		3556	}
		3557
		3558	sub _to_pixel {
		3559	my ($coord, $size, $max) = @_;
		3560
		3561	$coord =
		3562	$coord eq "center" ? ($max - $size) * 0.5
		3563	: $coord eq "max" ? $max
		3564	: $coord;
		3565
		3566	$coord = 0 if $coord < 0;
		3567	$coord = $max - $size if $coord > $max - $size;
		3568
		3569	int $coord + 0.5
3044	}	3570	}
3045		3571
3046	sub size_allocate {	3572	sub size_allocate {
3047	my ($self, $w, $h) = @_;	3573	my ($self, $w, $h) = @_;
3048		3574
3049	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055	for my $child ($self->children) {	3575	for my $child ($self->children) {
3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3576	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057		3577
3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3578	$X = $child->{force_x} if exists $child->{force_x};
3059	if exists $child->{req_x};	3579	$Y = $child->{force_y} if exists $child->{force_y};
3060		3580
3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3581	$X = _to_pixel $X, $W, $self->{w};
3062	if exists $child->{req_y};	3582	$Y = _to_pixel $Y, $H, $self->{h};
3063
3064	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066		3583
3067	$child->configure ($X, $Y, $W, $H);	3584	$child->configure ($X, $Y, $W, $H);
3068	}	3585	}
3069	}	3586	}
3070		3587
…		…
3081	}	3598	}
3082		3599
3083	sub update {	3600	sub update {
3084	my ($self) = @_;	3601	my ($self) = @_;
3085		3602
3086	$self->check_size;
3087	$::WANT_REFRESH++;	3603	$::WANT_REFRESH++;
3088	}	3604	}
3089		3605
3090	sub add {	3606	sub add {
3091	my ($self, @children) = @_;	3607	my ($self, @children) = @_;
3092		3608
3093	for my $child (@children) {
3094	$child->{toplevel} = 1;	3609	$_->{is_toplevel} = 1
3095		3610	for @children;
3096	# integerise window positions
3097	$child->{x} = int $child->{x};
3098	$child->{y} = int $child->{y};
3099	}
3100		3611
3101	$self->SUPER::add (@children);	3612	$self->SUPER::add (@children);
		3613	}
		3614
		3615	sub remove {
		3616	my ($self, @children) = @_;
		3617
		3618	$self->SUPER::remove (@children);
		3619
		3620	delete $self->{is_toplevel}
		3621	for @children;
3102		3622
3103	while (@children) {	3623	while (@children) {
3104	my $w = pop @children;	3624	my $w = pop @children;
3105	push @children, $w->children;	3625	push @children, $w->children;
3106	$w->{visible} = 1;	3626	$w->set_invisible;
3107	}
3108	}
3109
3110	sub remove {
3111	my ($self, @children) = @_;
3112
3113	$self->SUPER::remove (@children);
3114
3115	while (@children) {
3116	my $w = pop @children;
3117	push @children, $w->children;
3118	delete $w->{visible};
3119	}	3627	}
3120	}	3628	}
3121		3629
3122	sub on_refresh {	3630	sub on_refresh {
3123	my ($self, $id, $cb) = @_;	3631	my ($self, $id, $cb) = @_;
…		…
3137	while ($self->{refresh_hook}) {	3645	while ($self->{refresh_hook}) {
3138	$_->()	3646	$_->()
3139	for values %{delete $self->{refresh_hook}};	3647	for values %{delete $self->{refresh_hook}};
3140	}	3648	}
3141		3649
3142	if ($self->{check_size}) {	3650	if ($self->{realloc}) {
3143	my @queue = ([], []);	3651	my %queue;
		3652	my @queue;
		3653	my $widget;
3144		3654
3145	for (;;) {	3655	outer:
3146	if ($self->{check_size}) {	3656	while () {
3147	# heuristic: check containers last	3657	if (my $realloc = delete $self->{realloc}) {
3148	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3658	for $widget (values %$realloc) {
3149	for values %{delete $self->{check_size}}	3659	$widget->{visible} or next; # do not resize invisible widgets
		3660
		3661	$queue{$widget+0}++ and next; # duplicates are common
		3662
		3663	push @{ $queue[$widget->{visible}] }, $widget;
		3664	}
3150	}	3665	}
3151		3666
3152	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3667	while () {
		3668	@queue or last outer;
3153		3669
3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3670	$widget = pop @{ $queue[-1] || [] }
3155	? @$widget{qw(user_w user_h)}	3671	and last;
3156	: $widget->size_request;
3157
3158	if (delete $widget->{force_alloc}
3159	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161		3672
		3673	pop @queue;
		3674	}
		3675
		3676	delete $queue{$widget+0};
		3677
		3678	my ($w, $h) = $widget->size_request;
		3679
		3680	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3681	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3682
		3683	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3684	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3685
		3686	$w = $widget->{force_w} if exists $widget->{force_w};
		3687	$h = $widget->{force_h} if exists $widget->{force_h};
		3688
		3689	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3690	|| delete $widget->{force_realloc}) {
3162	$widget->{req_w} = $w;	3691	$widget->{req_w} = $w;
3163	$widget->{req_h} = $h;	3692	$widget->{req_h} = $h;
3164		3693
3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3694	$self->{size_alloc}{$widget+0} = $widget;
3166		3695
3167	$widget->{parent}->check_size
3168	if $widget->{parent};	3696	if (my $parent = $widget->{parent}) {
		3697	$self->{realloc}{$parent+0} = $parent
		3698	unless $queue{$parent+0};
		3699
		3700	$parent->{force_size_alloc} = 1;
		3701	$self->{size_alloc}{$parent+0} = $parent;
		3702	}
3169	}	3703	}
		3704
		3705	delete $self->{realloc}{$widget+0};
3170	}	3706	}
3171	}	3707	}
3172		3708
3173	while ($self->{size_alloc}) {	3709	while (my $size_alloc = delete $self->{size_alloc}) {
3174	for (values %{delete $self->{size_alloc}}) {	3710	my @queue = sort { $b->{visible} <=> $a->{visible} }
3175	my ($widget, $w, $h) = @$_;	3711	values %$size_alloc;
		3712
		3713	while () {
		3714	my $widget = pop @queue || last;
		3715
		3716	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176		3717
3177	$w = 0 if $w < 0;	3718	$w = 0 if $w < 0;
3178	$h = 0 if $h < 0;	3719	$h = 0 if $h < 0;
3179		3720
		3721	$w = int $w + 0.5;
		3722	$h = int $h + 0.5;
		3723
		3724	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3725	$widget->{old_w} = $widget->{w};
		3726	$widget->{old_h} = $widget->{h};
		3727
3180	$widget->{w} = $w;	3728	$widget->{w} = $w;
3181	$widget->{h} = $h;	3729	$widget->{h} = $h;
3182	$widget->size_allocate ($w, $h);	3730
3183	$widget->emit (size_allocate => $w, $h);	3731	$widget->emit (size_allocate => $w, $h);
		3732	}
3184	}	3733	}
3185	}	3734	}
3186		3735
3187	while ($self->{post_alloc_hook}) {	3736	while ($self->{post_alloc_hook}) {
3188	$_->()	3737	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3738	for values %{delete $self->{post_alloc_hook}};
3190	}	3739	}
		3740
3191		3741
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3742	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3743	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3744	glClear GL_COLOR_BUFFER_BIT;
3195		3745
…		…
3197	glLoadIdentity;	3747	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3748	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3749	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3750	glLoadIdentity;
3201		3751
		3752	{
		3753	package CFClient::UI::Base;
		3754
		3755	($draw_x, $draw_y, $draw_w, $draw_h) =
		3756	(0, 0, $self->{w}, $self->{h});
		3757	}
		3758
3202	$self->_draw;	3759	$self->_draw;
3203	}	3760	}
3204		3761
3205	#############################################################################	3762	#############################################################################
3206		3763

Diff Legend

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