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.302 by root, Mon Jun 12 13:26:14 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->{visible};
		278	delete $self->{root};
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, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243	$self->{y} = int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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	}	592	}
423		593
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	}
473
474	sub DESTROY {	594	sub DESTROY {
475	my ($self) = @_;	595	my ($self) = @_;
476		596
477	delete $WIDGET{$self+0};	597	delete $WIDGET{$self+0};
478	#$self->deactivate;	598
		599	eval { $self->destroy };
		600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479	}	601	}
480		602
481	#############################################################################	603	#############################################################################
482		604
483	package CFClient::UI::DrawBG;	605	package CFClient::UI::DrawBG;
…		…
508		630
509	if ($color && (@$color < 4 || $color->[3])) {	631	if ($color && (@$color < 4 || $color->[3])) {
510	my ($w, $h) = @$self{qw(w h)};	632	my ($w, $h) = @$self{qw(w h)};
511		633
512	glEnable GL_BLEND;	634	glEnable GL_BLEND;
513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	635	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514	glColor @$color;	636	glColor_premultiply @$color;
515		637
516	glBegin GL_QUADS;	638	glBegin GL_QUADS;
517	glVertex 0 , 0;	639	glVertex 0 , 0;
518	glVertex 0 , $h;	640	glVertex 0 , $h;
519	glVertex $w, $h;	641	glVertex $w, $h;
…		…
534	my ($class, %arg) = @_;	656	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	657	$class->SUPER::new (can_events => 0, %arg);
536	}	658	}
537		659
538	sub size_request {	660	sub size_request {
539	(0, 0)	661	my ($self) = @_;
		662
		663	($self->{w} + 0, $self->{h} + 0)
540	}	664	}
541		665
542	sub draw { }	666	sub draw { }
543		667
544	#############################################################################	668	#############################################################################
…		…
548	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFClient::UI::Base::;
549		673
550	sub new {	674	sub new {
551	my ($class, %arg) = @_;	675	my ($class, %arg) = @_;
552		676
553	my $children = delete $arg{children} || [];	677	my $children = delete $arg{children};
554		678
555	my $self = $class->SUPER::new (	679	my $self = $class->SUPER::new (
556	children => [],	680	children => [],
557	can_events => 0,	681	can_events => 0,
558	%arg,	682	%arg,
559	);	683	);
		684
560	$self->add ($_) for @$children;	685	$self->add (@$children)
		686	if $children;
561		687
562	$self	688	$self
563	}	689	}
564		690
565	sub add {	691	sub add {
…		…
573	$self->{children} = [	699	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	700	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	701	@{$self->{children}}, @widgets
576	];	702	];
577		703
578	$self->check_size (1);	704	$self->realloc;
579	$self->update;
580	}	705	}
581		706
582	sub children {	707	sub children {
583	@{ $_[0]{children} }	708	@{ $_[0]{children} }
584	}	709	}
…		…
589	delete $child->{parent};	714	delete $child->{parent};
590	$child->hide;	715	$child->hide;
591		716
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	717	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		718
594	$self->check_size;	719	$self->realloc;
595	$self->update;
596	}	720	}
597		721
598	sub clear {	722	sub clear {
599	my ($self) = @_;	723	my ($self) = @_;
600		724
…		…
604	for (@$children) {	728	for (@$children) {
605	delete $_->{parent};	729	delete $_->{parent};
606	$_->hide;	730	$_->hide;
607	}	731	}
608		732
609	$self->check_size;	733	$self->realloc;
610	$self->update;
611	}	734	}
612		735
613	sub find_widget {	736	sub find_widget {
614	my ($self, $x, $y) = @_;	737	my ($self, $x, $y) = @_;
615		738
616	$x -= $self->{x};	739	$x -= $self->{x};
617	$y -= $self->{y};	740	$y -= $self->{y};
618		741
619	my $res;	742	my $res;
620		743
621	for (reverse @{ $self->{children} }) {	744	for (reverse $self->visible_children) {
622	$res = $_->find_widget ($x, $y)	745	$res = $_->find_widget ($x, $y)
623	and return $res;	746	and return $res;
624	}	747	}
625		748
626	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	749	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
647	}	770	}
648		771
649	sub add {	772	sub add {
650	my ($self, $child) = @_;	773	my ($self, $child) = @_;
651		774
652	$self->{children} = [];	775	$self->SUPER::remove ($_) for @{ $self->{children} };
653
654	$self->SUPER::add ($child);	776	$self->SUPER::add ($child);
655	}	777	}
656		778
657	sub remove {	779	sub remove {
658	my ($self, $widget) = @_;	780	my ($self, $widget) = @_;
…		…
675	$self->{children}[0]->configure (0, 0, $w, $h);	797	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	798	}
677		799
678	#############################################################################	800	#############################################################################
679		801
		802	# back-buffered drawing area
		803
680	package CFClient::UI::Window;	804	package CFClient::UI::Window;
681		805
682	our @ISA = CFClient::UI::Bin::;	806	our @ISA = CFClient::UI::Bin::;
683		807
684	use CFClient::OpenGL;	808	use CFClient::OpenGL;
…		…
702	$self->SUPER::size_allocate ($w, $h);	826	$self->SUPER::size_allocate ($w, $h);
703	$self->update;	827	$self->update;
704	}	828	}
705		829
706	sub _render {	830	sub _render {
		831	my ($self) = @_;
		832
707	$_[0]{children}[0]->draw;	833	$self->{children}[0]->draw;
708	}	834	}
709		835
710	sub render_child {	836	sub render_child {
711	my ($self) = @_;	837	my ($self) = @_;
712		838
713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714	glClearColor 0, 0, 0, 0;	840	glClearColor 0, 0, 0, 0;
715	glClear GL_COLOR_BUFFER_BIT;	841	glClear GL_COLOR_BUFFER_BIT;
716		842
		843	{
		844	package CFClient::UI::Base;
		845
		846	($draw_x, $draw_y, $draw_w, $draw_h) =
		847	(0, 0, $self->{w}, $self->{h});
		848	}
		849
717	$self->_render;	850	$self->_render;
718	};	851	};
719	}	852	}
720		853
721	sub _draw {	854	sub _draw {
722	my ($self) = @_;	855	my ($self) = @_;
723		856
724	my ($w, $h) = ($self->w, $self->h);	857	my ($w, $h) = @$self{qw(w h)};
725		858
726	my $tex = $self->{texture}	859	my $tex = $self->{texture}
727	or return;	860	or return;
728		861
729	glEnable GL_TEXTURE_2D;	862	glEnable GL_TEXTURE_2D;
730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731	glColor 1, 1, 1, 1;	864	glColor 0, 0, 0, 1;
732		865
733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734		867
735	glDisable GL_TEXTURE_2D;	868	glDisable GL_TEXTURE_2D;
736	}	869	}
…		…
739		872
740	package CFClient::UI::ViewPort;	873	package CFClient::UI::ViewPort;
741		874
742	our @ISA = CFClient::UI::Window::;	875	our @ISA = CFClient::UI::Window::;
743		876
		877	sub new {
		878	my $class = shift;
		879
		880	$class->SUPER::new (
		881	scroll_x => 0,
		882	scroll_y => 1,
		883	@_,
		884	)
		885	}
		886
744	sub size_request {	887	sub size_request {
745	my ($self) = @_;	888	my ($self) = @_;
746		889
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748		891
749	@$self{qw(child_w child_h)}	892	$w = 10 if $self->{scroll_x};
		893	$h = 10 if $self->{scroll_y};
		894
		895	($w, $h)
750	}	896	}
751		897
752	sub size_allocate {	898	sub size_allocate {
753	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
754		900
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	901	my $child = $self->child;
756	# $w = $self->{w};	902
		903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		905
757	$self->child->configure (0, 0, $cw, $ch);	906	$self->child->configure (0, 0, $w, $h);
758	$self->update;	907	$self->update;
759	}	908	}
760		909
761	sub set_offset {	910	sub set_offset {
762	my ($self, $x, $y) = @_;	911	my ($self, $x, $y) = @_;
…		…
796	}	945	}
797		946
798	sub _render {	947	sub _render {
799	my ($self) = @_;	948	my ($self) = @_;
800		949
		950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		952
801	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802		954
803	$self->SUPER::_render;	955	$self->SUPER::_render;
804	}	956	}
805		957
…		…
808	package CFClient::UI::ScrolledWindow;	960	package CFClient::UI::ScrolledWindow;
809		961
810	our @ISA = CFClient::UI::HBox::;	962	our @ISA = CFClient::UI::HBox::;
811		963
812	sub new {	964	sub new {
813	my $class = shift;	965	my ($class, %arg) = @_;
		966
		967	my $child = delete $arg{child};
814		968
815	my $self;	969	my $self;
816		970
817	my $slider = new CFClient::UI::Slider	971	my $slider = new CFClient::UI::Slider
818	vertical => 1,	972	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	973	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	974	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	975	$self->{vp}->set_offset (0, $_[1]);
822	},	976	},
823	;	977	;
824		978
825	$self = $class->SUPER::new (	979	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	980	vp => (new CFClient::UI::ViewPort expand => 1),
827	slider => $slider,	981	slider => $slider,
828	@_,	982	%arg,
829	);	983	);
830		984
831	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});
833	$self->add ($self->{slider});	985	$self->SUPER::add ($self->{vp}, $self->{slider});
		986	$self->add ($child) if $child;
834		987
835	$self	988	$self
		989	}
		990
		991	sub add {
		992	my ($self, $widget) = @_;
		993
		994	$self->{vp}->add ($self->{child} = $widget);
		995	}
		996
		997	sub update {
		998	my ($self) = @_;
		999
		1000	$self->SUPER::update;
		1001
		1002	# todo: overwrite size_allocate of child
		1003	my $child = $self->{vp}->child;
		1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1005	}
		1006
		1007	sub size_allocate {
		1008	my ($self, $w, $h) = @_;
		1009
		1010	$self->SUPER::size_allocate ($w, $h);
		1011
		1012	my $child = $self->{vp}->child;
		1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	1014	}
837		1015
838	#TODO# update range on size_allocate depending on child	1016	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	1017	# update viewport offset on scroll
840		1018
…		…
860		1038
861	if ($self->{bg}) {	1039	if ($self->{bg}) {
862	my ($w, $h) = @$self{qw(w h)};	1040	my ($w, $h) = @$self{qw(w h)};
863		1041
864	glEnable GL_BLEND;	1042	glEnable GL_BLEND;
865	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866	glColor @{ $self->{bg} };	1044	glColor_premultiply @{ $self->{bg} };
867		1045
868	glBegin GL_QUADS;	1046	glBegin GL_QUADS;
869	glVertex 0 , 0;	1047	glVertex 0 , 0;
870	glVertex 0 , $h;	1048	glVertex 0 , $h;
871	glVertex $w, $h;	1049	glVertex $w, $h;
…		…
884		1062
885	our @ISA = CFClient::UI::Bin::;	1063	our @ISA = CFClient::UI::Bin::;
886		1064
887	use CFClient::OpenGL;	1065	use CFClient::OpenGL;
888		1066
889	my @tex =	1067	my $bg =
		1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1069	mipmap => 1, wrap => 1;
		1070
		1071	my @border =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1072	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);	1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1074
893	sub new {	1075	sub new {
894	my $class = shift;	1076	my ($class, %arg) = @_;
895
896	# TODO: user_x, user_y, overwrite moveto?
897		1077
898	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1081	border => 0.6,
902	toplevel => 1,
903	can_events => 1,	1082	can_events => 1,
904	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
905	);	1086	);
906		1087
907	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title_widget} = new CFClient::UI::Label
908	align => 0,	1089	align => 0,
909	valign => 1,	1090	valign => 1,
910	text => $self->{title},	1091	text => $self->{title},
911	fontsize => $self->{border};	1092	fontsize => $self->{border},
		1093	if exists $self->{title};
912		1094
913	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
914	}	1103	}
915		1104
916	sub border {	1105	sub border {
917	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
918	}	1107	}
919		1108
920	sub size_request {	1109	sub size_request {
921	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title_widget}->size_request
		1113	if $self->{title_widget};
922		1114
923	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
924		1116
925	(	1117	(
926	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
929	}	1121	}
930		1122
931	sub size_allocate {	1123	sub size_allocate {
932	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
933		1125
		1126	if ($self->{title_widget}) {
		1127	$self->{title_widget}{w} = $w;
		1128	$self->{title_widget}{h} = $h;
		1129	$self->{title_widget}->size_allocate ($w, $h);
		1130	}
		1131
		1132	my $border = $self->border;
		1133
934	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
935	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
936		1136
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);	1137	$self->child->configure ($border, $border, $w, $h);
941	}	1138	}
942		1139
943	sub button_down {	1140	sub button_down {
944	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
945		1142
…		…
961	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
962		1159
963	my $dx = $ev->{x} - $ox;	1160	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
965		1162
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1165
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969	$self->check_size;	1167	$self->realloc;
970	};	1168	};
971		1169
972	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1174	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
978		1176
979	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
980		1178
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982	$self->update;	1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
984	}	1187	1
985	}	1188	}
986		1189
987	sub button_up {	1190	sub button_up {
988	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
989		1192
990	delete $self->{motion};	1193	!!delete $self->{motion}
991	}	1194	}
992		1195
993	sub mouse_motion {	1196	sub mouse_motion {
994	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
995		1198
996	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
997	}	1202	}
998		1203
999	sub _draw {	1204	sub _draw {
1000	my ($self) = @_;	1205	my ($self) = @_;
1001		1206
		1207	my $child = $self->{children}[0];
		1208
1002	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1003	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1004		1211
1005	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1214
1008	my $border = $self->border;	1215	my $border = $self->border;
1009		1216
1010	glColor @{ $self->{border_bg} };	1217	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1222
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1224	glColor @{ $self->{bg} };
1018		1225
1019	# TODO: repeat texture not scale	1226	# TODO: repeat texture not scale
		1227	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1228	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1229	$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);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1231	}
1030		1232
1031	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1032		1234
1033	$self->{title}->draw if $self->{title};
1034
1035	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title_widget}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title_widget}->_draw;
		1240	}
1036	}	1241	}
1037		1242
1038	#############################################################################	1243	#############################################################################
1039		1244
1040	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1048	sub new {	1253	sub new {
1049	my $class = shift;	1254	my $class = shift;
1050		1255
1051	$class->SUPER::new (	1256	$class->SUPER::new (
1052	col_expand => [],	1257	col_expand => [],
1053	@_	1258	@_,
1054	)	1259	)
		1260	}
		1261
		1262	sub children {
		1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1264	}
1056		1265
1057	sub add {	1266	sub add {
1058	my ($self, $x, $y, $child) = @_;	1267	my ($self, $x, $y, $child) = @_;
1059		1268
1060	$child->set_parent ($self);	1269	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1270	$self->{children}[$y][$x] = $child;
1062		1271
1063	$child->check_size;	1272	$self->realloc;
1064	}	1273	}
1065		1274
1066	sub children {	1275	sub remove {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1276	my ($self, $child) = @_;
1068	}
1069		1277
		1278	# TODO: not yet implemented
		1279	}
		1280
1070	# TODO: move to container class maybe? send childs a signal on removal?	1281	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1282	sub clear {
1072	my ($self) = @_;	1283	my ($self) = @_;
1073		1284
1074	my @children = $self->children;	1285	my @children = $self->children;
1075	delete $self->{children};	1286	delete $self->{children};
…		…
1077	for (@children) {	1288	for (@children) {
1078	delete $_->{parent};	1289	delete $_->{parent};
1079	$_->hide;	1290	$_->hide;
1080	}	1291	}
1081		1292
1082	$self->update;	1293	$self->realloc;
1083	}	1294	}
1084		1295
1085	sub get_wh {	1296	sub get_wh {
1086	my ($self) = @_;	1297	my ($self) = @_;
1087		1298
…		…
1118	sub size_allocate {	1329	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1330	my ($self, $w, $h) = @_;
1120		1331
1121	my ($ws, $hs) = $self->get_wh;	1332	my ($ws, $hs) = $self->get_wh;
1122		1333
1123	my $req_w = sum @$ws;	1334	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1335	my $req_h = (sum @$hs) || 1;
1125		1336
1126	# TODO: nicer code && do row_expand	1337	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1338	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1339	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1340	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1394	}
1184	}	1395	}
1185		1396
1186	#############################################################################	1397	#############################################################################
1187		1398
1188	package CFClient::UI::HBox;	1399	package CFClient::UI::Box;
1189
1190	# TODO: wrap into common Box base class
1191		1400
1192	our @ISA = CFClient::UI::Container::;	1401	our @ISA = CFClient::UI::Container::;
1193		1402
1194	sub size_request {	1403	sub size_request {
1195	my ($self) = @_;	1404	my ($self) = @_;
1196		1405
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1406	$self->{vertical}
1198		1407	? (
1199	(	1408	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1200	(List::Util::sum map $_->[0], @alloc),	1409	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201	(List::Util::max map $_->[1], @alloc),	1410	)
1202	)	1411	: (
		1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1414	)
1203	}	1415	}
1204		1416
1205	sub size_allocate {	1417	sub size_allocate {
1206	my ($self, $w, $h) = @_;	1418	my ($self, $w, $h) = @_;
1207		1419
1208	($h, $w) = ($w, $h);	1420	my $space = $self->{vertical} ? $h : $w;
1209
1210	my $children = $self->{children};	1421	my $children = $self->{children};
1211		1422
1212	my @h = map $_->{req_w}, @$children;	1423	my @req;
1213		1424
1214	my $req_h = List::Util::sum @h;	1425	if ($self->{homogeneous}) {
1215		1426	@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 {	1427	} else {
		1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1429	my $req = List::Util::sum @req;
		1430
		1431	if ($req > $space) {
		1432	# ah well, not enough space
		1433	$_ *= $space / $req for @req;
		1434	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;	1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221	$exp ||= 1;
1222		1436
		1437	$space = ($space - $req) / $expand; # remaining space to give away
		1438
		1439	$req[$_] += $space * $children->[$_]{expand}
1223	for (0 .. $#$children) {	1440	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	}	1441	}
1230	}	1442	}
1231		1443
1232	CFClient::UI::harmonize \@h;	1444	CFClient::UI::harmonize \@req;
1233		1445
1234	my $y = 0;	1446	my $pos = 0;
1235	for (0 .. $#$children) {	1447	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];	1448	my $alloc = $req[$_];
1238	$child->configure ($y, 0, $h, $w);	1449	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239		1450
1240	$y += $h;	1451	$pos += $alloc;
1241	}	1452	}
1242		1453
1243	1	1454	1
1244	}	1455	}
1245		1456
1246	#############################################################################	1457	#############################################################################
1247		1458
		1459	package CFClient::UI::HBox;
		1460
		1461	our @ISA = CFClient::UI::Box::;
		1462
		1463	sub new {
		1464	my $class = shift;
		1465
		1466	$class->SUPER::new (
		1467	vertical => 0,
		1468	@_,
		1469	)
		1470	}
		1471
		1472	#############################################################################
		1473
1248	package CFClient::UI::VBox;	1474	package CFClient::UI::VBox;
1249		1475
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1476	our @ISA = CFClient::UI::Box::;
1253		1477
1254	sub size_request {	1478	sub new {
1255	my ($self) = @_;	1479	my $class = shift;
1256		1480
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1481	$class->SUPER::new (
1258		1482	vertical => 1,
1259	(	1483	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1484	)
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	}	1485	}
1303		1486
1304	#############################################################################	1487	#############################################################################
1305		1488
1306	package CFClient::UI::Label;	1489	package CFClient::UI::Label;
…		…
1323	ellipsise => 3, # end	1506	ellipsise => 3, # end
1324	layout => (new CFClient::Layout),	1507	layout => (new CFClient::Layout),
1325	fontsize => 1,	1508	fontsize => 1,
1326	align => -1,	1509	align => -1,
1327	valign => -1,	1510	valign => -1,
1328	padding => 2,	1511	padding_x => 2,
		1512	padding_y => 2,
1329	can_events => 0,	1513	can_events => 0,
1330	%arg	1514	%arg
1331	);	1515	);
1332		1516
1333	if (exists $self->{template}) {	1517	if (exists $self->{template}) {
…		…
1360		1544
1361	delete $self->{texture};	1545	delete $self->{texture};
1362	$self->SUPER::update;	1546	$self->SUPER::update;
1363	}	1547	}
1364		1548
		1549	sub realloc {
		1550	my ($self) = @_;
		1551
		1552	delete $self->{ox};
		1553	$self->SUPER::realloc;
		1554	}
		1555
1365	sub set_text {	1556	sub set_text {
1366	my ($self, $text) = @_;	1557	my ($self, $text) = @_;
1367		1558
1368	return if $self->{text} eq "T$text";	1559	return if $self->{text} eq "T$text";
1369	$self->{text} = "T$text";	1560	$self->{text} = "T$text";
1370		1561
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1563	$self->{layout}->set_text ($text);
1373		1564
		1565	delete $self->{size_req};
		1566	$self->realloc;
1374	$self->update;	1567	$self->update;
1375	$self->check_size;
1376	}	1568	}
1377		1569
1378	sub set_markup {	1570	sub set_markup {
1379	my ($self, $markup) = @_;	1571	my ($self, $markup) = @_;
1380		1572
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1577
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1579	$self->{layout}->set_markup ($markup);
1388		1580
		1581	delete $self->{size_req};
		1582	$self->realloc;
1389	$self->update;	1583	$self->update;
1390	$self->check_size;
1391	}	1584	}
1392		1585
1393	sub size_request {	1586	sub size_request {
1394	my ($self) = @_;	1587	my ($self) = @_;
1395		1588
		1589	$self->{size_req} ||= do {
1396	$self->{layout}->set_font ($self->{font}) if $self->{font};	1590	$self->{layout}->set_font ($self->{font}) if $self->{font};
1397	$self->{layout}->set_width ($self->{max_w} || -1);	1591	$self->{layout}->set_width ($self->{max_w} || -1);
1398	$self->{layout}->set_ellipsise ($self->{ellipsise});	1592	$self->{layout}->set_ellipsise ($self->{ellipsise});
1399	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1593	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1594	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1595
1402	my ($w, $h) = $self->{layout}->size;	1596	my ($w, $h) = $self->{layout}->size;
1403		1597
1404	if (exists $self->{template}) {	1598	if (exists $self->{template}) {
1405	$self->{template}->set_font ($self->{font}) if $self->{font};	1599	$self->{template}->set_font ($self->{font}) if $self->{font};
1406	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407		1601
1408	my ($w2, $h2) = $self->{template}->size;	1602	my ($w2, $h2) = $self->{template}->size;
1409		1603
1410	$w = List::Util::max $w, $w2;	1604	$w = List::Util::max $w, $w2;
1411	$h = List::Util::max $h, $h2;	1605	$h = List::Util::max $h, $h2;
		1606	}
		1607
		1608	[$w, $h]
1412	}	1609	};
1413		1610
1414	(	1611	@{ $self->{size_req} }
1415	$w + $self->{padding} * 2,
1416	$h + $self->{padding} * 2,
1417	)
1418	}	1612	}
1419		1613
1420	sub size_allocate {	1614	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1615	my ($self, $w, $h) = @_;
1422		1616
		1617	delete $self->{ox};
		1618
1423	delete $self->{texture};	1619	delete $self->{texture}
		1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424	}	1621	}
1425		1622
1426	sub set_fontsize {	1623	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1624	my ($self, $fontsize) = @_;
1428		1625
1429	$self->{fontsize} = $fontsize;	1626	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1627	delete $self->{texture};
1431		1628
1432	$self->update;	1629	$self->realloc;
1433	$self->check_size;	1630	}
		1631
		1632	sub reconfigure {
		1633	my ($self) = @_;
		1634
		1635	delete $self->{size_req};
		1636
		1637	$self->SUPER::reconfigure;
1434	}	1638	}
1435		1639
1436	sub _draw {	1640	sub _draw {
1437	my ($self) = @_;	1641	my ($self) = @_;
1438		1642
…		…
1444	$self->{layout}->set_width ($self->{w});	1648	$self->{layout}->set_width ($self->{w});
1445	$self->{layout}->set_ellipsise ($self->{ellipsise});	1649	$self->{layout}->set_ellipsise ($self->{ellipsise});
1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448		1652
1449	my $tex = new_from_layout CFClient::Texture $self->{layout};	1653	new_from_layout CFClient::Texture $self->{layout}
		1654	};
1450		1655
		1656	unless (exists $self->{ox}) {
1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453	: ($self->{w} - $tex->{w}) * 0.5);	1659	: ($self->{w} - $tex->{w}) * 0.5);
1454		1660
1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457	: ($self->{h} - $tex->{h}) * 0.5);	1663	: ($self->{h} - $tex->{h}) * 0.5);
1458
1459	$tex
1460	};	1664	};
1461		1665
1462	glEnable GL_TEXTURE_2D;	1666	glEnable GL_TEXTURE_2D;
1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1667
		1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1464		1670
1465	if ($tex->{format} == GL_ALPHA) {	1671	if ($tex->{format} == GL_ALPHA) {
		1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466	glColor @{$self->{fg}};	1673	glColor @{$self->{fg}};
1467	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1468	} else {	1675	} else {
		1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1470	}	1678	}
1471		1679
1472	glDisable GL_TEXTURE_2D;	1680	glDisable GL_TEXTURE_2D;
1473	}	1681	}
1474		1682
…		…
1491	can_hover => 1,	1699	can_hover => 1,
1492	can_focus => 1,	1700	can_focus => 1,
1493	valign => 0,	1701	valign => 0,
1494	can_events => 1,	1702	can_events => 1,
1495	#text => ...	1703	#text => ...
		1704	#hidden => "*",
1496	@_	1705	@_
1497	)	1706	)
1498	}	1707	}
1499		1708
1500	sub _set_text {	1709	sub _set_text {
…		…
1502		1711
1503	delete $self->{cur_h};	1712	delete $self->{cur_h};
1504		1713
1505	return if $self->{text} eq $text;	1714	return if $self->{text} eq $text;
1506		1715
1507	delete $self->{texture};
1508
1509	$self->{last_activity} = $::NOW;	1716	$self->{last_activity} = $::NOW;
1510	$self->{text} = $text;	1717	$self->{text} = $text;
1511		1718
1512	$text =~ s/./*/g if $self->{hidden};	1719	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1720	$self->{layout}->set_text ("$text ");
		1721	delete $self->{size_req};
1514		1722
1515	$self->emit (changed => $self->{text});	1723	$self->_emit (changed => $self->{text});
		1724
		1725	$self->realloc;
		1726	$self->update;
1516	}	1727	}
1517		1728
1518	sub set_text {	1729	sub set_text {
1519	my ($self, $text) = @_;	1730	my ($self, $text) = @_;
1520		1731
1521	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1733	$self->_set_text ($text);
1523	$self->update;
1524	$self->check_size;
1525	}	1734	}
1526		1735
1527	sub get_text {	1736	sub get_text {
1528	$_[0]{text}	1737	$_[0]{text}
1529	}	1738	}
…		…
1532	my ($self) = @_;	1741	my ($self) = @_;
1533		1742
1534	my ($w, $h) = $self->SUPER::size_request;	1743	my ($w, $h) = $self->SUPER::size_request;
1535		1744
1536	($w + 1, $h) # add 1 for cursor	1745	($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	}	1746	}
1544		1747
1545	sub key_down {	1748	sub key_down {
1546	my ($self, $ev) = @_;	1749	my ($self, $ev) = @_;
1547		1750
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1765	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1766	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1767	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1768	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1769	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1770	$self->_emit ('escape');
1568	} elsif ($uni) {	1771	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1772	substr $text, $self->{cursor}++, 0, chr $uni;
		1773	} else {
		1774	return 0;
1570	}	1775	}
1571		1776
1572	$self->_set_text ($text);	1777	$self->_set_text ($text);
1573	$self->update;	1778
1574	$self->check_size;	1779	$self->realloc;
		1780
		1781	1
1575	}	1782	}
1576		1783
1577	sub focus_in {	1784	sub focus_in {
1578	my ($self) = @_;	1785	my ($self) = @_;
1579		1786
…		…
1594	utf8::encode $text;	1801	utf8::encode $text;
1595	$self->{cursor} = length substr $text, 0, $idx;	1802	$self->{cursor} = length substr $text, 0, $idx;
1596		1803
1597	$self->_set_text ($self->{text});	1804	$self->_set_text ($self->{text});
1598	$self->update;	1805	$self->update;
		1806
		1807	1
1599	}	1808	}
1600		1809
1601	sub mouse_motion {	1810	sub mouse_motion {
1602	my ($self, $ev, $x, $y) = @_;	1811	my ($self, $ev, $x, $y) = @_;
1603	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1813
		1814	0
1604	}	1815	}
1605		1816
1606	sub _draw {	1817	sub _draw {
1607	my ($self) = @_;	1818	my ($self) = @_;
1608		1819
1609	local $self->{fg} = $self->{fg};	1820	local $self->{fg} = $self->{fg};
1610		1821
1611	if ($FOCUS == $self) {	1822	if ($FOCUS == $self) {
1612	glColor @{$self->{active_bg}};	1823	glColor_premultiply @{$self->{active_bg}};
1613	$self->{fg} = $self->{active_fg};	1824	$self->{fg} = $self->{active_fg};
1614	} else {	1825	} else {
1615	glColor @{$self->{bg}};	1826	glColor_premultiply @{$self->{bg}};
1616	}	1827	}
1617		1828
1618	glEnable GL_BLEND;	1829	glEnable GL_BLEND;
1619	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1830	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620	glBegin GL_QUADS;	1831	glBegin GL_QUADS;
1621	glVertex 0 , 0;	1832	glVertex 0 , 0;
1622	glVertex 0 , $self->{h};	1833	glVertex 0 , $self->{h};
1623	glVertex $self->{w}, $self->{h};	1834	glVertex $self->{w}, $self->{h};
1624	glVertex $self->{w}, 0;	1835	glVertex $self->{w}, 0;
…		…
1659	if ($sym == 13) {	1870	if ($sym == 13) {
1660	unshift @{$self->{history}},	1871	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1872	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1873	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1874	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1875	$self->_emit (activate => $txt);
1665	$self->update;	1876	$self->update;
1666		1877
1667	} elsif ($sym == CFClient::SDLK_UP) {	1878	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1879	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1880	$self->{history_saveback} = $self->get_text;
…		…
1685	} else {	1896	} else {
1686	$self->set_text ($self->{history_saveback});	1897	$self->set_text ($self->{history_saveback});
1687	}	1898	}
1688		1899
1689	} else {	1900	} else {
1690	$self->SUPER::key_down ($ev);	1901	return $self->SUPER::key_down ($ev)
		1902	}
		1903
1691	}	1904	1
1692
1693	}	1905	}
1694		1906
1695	#############################################################################	1907	#############################################################################
1696		1908
1697	package CFClient::UI::Button;	1909	package CFClient::UI::Button;
…		…
1706		1918
1707	sub new {	1919	sub new {
1708	my $class = shift;	1920	my $class = shift;
1709		1921
1710	$class->SUPER::new (	1922	$class->SUPER::new (
1711	padding => 4,	1923	padding_x => 4,
		1924	padding_y => 4,
1712	fg => [1, 1, 1],	1925	fg => [1, 1, 1],
1713	active_fg => [0, 0, 1],	1926	active_fg => [0, 0, 1],
1714	can_hover => 1,	1927	can_hover => 1,
1715	align => 0,	1928	align => 0,
1716	valign => 0,	1929	valign => 0,
1717	can_events => 1,	1930	can_events => 1,
1718	@_	1931	@_
1719	)	1932	)
1720	}	1933	}
1721		1934
		1935	sub activate { }
		1936
1722	sub button_up {	1937	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1938	my ($self, $ev, $x, $y) = @_;
1724		1939
		1940	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1941	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1942	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");	1943
1728	}	1944	1
1729	}	1945	}
1730		1946
1731	sub _draw {	1947	sub _draw {
1732	my ($self) = @_;	1948	my ($self) = @_;
1733		1949
1734	local $self->{fg} = $self->{fg};	1950	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736	if ($GRAB == $self) {
1737	$self->{fg} = $self->{active_fg};
1738	}
1739		1951
1740	glEnable GL_TEXTURE_2D;	1952	glEnable GL_TEXTURE_2D;
1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742	glColor 0, 0, 0, 1;	1954	glColor 0, 0, 0, 1;
1743		1955
…		…
1762		1974
1763	sub new {	1975	sub new {
1764	my $class = shift;	1976	my $class = shift;
1765		1977
1766	$class->SUPER::new (	1978	$class->SUPER::new (
1767	padding => 2,	1979	padding_x => 2,
		1980	padding_y => 2,
1768	fg => [1, 1, 1],	1981	fg => [1, 1, 1],
1769	active_fg => [1, 1, 0],	1982	active_fg => [1, 1, 0],
1770	bg => [0, 0, 0, 0.2],	1983	bg => [0, 0, 0, 0.2],
1771	active_bg => [1, 1, 1, 0.5],	1984	active_bg => [1, 1, 1, 0.5],
1772	state => 0,	1985	state => 0,
…		…
1776	}	1989	}
1777		1990
1778	sub size_request {	1991	sub size_request {
1779	my ($self) = @_;	1992	my ($self) = @_;
1780		1993
1781	($self->{padding} * 2 + 6) x 2	1994	(6) x 2
1782	}	1995	}
1783		1996
1784	sub button_down {	1997	sub button_down {
1785	my ($self, $ev, $x, $y) = @_;	1998	my ($self, $ev, $x, $y) = @_;
1786		1999
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789	$self->{state} = !$self->{state};	2002	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	2003	$self->_emit (changed => $self->{state});
		2004	} else {
		2005	return 0
		2006	}
		2007
1791	}	2008	1
1792	}	2009	}
1793		2010
1794	sub _draw {	2011	sub _draw {
1795	my ($self) = @_;	2012	my ($self) = @_;
1796		2013
1797	$self->SUPER::_draw;	2014	$self->SUPER::_draw;
1798		2015
1799	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2016	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800		2017
1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2018	my ($w, $h) = @$self{qw(w h)};
		2019
		2020	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802		2021
1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2022	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804		2023
1805	my $tex = $self->{state} ? $tex[1] : $tex[0];	2024	my $tex = $self->{state} ? $tex[1] : $tex[0];
1806		2025
…		…
1961		2180
1962	my $h1 = $self->{h} * (1 - $ycut1);	2181	my $h1 = $self->{h} * (1 - $ycut1);
1963	my $h2 = $self->{h} * (1 - $ycut2);	2182	my $h2 = $self->{h} * (1 - $ycut2);
1964		2183
1965	glEnable GL_BLEND;	2184	glEnable GL_BLEND;
1966	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967	glEnable GL_TEXTURE_2D;	2187	glEnable GL_TEXTURE_2D;
1968	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2188	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969		2189
1970	glBindTexture GL_TEXTURE_2D, $t1->{name};	2190	glBindTexture GL_TEXTURE_2D, $t1->{name};
1971	glBegin GL_QUADS;	2191	glBegin GL_QUADS;
…		…
2071	fg => [1, 1, 1],	2291	fg => [1, 1, 1],
2072	active_fg => [0, 0, 0],	2292	active_fg => [0, 0, 0],
2073	bg => [0, 0, 0, 0.2],	2293	bg => [0, 0, 0, 0.2],
2074	active_bg => [1, 1, 1, 0.5],	2294	active_bg => [1, 1, 1, 0.5],
2075	range => [0, 0, 100, 10, 0],	2295	range => [0, 0, 100, 10, 0],
2076	req_w => $::WIDTH / 80,	2296	min_w => $::WIDTH / 80,
2077	req_h => $::WIDTH / 80,	2297	min_h => $::WIDTH / 80,
2078	vertical => 0,	2298	vertical => 0,
2079	can_hover => 1,	2299	can_hover => 1,
2080	inner_pad => 0.02,	2300	inner_pad => 0.02,
2081	@_	2301	@_
2082	);	2302	);
…		…
2085	$self->update;	2305	$self->update;
2086		2306
2087	$self	2307	$self
2088	}	2308	}
2089		2309
		2310	sub changed { }
		2311
2090	sub set_range {	2312	sub set_range {
2091	my ($self, $range) = @_;	2313	my ($self, $range) = @_;
2092		2314
2093	$self->{range} = $range;	2315	($range, $self->{range}) = ($self->{range}, $range);
2094		2316
		2317	if ("@$range" ne "@{$self->{range}}") {
2095	$self->update;	2318	$self->update;
		2319	$self->set_value ($self->{range}[0]);
		2320	}
2096	}	2321	}
2097		2322
2098	sub set_value {	2323	sub set_value {
2099	my ($self, $value) = @_;	2324	my ($self, $value) = @_;
2100		2325
…		…
2111	if $unit;	2336	if $unit;
2112		2337
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2339
2115	if ($value != $old_value) {	2340	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2341	$self->_emit (changed => $value);
2117	$self->update;	2342	$self->update;
2118	}	2343	}
2119	}	2344	}
2120		2345
2121	sub size_request {	2346	sub size_request {
2122	my ($self) = @_;	2347	my ($self) = @_;
2123		2348
2124	my $w = $self->{req_w};	2349	($self->{req_w}, $self->{req_h})
2125	my $h = $self->{req_h};
2126
2127	$self->{vertical} ? ($h, $w) : ($w, $h)
2128	}	2350	}
2129		2351
2130	sub button_down {	2352	sub button_down {
2131	my ($self, $ev, $x, $y) = @_;	2353	my ($self, $ev, $x, $y) = @_;
2132		2354
2133	$self->SUPER::button_down ($ev, $x, $y);	2355	$self->SUPER::button_down ($ev, $x, $y);
2134		2356
2135	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136		2358
2137	$self->mouse_motion ($ev, $x, $y);	2359	$self->mouse_motion ($ev, $x, $y)
2138	}	2360	}
2139		2361
2140	sub mouse_motion {	2362	sub mouse_motion {
2141	my ($self, $ev, $x, $y) = @_;	2363	my ($self, $ev, $x, $y) = @_;
2142		2364
…		…
2146	my (undef, $lo, $hi, $page) = @{$self->{range}};	2368	my (undef, $lo, $hi, $page) = @{$self->{range}};
2147		2369
2148	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2370	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149		2371
2150	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2372	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2373	} else {
		2374	return 0;
		2375	}
		2376
2151	}	2377	1
2152	}	2378	}
2153		2379
2154	sub update {	2380	sub update {
2155	my ($self) = @_;	2381	my ($self) = @_;
2156		2382
2157	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2383	delete $self->{knob_w};
		2384	$self->SUPER::update;
		2385	}
		2386
		2387	sub _draw {
		2388	my ($self) = @_;
		2389
		2390	unless ($self->{knob_w}) {
2158	$self->set_value ($self->{range}[0]);	2391	$self->set_value ($self->{range}[0]);
2159		2392
2160	my ($value, $lo, $hi, $page) = @{$self->{range}};	2393	my ($value, $lo, $hi, $page) = @{$self->{range}};
2161	my $range = ($hi - $page - $lo) || 1e-100;	2394	my $range = ($hi - $page - $lo) || 1e-100;
2162		2395
…		…
2168	$value = ($value - $lo) / $range;	2401	$value = ($value - $lo) / $range;
2169	$value = $value * $self->{scale} + $self->{offset};	2402	$value = $value * $self->{scale} + $self->{offset};
2170		2403
2171	$self->{knob_x} = $value - $knob_w * 0.5;	2404	$self->{knob_x} = $value - $knob_w * 0.5;
2172	$self->{knob_w} = $knob_w;	2405	$self->{knob_w} = $knob_w;
2173	});	2406	}
2174
2175	$self->SUPER::update;
2176	}
2177
2178	sub _draw {
2179	my ($self) = @_;
2180		2407
2181	$self->SUPER::_draw ();	2408	$self->SUPER::_draw ();
2182		2409
2183	glScale $self->{w}, $self->{h};	2410	glScale $self->{w}, $self->{h};
2184		2411
…		…
2245	sub set_range { shift->{slider}->set_range (@_) }	2472	sub set_range { shift->{slider}->set_range (@_) }
2246	sub set_value { shift->{slider}->set_value (@_) }	2473	sub set_value { shift->{slider}->set_value (@_) }
2247		2474
2248	#############################################################################	2475	#############################################################################
2249		2476
2250	package CFClient::UI::TextView;	2477	package CFClient::UI::TextScroller;
2251		2478
2252	our @ISA = CFClient::UI::HBox::;	2479	our @ISA = CFClient::UI::HBox::;
2253		2480
2254	use CFClient::OpenGL;	2481	use CFClient::OpenGL;
2255		2482
…		…
2257	my $class = shift;	2484	my $class = shift;
2258		2485
2259	my $self = $class->SUPER::new (	2486	my $self = $class->SUPER::new (
2260	fontsize => 1,	2487	fontsize => 1,
2261	can_events => 0,	2488	can_events => 0,
		2489	indent => 0,
2262	#font => default_font	2490	#font => default_font
2263	@_,	2491	@_,
2264		2492
2265	layout => (new CFClient::Layout 1),	2493	layout => (new CFClient::Layout 1),
2266	par => [],	2494	par => [],
…		…
2289	$self->SUPER::size_allocate ($w, $h);	2517	$self->SUPER::size_allocate ($w, $h);
2290		2518
2291	$self->{layout}->set_font ($self->{font}) if $self->{font};	2519	$self->{layout}->set_font ($self->{font}) if $self->{font};
2292	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293	$self->{layout}->set_width ($self->{children}[0]{w});	2521	$self->{layout}->set_width ($self->{children}[0]{w});
		2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294		2523
2295	$self->reflow;	2524	$self->reflow;
2296	}	2525	}
2297		2526
2298	sub text_size {	2527	sub text_size {
…		…
2300		2529
2301	my $layout = $self->{layout};	2530	my $layout = $self->{layout};
2302		2531
2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304	$layout->set_width ($self->{children}[0]{w} - $indent);	2533	$layout->set_width ($self->{children}[0]{w} - $indent);
		2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305	$layout->set_markup ($text);	2535	$layout->set_markup ($text);
2306		2536
2307	$layout->size	2537	$layout->size
2308	}	2538	}
2309		2539
…		…
2348		2578
2349	return unless $self->{h} > 0;	2579	return unless $self->{h} > 0;
2350		2580
2351	delete $self->{texture};	2581	delete $self->{texture};
2352		2582
2353	$ROOT->on_post_alloc ($self, sub {	2583	$ROOT->on_post_alloc ($self => sub {
2354	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355		2585
2356	if (delete $self->{need_reflow}) {	2586	if (delete $self->{need_reflow}) {
2357	my $height = 0;	2587	my $height = 0;
2358		2588
…		…
2361	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362		2592
2363	for (@{$self->{par}}) {	2593	for (@{$self->{par}}) {
2364	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2365	$layout->set_width ($W - $_->[3]);	2595	$layout->set_width ($W - $_->[3]);
		2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2366	$layout->set_markup ($_->[4]);	2597	$layout->set_markup ($_->[4]);
2367	my ($w, $h) = $layout->size;	2598	my ($w, $h) = $layout->size;
2368	$_->[0] = $w + $_->[3];	2599	$_->[0] = $w + $_->[3];
2369	$_->[1] = $h;	2600	$_->[1] = $h;
2370	}	2601	}
…		…
2373	}	2604	}
2374		2605
2375	$self->{height} = $height;	2606	$self->{height} = $height;
2376		2607
2377	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2378		2609
2379	delete $self->{texture};	2610	delete $self->{texture};
2380	}	2611	}
2381		2612
2382	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383	glClearColor 0.5, 0.5, 0.5, 0;	2614	glClearColor 0, 0, 0, 0;
2384	glClear GL_COLOR_BUFFER_BIT;	2615	glClear GL_COLOR_BUFFER_BIT;
2385		2616
2386	my $top = int $self->{children}[1]{range}[0];	2617	my $top = int $self->{children}[1]{range}[0];
2387		2618
2388	my $y0 = $top;	2619	my $y0 = $top;
…		…
2402	my $h = $par->[1];	2633	my $h = $par->[1];
2403		2634
2404	if ($y0 < $y + $h && $y < $y1) {	2635	if ($y0 < $y + $h && $y < $y1) {
2405	$layout->set_foreground (@{ $par->[2] });	2636	$layout->set_foreground (@{ $par->[2] });
2406	$layout->set_width ($W - $par->[3]);	2637	$layout->set_width ($W - $par->[3]);
		2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($par->[4]);	2639	$layout->set_markup ($par->[4]);
2408		2640
2409	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2410		2642
2411	glRasterPos $par->[3], $y - $y0;	2643	glRasterPos $par->[3], $y - $y0;
…		…
2423	sub _draw {	2655	sub _draw {
2424	my ($self) = @_;	2656	my ($self) = @_;
2425		2657
2426	glEnable GL_TEXTURE_2D;	2658	glEnable GL_TEXTURE_2D;
2427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2659	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428	glColor 1, 1, 1, 1;	2660	glColor 0, 0, 0, 1;
2429	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430	glDisable GL_TEXTURE_2D;	2662	glDisable GL_TEXTURE_2D;
2431		2663
2432	$self->{children}[1]->draw;	2664	$self->{children}[1]->draw;
2433		2665
2434	}	2666	}
…		…
2483		2715
2484	sub new {	2716	sub new {
2485	my $class = shift;	2717	my $class = shift;
2486		2718
2487	my $self = $class->SUPER::new (	2719	my $self = $class->SUPER::new (
2488	state => 0,	2720	state => 0,
2489	connect_activate => \&toggle_flopper,	2721	on_activate => \&toggle_flopper,
2490	@_	2722	@_
2491	);	2723	);
2492		2724
2493	if ($self->{state}) {
2494	$self->{state} = 0;
2495	$self->toggle_flopper;
2496	}
2497
2498	$self	2725	$self
2499	}	2726	}
2500		2727
2501	sub toggle_flopper {	2728	sub toggle_flopper {
2502	my ($self) = @_;	2729	my ($self) = @_;
2503		2730
2504	# TODO: use animation	2731	$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	}	2732	}
2516		2733
2517	#############################################################################	2734	#############################################################################
2518		2735
2519	package CFClient::UI::Tooltip;	2736	package CFClient::UI::Tooltip;
…		…
2532	}	2749	}
2533		2750
2534	sub set_tooltip_from {	2751	sub set_tooltip_from {
2535	my ($self, $widget) = @_;	2752	my ($self, $widget) = @_;
2536		2753
		2754	my $tooltip = $widget->{tooltip};
		2755
		2756	if ($ENV{CFPLUS_DEBUG} & 2) {
		2757	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2758	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2759	. "req $widget->{req_w} $widget->{req_h}\n"
		2760	. "visible $widget->{visible}";
		2761	}
		2762
		2763	$tooltip =~ s/^\n+//;
		2764	$tooltip =~ s/\n+$//;
		2765
2537	$self->add (new CFClient::UI::Label	2766	$self->add (new CFClient::UI::Label
2538	markup => $widget->{tooltip},	2767	markup => $tooltip,
2539	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540	fontsize => 0.8,	2769	fontsize => 0.8,
2541	fg => [0, 0, 0, 1],	2770	fg => [0, 0, 0, 1],
2542	ellipsise => 0,	2771	ellipsise => 0,
2543	font => ($widget->{tooltip_font} || $::FONT_PROP),	2772	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2554		2783
2555	sub size_allocate {	2784	sub size_allocate {
2556	my ($self, $w, $h) = @_;	2785	my ($self, $w, $h) = @_;
2557		2786
2558	$self->SUPER::size_allocate ($w - 4, $h - 4);	2787	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2788	}
		2789
		2790	sub visibility_change {
		2791	my ($self, $visible) = @_;
		2792
		2793	return unless $visible;
		2794
		2795	$self->{root}->on_post_alloc ("move_$self" => sub {
		2796	my $widget = $self->{owner}
		2797	or return;
		2798
		2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2800
		2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2802	if $x + $self->{w} > $self->{root}{w};
		2803
		2804	$self->move_abs ($x, $y);
		2805	});
2559	}	2806	}
2560		2807
2561	sub _draw {	2808	sub _draw {
2562	my ($self) = @_;	2809	my ($self) = @_;
2563		2810
…		…
2580	glVertex $w, $h;	2827	glVertex $w, $h;
2581	glVertex $w, 0;	2828	glVertex $w, 0;
2582	glEnd;	2829	glEnd;
2583		2830
2584	glTranslate 2 - 0.375, 2 - 0.375;	2831	glTranslate 2 - 0.375, 2 - 0.375;
		2832
2585	$self->SUPER::_draw;	2833	$self->SUPER::_draw;
2586	}	2834	}
2587		2835
2588	#############################################################################	2836	#############################################################################
2589		2837
…		…
2595		2843
2596	sub new {	2844	sub new {
2597	my $class = shift;	2845	my $class = shift;
2598		2846
2599	my $self = $class->SUPER::new (	2847	my $self = $class->SUPER::new (
2600	aspect => 1,	2848	aspect => 1,
		2849	can_events => 0,
2601	@_,	2850	@_,
2602	);	2851	);
2603		2852
2604	if ($self->{anim} && $self->{animspeed}) {	2853	if ($self->{anim} && $self->{animspeed}) {
2605	Scalar::Util::weaken (my $widget = $self);	2854	Scalar::Util::weaken (my $widget = $self);
…		…
2647	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648		2897
2649	if ($tex) {	2898	if ($tex) {
2650	glEnable GL_TEXTURE_2D;	2899	glEnable GL_TEXTURE_2D;
2651	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652	glColor 1, 1, 1, 1;	2901	glColor 0, 0, 0, 1;
2653	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2902	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654	glDisable GL_TEXTURE_2D;	2903	glDisable GL_TEXTURE_2D;
2655	}	2904	}
2656	}	2905	}
2657		2906
2658	sub DESTROY {	2907	sub destroy {
2659	my ($self) = @_;	2908	my ($self) = @_;
2660		2909
2661	$self->{timer}->cancel	2910	$self->{timer}->cancel
2662	if $self->{timer};	2911	if $self->{timer};
2663		2912
2664	$self->SUPER::DESTROY;	2913	$self->SUPER::destroy;
2665	}	2914	}
2666		2915
2667	#############################################################################	2916	#############################################################################
2668		2917
2669	package CFClient::UI::InventoryItem;	2918	package CFClient::UI::Buttonbar;
2670		2919
2671	our @ISA = CFClient::UI::HBox::;	2920	our @ISA = CFClient::UI::HBox::;
2672		2921
2673	sub _item_to_desc {	2922	# 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		2923
2830	#############################################################################	2924	#############################################################################
2831		2925
2832	package CFClient::UI::Menu;	2926	package CFClient::UI::Menu;
2833		2927
…		…
2845	);	2939	);
2846		2940
2847	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2848		2942
2849	for my $item (@{ $self->{items} }) {	2943	for my $item (@{ $self->{items} }) {
2850	my ($widget, $cb) = @$item;	2944	my ($widget, $cb, $tooltip) = @$item;
2851		2945
2852	# handle various types of items, only text for now	2946	# handle various types of items, only text for now
2853	if (!ref $widget) {	2947	if (!ref $widget) {
2854	$widget = new CFClient::UI::Label	2948	$widget = new CFClient::UI::Label
2855	can_hover => 1,	2949	can_hover => 1,
2856	can_events => 1,	2950	can_events => 1,
2857	text => $widget;	2951	markup => $widget,
		2952	tooltip => $tooltip
2858	}	2953	}
2859		2954
2860	$self->{item}{$widget} = $item;	2955	$self->{item}{$widget} = $item;
2861		2956
2862	$self->{vbox}->add ($widget);	2957	$self->{vbox}->add ($widget);
…		…
2867		2962
2868	# popup given the event (must be a mouse button down event currently)	2963	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	2964	sub popup {
2870	my ($self, $ev) = @_;	2965	my ($self, $ev) = @_;
2871		2966
2872	$self->emit ("popdown");	2967	$self->_emit ("popdown");
2873		2968
2874	# maybe save $GRAB? must be careful about events...	2969	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	2970	$GRAB = $self;
2876	$self->{button} = $ev->{button};	2971	$self->{button} = $ev->{button};
2877		2972
2878	$self->show;	2973	$self->show;
2879	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880	}	2975	}
2881		2976
2882	sub mouse_motion {	2977	sub mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	2978	my ($self, $ev, $x, $y) = @_;
2884		2979
2885	# TODO: should use vbox->find_widget or so	2980	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	2982	$self->{hover} = $self->{item}{$HOVER};
		2983
		2984	0
2888	}	2985	}
2889		2986
2890	sub button_up {	2987	sub button_up {
2891	my ($self, $ev, $x, $y) = @_;	2988	my ($self, $ev, $x, $y) = @_;
2892		2989
2893	if ($ev->{button} == $self->{button}) {	2990	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	2991	undef $GRAB;
2895	$self->hide;	2992	$self->hide;
2896		2993
2897	$self->emit ("popdown");	2994	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2995	$self->{hover}[1]->() if $self->{hover};
		2996	} else {
		2997	return 0
		2998	}
		2999
2899	}	3000	1
2900	}	3001	}
2901		3002
2902	#############################################################################	3003	#############################################################################
2903		3004
2904	package CFClient::UI::Statusbox;	3005	package CFClient::UI::Multiplexer;
2905		3006
2906	our @ISA = CFClient::UI::VBox::;	3007	our @ISA = CFClient::UI::Container::;
2907		3008
2908	sub new {	3009	sub new {
2909	my $class = shift;	3010	my $class = shift;
2910		3011
2911	$class->SUPER::new (	3012	my $self = $class->SUPER::new (
		3013	@_,
		3014	);
		3015
		3016	$self->{current} = $self->{children}[0]
		3017	if @{ $self->{children} };
		3018
		3019	$self
		3020	}
		3021
		3022	sub add {
		3023	my ($self, @widgets) = @_;
		3024
		3025	$self->SUPER::add (@widgets);
		3026
		3027	$self->{current} = $self->{children}[0]
		3028	if @{ $self->{children} };
		3029	}
		3030
		3031	sub set_current_page {
		3032	my ($self, $page_or_widget) = @_;
		3033
		3034	my $widget = ref $page_or_widget
		3035	? $page_or_widget
		3036	: $self->{children}[$page_or_widget];
		3037
		3038	$self->{current} = $widget;
		3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3040
		3041	$self->_emit (page_changed => $self->{current});
		3042
		3043	$self->realloc;
		3044	}
		3045
		3046	sub visible_children {
		3047	$_[0]{current}
		3048	}
		3049
		3050	sub size_request {
		3051	my ($self) = @_;
		3052
		3053	$self->{current}->size_request
		3054	}
		3055
		3056	sub size_allocate {
		3057	my ($self, $w, $h) = @_;
		3058
		3059	$self->{current}->configure (0, 0, $w, $h);
		3060	}
		3061
		3062	sub _draw {
		3063	my ($self) = @_;
		3064
		3065	$self->{current}->draw;
		3066	}
		3067
		3068	#############################################################################
		3069
		3070	package CFClient::UI::Notebook;
		3071
		3072	our @ISA = CFClient::UI::VBox::;
		3073
		3074	sub new {
		3075	my $class = shift;
		3076
		3077	my $self = $class->SUPER::new (
		3078	buttonbar => (new CFClient::UI::Buttonbar),
		3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3080	# filter => # will be put between multiplexer and $self
		3081	@_,
		3082	);
		3083
		3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3085	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3086
		3087	$self
		3088	}
		3089
		3090	sub add {
		3091	my ($self, $title, $widget, $tooltip) = @_;
		3092
		3093	Scalar::Util::weaken $self;
		3094
		3095	$self->{buttonbar}->add (new CFClient::UI::Button
		3096	markup => $title,
		3097	tooltip => $tooltip,
		3098	on_activate => sub { $self->set_current_page ($widget) },
		3099	);
		3100
		3101	$self->{multiplexer}->add ($widget);
		3102	}
		3103
		3104	sub set_current_page {
		3105	my ($self, $page) = @_;
		3106
		3107	$self->{multiplexer}->set_current_page ($page);
		3108	$self->_emit (page_changed => $self->{multiplexer}{current});
		3109	}
		3110
		3111	#############################################################################
		3112
		3113	package CFClient::UI::Combobox;
		3114
		3115	use utf8;
		3116
		3117	our @ISA = CFClient::UI::Button::;
		3118
		3119	sub new {
		3120	my $class = shift;
		3121
		3122	my $self = $class->SUPER::new (
		3123	options => [], # [value, title, longdesc], ...
		3124	value => undef,
		3125	@_,
		3126	);
		3127
		3128	$self->_set_value ($self->{value});
		3129
		3130	$self
		3131	}
		3132
		3133	sub button_down {
		3134	my ($self, $ev) = @_;
		3135
		3136	my @menu_items;
		3137
		3138	for (@{ $self->{options} }) {
		3139	my ($value, $title, $tooltip) = @$_;
		3140
		3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3142	}
		3143
		3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3145	}
		3146
		3147	sub _set_value {
		3148	my ($self, $value) = @_;
		3149
		3150	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3151	or return;
		3152
		3153	$self->{value} = $item->[0];
		3154	$self->set_markup ("$item->[1] ⇓");
		3155	$self->set_tooltip ($item->[2]);
		3156	}
		3157
		3158	sub set_value {
		3159	my ($self, $value) = @_;
		3160
		3161	return unless $self->{value} ne $value;
		3162
		3163	$self->_set_value ($value);
		3164	$self->_emit (changed => $value);
		3165	}
		3166
		3167	#############################################################################
		3168
		3169	package CFClient::UI::Statusbox;
		3170
		3171	our @ISA = CFClient::UI::VBox::;
		3172
		3173	sub new {
		3174	my $class = shift;
		3175
		3176	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3177	fontsize => 0.8,
2913	@_,	3178	@_,
2914	)	3179	);
		3180
		3181	Scalar::Util::weaken (my $this = $self);
		3182
		3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3184
		3185	$self
2915	}	3186	}
2916		3187
2917	sub reorder {	3188	sub reorder {
2918	my ($self) = @_;	3189	my ($self) = @_;
2919	my $NOW = time;	3190	my $NOW = Time::HiRes::time;
		3191
		3192	# freeze display when hovering over any label
		3193	return if $CFClient::UI::TOOLTIP->{owner}
		3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3195	values %{ $self->{item} };
2920		3196
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3197	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3199	}
2924		3200
…		…
2927	my @items = sort {	3203	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3204	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3205	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3206	} values %{ $self->{item} };
2931		3207
		3208	$self->{timer}->interval (1);
		3209
2932	my $count = 10 + 1;	3210	my $count = 10 + 1;
2933	for my $item (@items) {	3211	for my $item (@items) {
2934	last unless --$count;	3212	last unless --$count;
2935		3213
2936	push @widgets, $item->{label} ||= do {	3214	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3215	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3216	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3217	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3218	: $item->{text};
2941		3219
…		…
2949	tooltip => $item->{tooltip},	3227	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3228	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3229	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3230	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3231	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3232	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3233	can_events => 1,
2956	can_hover => 1	3234	can_hover => 1
2957	};	3235	};
		3236
		3237	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3238	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3239	$label->update;
		3240	$label->set_max_size (undef, $label->{req_h} * $diff)
		3241	if $diff < 1;
		3242	$self->{timer}->interval (1/30);
		3243	} else {
		3244	$label->{fg}[3] = $item->{fg}[3] || 1;
		3245	}
		3246
		3247	push @widgets, $label;
2958	}	3248	}
2959		3249
2960	$self->clear;	3250	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3251	$self->SUPER::add (reverse @widgets);
2962	}	3252	}
…		…
2965	my ($self, $text, %arg) = @_;	3255	my ($self, $text, %arg) = @_;
2966		3256
2967	$text =~ s/^\s+//;	3257	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3258	$text =~ s/\s+$//;
2969		3259
		3260	return unless $text;
		3261
2970	my $timeout = time + ((delete $arg{timeout}) || 60);	3262	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971		3263
2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3264	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973		3265
2974	if (my $item = $self->{item}{$group}) {	3266	if (my $item = $self->{item}{$group}) {
2975	if ($item->{text} eq $text) {	3267	if ($item->{text} eq $text) {
2976	$item->{count}++;	3268	$item->{count}++;
2977	} else {	3269	} else {
2978	$item->{count} = 1;	3270	$item->{count} = 1;
2979	$item->{text} = $item->{tooltip} = $text;	3271	$item->{text} = $item->{tooltip} = $text;
2980	}	3272	}
2981	$item->{id} = ++$self->{id};	3273	$item->{id} += 0.2;#d#
2982	$item->{timeout} = $timeout;	3274	$item->{timeout} = $timeout;
2983	delete $item->{label};	3275	delete $item->{label};
2984	} else {	3276	} else {
2985	$self->{item}{$group} = {	3277	$self->{item}{$group} = {
2986	id => ++$self->{id},	3278	id => ++$self->{id},
…		…
3005		3297
3006	$self->reorder;	3298	$self->reorder;
3007	$self->SUPER::reconfigure;	3299	$self->SUPER::reconfigure;
3008	}	3300	}
3009		3301
		3302	sub destroy {
		3303	my ($self) = @_;
		3304
		3305	$self->{timer}->cancel;
		3306
		3307	$self->SUPER::destroy;
		3308	}
		3309
3010	#############################################################################	3310	#############################################################################
3011		3311
3012	package CFClient::UI::Root;	3312	package CFClient::UI::Inventory;
3013		3313
3014	our @ISA = CFClient::UI::Container::;	3314	our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016	use CFClient::OpenGL;
3017		3315
3018	sub new {	3316	sub new {
3019	my $class = shift;	3317	my $class = shift;
3020		3318
3021	$class->SUPER::new (	3319	my $self = $class->SUPER::new (
		3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3321	@_,
		3322	);
		3323
		3324	$self
		3325	}
		3326
		3327	sub set_items {
		3328	my ($self, $items) = @_;
		3329
		3330	$self->{child}->clear;
		3331	return unless $items;
		3332
		3333	my @items = sort {
		3334	($a->{type} <=> $b->{type})
		3335	or ($a->{name} cmp $b->{name})
		3336	} @$items;
		3337
		3338	$self->{real_items} = \@items;
		3339
		3340	my $row = 0;
		3341	for my $item (@items) {
		3342	CFClient::Item::update_widgets $item;
		3343
		3344	$self->{child}->add (0, $row, $item->{face_widget});
		3345	$self->{child}->add (1, $row, $item->{desc_widget});
		3346	$self->{child}->add (2, $row, $item->{weight_widget});
		3347
		3348	$row++;
		3349	}
		3350	}
		3351
		3352	#############################################################################
		3353
		3354	package CFClient::UI::BindEditor;
		3355
		3356	our @ISA = CFClient::UI::FancyFrame::;
		3357
		3358	sub new {
		3359	my $class = shift;
		3360
		3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3362
		3363	$self->add (my $vb = new CFClient::UI::VBox);
		3364
		3365
		3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3367	text => "start recording",
		3368	tooltip => "Start/Stops recording of actions."
		3369	."All subsequent actions after the recording started will be captured."
		3370	."The actions are displayed after the record was stopped."
		3371	."To bind the action you have to click on the 'Bind' button",
		3372	on_activate => sub {
		3373	unless ($self->{recording}) {
		3374	$self->start;
		3375	} else {
		3376	$self->stop;
		3377	}
		3378	});
		3379
		3380	$vb->add (new CFClient::UI::Label text => "Actions:");
		3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3382
		3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3384	$vb->add (my $hb = new CFClient::UI::HBox);
		3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3386	$hb->add (new CFClient::UI::Button
		3387	text => "bind",
		3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3389	on_activate => sub {
		3390	$self->ask_for_bind;
		3391	});
		3392
		3393	$vb->add (my $hb = new CFClient::UI::HBox);
		3394	$hb->add (new CFClient::UI::Button
		3395	text => "ok",
		3396	expand => 1,
		3397	tooltip => "This closes the binding editor and saves the binding",
		3398	on_activate => sub {
		3399	$self->hide;
		3400	$self->commit;
		3401	});
		3402
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "cancel",
		3405	expand => 1,
		3406	tooltip => "This closes the binding editor without saving",
		3407	on_activate => sub {
		3408	$self->hide;
		3409	$self->{binding_cancel}->()
		3410	if $self->{binding_cancel};
		3411	});
		3412
		3413	$self->update_binding_widgets;
		3414
		3415	$self
		3416	}
		3417
		3418	sub commit {
		3419	my ($self) = @_;
		3420	my ($mod, $sym, $cmds) = $self->get_binding;
		3421	if ($sym != 0 && @$cmds > 0) {
		3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3423	."'. Don't forget 'Save Config'!");
		3424	$self->{binding_change}->($mod, $sym, $cmds)
		3425	if $self->{binding_change};
		3426	} else {
		3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3428	$self->{binding_cancel}->()
		3429	if $self->{binding_cancel};
		3430	}
		3431	}
		3432
		3433	sub start {
		3434	my ($self) = @_;
		3435
		3436	$self->{rec_btn}->set_text ("stop recording");
		3437	$self->{recording} = 1;
		3438	$self->clear_command_list;
		3439	$::CONN->start_record if $::CONN;
		3440	}
		3441
		3442	sub stop {
		3443	my ($self) = @_;
		3444
		3445	$self->{rec_btn}->set_text ("start recording");
		3446	$self->{recording} = 0;
		3447
		3448	my $rec;
		3449	$rec = $::CONN->stop_record if $::CONN;
		3450	return unless ref $rec eq 'ARRAY';
		3451	$self->set_command_list ($rec);
		3452	}
		3453
		3454
		3455	sub ask_for_bind_and_commit {
		3456	my ($self) = @_;
		3457	$self->ask_for_bind (1);
		3458	}
		3459
		3460	sub ask_for_bind {
		3461	my ($self, $commit) = @_;
		3462
		3463	CFClient::Binder::open_binding_dialog (sub {
		3464	my ($mod, $sym) = @_;
		3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3466	$self->update_binding_widgets;
		3467	$self->commit if $commit;
		3468	});
		3469	}
		3470
		3471	# $mod and $sym are the modifiers and key symbol
		3472	# $cmds is a array ref of strings (the commands)
		3473	# $cb is the callback that is executed on OK
		3474	# $ccb is the callback that is executed on CANCEL and
		3475	# when the binding was unsuccessful on OK
		3476	sub set_binding {
		3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3478
		3479	$self->clear_command_list;
		3480	$self->{recording} = 0;
		3481	$self->{rec_btn}->set_text ("start recording");
		3482
		3483	$self->{binding} = [$mod, $sym];
		3484	$self->{commands} = $cmds;
		3485
		3486	$self->{binding_change} = $cb;
		3487	$self->{binding_cancel} = $ccb;
		3488
		3489	$self->update_binding_widgets;
		3490	}
		3491
		3492	# this is a shortcut method that asks for a binding
		3493	# and then just binds it.
		3494	sub do_quick_binding {
		3495	my ($self, $cmds) = @_;
		3496	$self->set_binding (undef, undef, $cmds, sub {
		3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3498	});
		3499	$self->ask_for_bind (1);
		3500	}
		3501
		3502	sub update_binding_widgets {
		3503	my ($self) = @_;
		3504	my ($mod, $sym, $cmds) = $self->get_binding;
		3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3506	$self->set_command_list ($cmds);
		3507	}
		3508
		3509	sub get_binding {
		3510	my ($self) = @_;
		3511	return (
		3512	$self->{binding}->[0],
		3513	$self->{binding}->[1],
		3514	[ grep { defined $_ } @{$self->{commands}} ]
		3515	);
		3516	}
		3517
		3518	sub clear_command_list {
		3519	my ($self) = @_;
		3520	$self->{cmdbox}->clear ();
		3521	}
		3522
		3523	sub set_command_list {
		3524	my ($self, $cmds) = @_;
		3525
		3526	$self->{cmdbox}->clear ();
		3527	$self->{commands} = $cmds;
		3528
		3529	my $idx = 0;
		3530
		3531	for (@$cmds) {
		3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3533
		3534	my $i = $idx;
		3535	$hb->add (new CFClient::UI::Label text => $_);
		3536	$hb->add (new CFClient::UI::Button
		3537	text => "delete",
		3538	tooltip => "Deletes the action from the record",
		3539	on_activate => sub {
		3540	$self->{cmdbox}->remove ($hb);
		3541	$cmds->[$i] = undef;
		3542	});
		3543
		3544
		3545	$idx++
		3546	}
		3547	}
		3548
		3549	#############################################################################
		3550
		3551	package CFClient::UI::SpellList;
		3552
		3553	our @ISA = CFClient::UI::Table::;
		3554
		3555	sub new {
		3556	my $class = shift;
		3557
		3558	my $self = $class->SUPER::new (
		3559	binding => [],
		3560	commands => [],
3022	@_,	3561	@_,
3023	)	3562	)
3024	}	3563	}
3025		3564
3026	sub configure {	3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3027	my ($self, $x, $y, $w, $h) = @_;
3028		3566
3029	$self->{w} = $w;	3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3030	$self->{h} = $h;	3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3031	}	3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3032		3577
3033	sub check_size {	3578	sub rebuild_spell_list {
		3579	my ($self) = @_;
		3580
		3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3582	$self->clear;
		3583
		3584	return unless $::CONN;
		3585
		3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3591
		3592	my $row = 0;
		3593
		3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3595	my $spell = $self->{spell}{$_};
		3596
		3597	$row++;
		3598
		3599	my $spell_cb = sub {
		3600	my ($widget, $ev) = @_;
		3601
		3602	if ($ev->{button} == 1) {
		3603	$::CONN->user_send ("cast $spell->{name}");
		3604	} elsif ($ev->{button} == 2) {
		3605	$::CONN->user_send ("invoke $spell->{name}");
		3606	} elsif ($ev->{button} == 3) {
		3607	(new CFClient::UI::Menu
		3608	items => [
		3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3611	],
		3612	)->popup ($ev);
		3613	} else {
		3614	return 0;
		3615	}
		3616
		3617	1
		3618	};
		3619
		3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3621
		3622	#TODO: add path info to tooltip
		3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3624
		3625	$self->add (0, $row, new CFClient::UI::Face
		3626	face => $spell->{face},
		3627	can_hover => 1,
		3628	can_events => 1,
		3629	tooltip => $tooltip,
		3630	on_button_down => $spell_cb,
		3631	);
		3632
		3633	$self->add (1, $row, new CFClient::UI::Label
		3634	expand => 1,
		3635	text => $spell->{name},
		3636	can_hover => 1,
		3637	can_events => 1,
		3638	tooltip => $tooltip,
		3639	on_button_down => $spell_cb,
		3640	);
		3641
		3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3646	}
		3647	});
		3648	}
		3649
		3650	sub add_spell {
3034	my ($self) = @_;	3651	my ($self, $spell) = @_;
3035		3652
3036	$self->size_allocate ($self->{w}, $self->{h})	3653	$self->{spell}->{$spell->{name}} = $spell;
3037	if $self->{w};	3654	$self->rebuild_spell_list;
		3655	}
		3656
		3657	sub remove_spell {
		3658	my ($self, $spell) = @_;
		3659
		3660	delete $self->{spell}->{$spell->{name}};
		3661	$self->rebuild_spell_list;
		3662	}
		3663
		3664	sub clear_spells {
		3665	my ($self) = @_;
		3666
		3667	$self->{spell} = {};
		3668	$self->rebuild_spell_list;
		3669	}
		3670
		3671	#############################################################################
		3672
		3673	package CFClient::UI::Root;
		3674
		3675	our @ISA = CFClient::UI::Container::;
		3676
		3677	use List::Util qw(min max);
		3678
		3679	use CFClient::OpenGL;
		3680
		3681	sub new {
		3682	my $class = shift;
		3683
		3684	my $self = $class->SUPER::new (
		3685	visible => 1,
		3686	@_,
		3687	);
		3688
		3689	Scalar::Util::weaken ($self->{root} = $self);
		3690
		3691	$self
3038	}	3692	}
3039		3693
3040	sub size_request {	3694	sub size_request {
3041	my ($self) = @_;	3695	my ($self) = @_;
3042		3696
3043	($self->{w}, $self->{h})	3697	($self->{w}, $self->{h})
		3698	}
		3699
		3700	sub _to_pixel {
		3701	my ($coord, $size, $max) = @_;
		3702
		3703	$coord =
		3704	$coord eq "center" ? ($max - $size) * 0.5
		3705	: $coord eq "max" ? $max
		3706	: $coord;
		3707
		3708	$coord = 0 if $coord < 0;
		3709	$coord = $max - $size if $coord > $max - $size;
		3710
		3711	int $coord + 0.5
3044	}	3712	}
3045		3713
3046	sub size_allocate {	3714	sub size_allocate {
3047	my ($self, $w, $h) = @_;	3715	my ($self, $w, $h) = @_;
3048		3716
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) {	3717	for my $child ($self->children) {
3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057		3719
3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3720	$X = $child->{force_x} if exists $child->{force_x};
3059	if exists $child->{req_x};	3721	$Y = $child->{force_y} if exists $child->{force_y};
3060		3722
3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3723	$X = _to_pixel $X, $W, $self->{w};
3062	if exists $child->{req_y};	3724	$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		3725
3067	$child->configure ($X, $Y, $W, $H);	3726	$child->configure ($X, $Y, $W, $H);
3068	}	3727	}
3069	}	3728	}
3070		3729
…		…
3081	}	3740	}
3082		3741
3083	sub update {	3742	sub update {
3084	my ($self) = @_;	3743	my ($self) = @_;
3085		3744
3086	$self->check_size;
3087	$::WANT_REFRESH++;	3745	$::WANT_REFRESH++;
3088	}	3746	}
3089		3747
3090	sub add {	3748	sub add {
3091	my ($self, @children) = @_;	3749	my ($self, @children) = @_;
3092		3750
3093	for my $child (@children) {
3094	$child->{toplevel} = 1;	3751	$_->{is_toplevel} = 1
3095		3752	for @children;
3096	# integerise window positions
3097	$child->{x} = int $child->{x};
3098	$child->{y} = int $child->{y};
3099	}
3100		3753
3101	$self->SUPER::add (@children);	3754	$self->SUPER::add (@children);
		3755	}
		3756
		3757	sub remove {
		3758	my ($self, @children) = @_;
		3759
		3760	$self->SUPER::remove (@children);
		3761
		3762	delete $self->{is_toplevel}
		3763	for @children;
3102		3764
3103	while (@children) {	3765	while (@children) {
3104	my $w = pop @children;	3766	my $w = pop @children;
3105	push @children, $w->children;	3767	push @children, $w->children;
3106	$w->{visible} = 1;	3768	$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	}	3769	}
3120	}	3770	}
3121		3771
3122	sub on_refresh {	3772	sub on_refresh {
3123	my ($self, $id, $cb) = @_;	3773	my ($self, $id, $cb) = @_;
…		…
3137	while ($self->{refresh_hook}) {	3787	while ($self->{refresh_hook}) {
3138	$_->()	3788	$_->()
3139	for values %{delete $self->{refresh_hook}};	3789	for values %{delete $self->{refresh_hook}};
3140	}	3790	}
3141		3791
3142	if ($self->{check_size}) {	3792	if ($self->{realloc}) {
3143	my @queue = ([], []);	3793	my %queue;
		3794	my @queue;
		3795	my $widget;
3144		3796
3145	for (;;) {	3797	outer:
3146	if ($self->{check_size}) {	3798	while () {
3147	# heuristic: check containers last	3799	if (my $realloc = delete $self->{realloc}) {
3148	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3800	for $widget (values %$realloc) {
3149	for values %{delete $self->{check_size}}	3801	$widget->{visible} or next; # do not resize invisible widgets
		3802
		3803	$queue{$widget+0}++ and next; # duplicates are common
		3804
		3805	push @{ $queue[$widget->{visible}] }, $widget;
		3806	}
3150	}	3807	}
3151		3808
3152	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3809	while () {
		3810	@queue or last outer;
3153		3811
3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3812	$widget = pop @{ $queue[-1] || [] }
3155	? @$widget{qw(user_w user_h)}	3813	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		3814
		3815	pop @queue;
		3816	}
		3817
		3818	delete $queue{$widget+0};
		3819
		3820	my ($w, $h) = $widget->size_request;
		3821
		3822	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3823	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3824
		3825	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3826	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3827
		3828	$w = $widget->{force_w} if exists $widget->{force_w};
		3829	$h = $widget->{force_h} if exists $widget->{force_h};
		3830
		3831	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3832	|| delete $widget->{force_realloc}) {
3162	$widget->{req_w} = $w;	3833	$widget->{req_w} = $w;
3163	$widget->{req_h} = $h;	3834	$widget->{req_h} = $h;
3164		3835
3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3836	$self->{size_alloc}{$widget+0} = $widget;
3166		3837
3167	$widget->{parent}->check_size
3168	if $widget->{parent};	3838	if (my $parent = $widget->{parent}) {
		3839	$self->{realloc}{$parent+0} = $parent
		3840	unless $queue{$parent+0};
		3841
		3842	$parent->{force_size_alloc} = 1;
		3843	$self->{size_alloc}{$parent+0} = $parent;
		3844	}
3169	}	3845	}
		3846
		3847	delete $self->{realloc}{$widget+0};
3170	}	3848	}
3171	}	3849	}
3172		3850
3173	while ($self->{size_alloc}) {	3851	while (my $size_alloc = delete $self->{size_alloc}) {
3174	for (values %{delete $self->{size_alloc}}) {	3852	my @queue = sort { $b->{visible} <=> $a->{visible} }
3175	my ($widget, $w, $h) = @$_;	3853	values %$size_alloc;
		3854
		3855	while () {
		3856	my $widget = pop @queue || last;
		3857
		3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176		3859
3177	$w = 0 if $w < 0;	3860	$w = 0 if $w < 0;
3178	$h = 0 if $h < 0;	3861	$h = 0 if $h < 0;
3179		3862
		3863	$w = int $w + 0.5;
		3864	$h = int $h + 0.5;
		3865
		3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3867	$widget->{old_w} = $widget->{w};
		3868	$widget->{old_h} = $widget->{h};
		3869
3180	$widget->{w} = $w;	3870	$widget->{w} = $w;
3181	$widget->{h} = $h;	3871	$widget->{h} = $h;
3182	$widget->size_allocate ($w, $h);	3872
3183	$widget->emit (size_allocate => $w, $h);	3873	$widget->emit (size_allocate => $w, $h);
		3874	}
3184	}	3875	}
3185	}	3876	}
3186		3877
3187	while ($self->{post_alloc_hook}) {	3878	while ($self->{post_alloc_hook}) {
3188	$_->()	3879	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3880	for values %{delete $self->{post_alloc_hook}};
3190	}	3881	}
		3882
3191		3883
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3884	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3886	glClear GL_COLOR_BUFFER_BIT;
3195		3887
…		…
3197	glLoadIdentity;	3889	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3891	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3892	glLoadIdentity;
3201		3893
		3894	{
		3895	package CFClient::UI::Base;
		3896
		3897	($draw_x, $draw_y, $draw_w, $draw_h) =
		3898	(0, 0, $self->{w}, $self->{h});
		3899	}
		3900
3202	$self->_draw;	3901	$self->_draw;
3203	}	3902	}
3204		3903
3205	#############################################################################	3904	#############################################################################
3206		3905

Diff Legend

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