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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
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 CFPlus;
		11	use CFPlus::Pod;
10	use CFClient::Texture;	12	use CFPlus::Texture;
11		13
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		15
14	our $LAYOUT;	16	our $LAYOUT;
15	our $ROOT;	17	our $ROOT;
16	our $TOOLTIP;	18	our $TOOLTIP;
17	our $BUTTON_STATE;	19	our $BUTTON_STATE;
18		20
19	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
20		22
21	sub get_layout {	23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};
29	}
30
31	return $LAYOUT;
32	}
33
34	sub set_layout {
35	my ($layout) = @_;
36	$LAYOUT = $layout;
37	}
38
39	sub check_tooltip {
40	if (!$GRAB) {	24	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
45	$TOOLTIP->hide;	28	$TOOLTIP->hide;
46		29
47	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
48		33
49	my $tip = $widget->{tooltip};	34	my $tip = $widget->{tooltip};
50		35
51	$tip = $tip->($widget) if CODE:: eq ref $tip;	36	$tip = $tip->($widget) if CODE:: eq ref $tip;
52		37
…		…
59	}	44	}
60	}	45	}
61		46
62	$TOOLTIP->hide;	47	$TOOLTIP->hide;
63	delete $TOOLTIP->{owner};	48	delete $TOOLTIP->{owner};
		49	});
		50
		51	sub get_layout {
		52	my $layout;
		53
		54	for (grep { $_->{name} } values %WIDGET) {
		55	my $win = $layout->{$_->{name}} = { };
		56
		57	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		58	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		59	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		60	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		61
		62	$win->{show} = $_->{visible} && $_->{is_toplevel};
		63	}
		64
		65	$layout
		66	}
		67
		68	sub set_layout {
		69	my ($layout) = @_;
		70
		71	$LAYOUT = $layout;
64	}	72	}
65		73
66	# class methods for events	74	# class methods for events
67	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
68	$FOCUS->emit (key_down => $_[0])	76	$FOCUS->emit (key_down => $_[0])
…		…
72	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
73	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
74	if $FOCUS;	82	if $FOCUS;
75	}	83	}
76		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
77	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
78	my ($ev) = @_;	99	my ($ev) = @_;
79	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
80		101
81	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
82	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
83		106
84	$GRAB = $widget;	107	$GRAB = $widget;
85	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
86		109
87	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
88	}	111	}
89		112
90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
91		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
93	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
94	}	123	}
95		124
96	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
97	my ($ev) = @_;	126	my ($ev) = @_;
98	my ($x, $y) = ($ev->{x}, $ev->{y});
99		127
100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
101		129
102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
103		131
104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
105	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
106		134
107	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
108	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
109	$grab->update if $grab;	137	$grab->update if $grab;
110	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
111		139
112	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
113	}	142	}
114	}	143	}
115		144
116	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
117	my ($ev) = @_;	146	my ($ev) = @_;
118	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
119		148
120	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
121		150
122	if ($widget != $HOVER) {	151	check_hover $widget;
123	my $hover = $HOVER; $HOVER = $widget;
124		152
125	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
126	$HOVER->update if $HOVER && $HOVER->{can_hover};
127
128	check_tooltip;
129	}
130
131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132	if $HOVER;	154	if $HOVER;
133	}	155	}
134		156
135	# convert position array to integers	157	# convert position array to integers
136	sub harmonize {	158	sub harmonize {
…		…
165	sub rescale_widgets {	187	sub rescale_widgets {
166	my ($sx, $sy) = @_;	188	my ($sx, $sy) = @_;
167		189
168	for my $widget (values %WIDGET) {	190	for my $widget (values %WIDGET) {
169	if ($widget->{is_toplevel}) {	191	if ($widget->{is_toplevel}) {
		192	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		193	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		194
170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	195	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	196	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	197	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	198	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	199	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	200	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		201
		202	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		203	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		204
176	}	205	}
177	}	206	}
178		207
179	reconfigure_widgets;	208	reconfigure_widgets;
180	}	209	}
181		210
182	#############################################################################	211	#############################################################################
183		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
184	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
185		222
186	use strict;	223	use strict;
187		224
188	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
189		226
190	sub new {	227	sub new {
191	my $class = shift;	228	my $class = shift;
192		229
193	my $self = bless {	230	my $self = bless {
194	x => 0,	231	x => "center",
195	y => 0,	232	y => "center",
196	z => 0,	233	z => 0,
		234	w => undef,
		235	h => undef,
197	can_events => 1,	236	can_events => 1,
198	@_	237	@_
199	}, $class;	238	}, $class;
		239
		240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
200		241
201	for (keys %$self) {	242	for (keys %$self) {
202	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
203	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
204	}	245	}
205	}	246	}
206		247
207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
210	$self->{req_x} = $layout->{x} * $::WIDTH;	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
211	$self->{req_y} = $layout->{y} * $::HEIGHT;	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		253
		254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		256
		257	$self->show if $layout->{show};
214	}	258	}
215		259
216	$self	260	$self
217	}	261	}
218		262
…		…
226	sub show {	270	sub show {
227	my ($self) = @_;	271	my ($self) = @_;
228		272
229	return if $self->{parent};	273	return if $self->{parent};
230		274
231	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
232	}
233
234	sub center {
235	my ($self) = @_;
236
237	$CFClient::UI::ROOT->on_post_alloc (
238	"center_$self" => sub {
239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240	},
241	);
242
243	$self->update;
244	}	276	}
245		277
246	sub set_visible {	278	sub set_visible {
247	my ($self) = @_;	279	my ($self) = @_;
248		280
…		…
263		295
264	return unless $self->{visible};	296	return unless $self->{visible};
265		297
266	$_->set_invisible for $self->children;	298	$_->set_invisible for $self->children;
267		299
		300	delete $self->{visible};
268	delete $self->{root};	301	delete $self->{root};
269	delete $self->{visible};
270		302
271	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
272	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
273		305
274	CFClient::UI::check_tooltip	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
275	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
276		308
277	$self->focus_out;	309	$self->emit ("focus_out");
278
279	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
280	}	311	}
281		312
282	sub set_visibility {	313	sub set_visibility {
283	my ($self, $visible) = @_;	314	my ($self, $visible) = @_;
…		…
303		334
304	$self->{parent}->remove ($self)	335	$self->{parent}->remove ($self)
305	if $self->{parent};	336	if $self->{parent};
306	}	337	}
307		338
308	sub move {	339	sub move_abs {
309	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
310		341
311	$self->{x} = int $x;	342	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312	$self->{y} = int $y;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
313	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
314		345
315	$self->update;	346	$self->update;
316	}	347	}
317		348
318	sub set_size {	349	sub set_size {
319	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
320		351
321	$self->{def_w} = $w;	352	$self->{force_w} = $w;
322	$self->{def_h} = $h;	353	$self->{force_h} = $h;
323		354
324	$self->realloc;	355	$self->realloc;
325	}	356	}
326		357
327	sub size_request {	358	sub size_request {
328	require Carp;	359	require Carp;
329	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
330	}	361	}
331		362
		363	sub baseline_shift {
		364	0
		365	}
		366
332	sub configure {	367	sub configure {
333	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
334		369
335	if ($self->{aspect}) {	370	if ($self->{aspect}) {
		371	my ($ow, $oh) = ($w, $h);
		372
336	my $w2 = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
337	my $h2 = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
338		375
339	# use alignment to adjust x, y	376	# use alignment to adjust x, y
340		377
341	$x += int +($w - $w2) * 0.5;	378	$x += int 0.5 * ($ow - $w);
342	$y += int +($h - $h2) * 0.5;	379	$y += int 0.5 * ($oh - $h);
343
344	($w, $h) = ($w2, $h2);
345	}	380	}
346		381
347	if ($self->{x} != $x || $self->{y} != $y) {	382	if ($self->{x} ne $x || $self->{y} ne $y) {
348	$self->{x} = $x;	383	$self->{x} = $x;
349	$self->{y} = $y;	384	$self->{y} = $y;
350	$self->update;	385	$self->update;
351	}	386	}
352		387
353	if ($self->{w} != $w || $self->{h} != $h) {	388	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354	return unless $self->{visible};	389	return unless $self->{visible};
355		390
		391	$self->{alloc_w} = $w;
		392	$self->{alloc_h} = $h;
		393
356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	394	$self->{root}{size_alloc}{$self+0} = $self;
357	}	395	}
358	}
359
360	sub size_allocate {
361	# nothing to be done
362	}	396	}
363		397
364	sub children {	398	sub children {
		399	# nop
		400	}
		401
		402	sub visible_children {
		403	$_[0]->children
365	}	404	}
366		405
367	sub set_max_size {	406	sub set_max_size {
368	my ($self, $w, $h) = @_;	407	my ($self, $w, $h) = @_;
369		408
370	delete $self->{max_w}; $self->{max_w} = $w if $w;	409	$self->{max_w} = int $w if defined $w;
371	delete $self->{max_h}; $self->{max_h} = $h if $h;	410	$self->{max_h} = int $h if defined $h;
		411
		412	$self->realloc;
372	}	413	}
373		414
374	sub set_tooltip {	415	sub set_tooltip {
375	my ($self, $tooltip) = @_;	416	my ($self, $tooltip) = @_;
376		417
…		…
379		420
380	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
381		422
382	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
383		424
384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
385	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
386	CFClient::UI::check_tooltip;	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
387	}	428	}
388	}	429	}
389		430
390	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
391	sub coord2local {	432	sub coord2local {
392	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
393		434
		435	Carp::confess unless $self->{parent};#d#
		436
394	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
395	}	438	}
396		439
397	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
398	sub coord2global {	441	sub coord2global {
399	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
400		443
		444	Carp::confess unless $self->{parent};#d#
		445
401	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402	}	447	}
403		448
404	sub focus_in {	449	sub invoke_focus_in {
405	my ($self) = @_;	450	my ($self) = @_;
406		451
407	return if $FOCUS == $self;	452	return if $FOCUS == $self;
408	return unless $self->{can_focus};	453	return unless $self->{can_focus};
409		454
410	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
411		456
412	$self->_emit (focus_in => $focus);	457	$self->update;
413		458
414	$focus->update if $focus;	459	0
415	$FOCUS->update;
416	}	460	}
417		461
418	sub focus_out {	462	sub invoke_focus_out {
419	my ($self) = @_;	463	my ($self) = @_;
420		464
421	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
422		466
423	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
424		468
425	$self->_emit (focus_out => $focus);	469	$self->update;
426		470
427	$focus->update if $focus; #?
428
429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430	unless $FOCUS;	472	unless $FOCUS;
431	}
432		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
433	sub mouse_motion { }	484	sub invoke_mouse_motion { 0 }
434	sub button_up { }	485	sub invoke_button_up { 0 }
435	sub key_down { }	486	sub invoke_key_down { 0 }
436	sub key_up { }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
437		489
438	sub button_down {	490	sub invoke_button_down {
439	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
440		492
441	$self->focus_in;	493	$self->grab_focus;
442	}
443		494
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	495	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	496	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	497
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	498	sub connect {
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
		515
		516	sub emit {
		517	my ($self, $signal, @args) = @_;
		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	#d##TODO# stop propagating at first true, do not use sum
		529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		532	}
449		533
450	sub find_widget {	534	sub find_widget {
451	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
452		536
453	return () unless $self->{can_events};	537	return () unless $self->{can_events};
…		…
461		545
462	sub set_parent {	546	sub set_parent {
463	my ($self, $parent) = @_;	547	my ($self, $parent) = @_;
464		548
465	Scalar::Util::weaken ($self->{parent} = $parent);	549	Scalar::Util::weaken ($self->{parent} = $parent);
466
467	$self->set_visible if $parent->{visible};	550	$self->set_visible if $parent->{visible};
468	}	551	}
469		552
470	sub connect {
471	my ($self, $signal, $cb) = @_;
472
473	push @{ $self->{signal_cb}{$signal} }, $cb;
474	}
475
476	sub _emit {
477	my ($self, $signal, @args) = @_;
478
479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480	}
481
482	sub emit {
483	my ($self, $signal, @args) = @_;
484
485	$self->_emit ($signal, @args)
486	|| $self->$signal (@args);
487	}
488
489	sub visibility_change {
490	#my ($self, $visible) = @_;
491	}
492
493	sub realloc {	553	sub realloc {
494	my ($self) = @_;	554	my ($self) = @_;
495		555
496	if ($self->{visible}) {	556	if ($self->{visible}) {
497	return if $self->{root}{realloc}{$self};	557	return if $self->{root}{realloc}{$self+0};
498		558
499	$self->{root}{realloc}{$self} = $self;	559	$self->{root}{realloc}{$self+0} = $self;
500	$self->{root}->update;	560	$self->{root}->update;
501	} else {	561	} else {
502	delete $self->{req_w};	562	delete $self->{req_w};
		563	delete $self->{req_h};
503	}	564	}
504	}	565	}
505		566
506	sub update {	567	sub update {
507	my ($self) = @_;	568	my ($self) = @_;
508		569
509	$self->{parent}->update	570	$self->{parent}->update
510	if $self->{parent};	571	if $self->{parent};
511	}	572	}
512		573
		574	sub reconfigure {
		575	my ($self) = @_;
		576
		577	$self->realloc;
		578	$self->update;
		579	}
		580
		581	# using global variables seems a bit hacky, but passing through all drawing
		582	# functions seems pointless.
		583	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		584
513	sub draw {	585	sub draw {
514	my ($self) = @_;	586	my ($self) = @_;
515		587
516	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
		589
		590	# update screen rectangle
		591	local $draw_x = $draw_x + $self->{x};
		592	local $draw_y = $draw_y + $self->{y};
		593
		594	# skip widgets that are entirely outside the drawing area
		595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517		597
518	glPushMatrix;	598	glPushMatrix;
519	glTranslate $self->{x}, $self->{y}, 0;	599	glTranslate $self->{x}, $self->{y}, 0;
520	$self->_draw;
521	glPopMatrix;
522		600
523	if ($self == $HOVER && $self->{can_hover}) {	601	if ($self == $HOVER && $self->{can_hover}) {
524	my ($x, $y) = @$self{qw(x y)};
525
526	glColor 1, 0.8, 0.5, 0.2;	602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527	glEnable GL_BLEND;	603	glEnable GL_BLEND;
528	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529	glBegin GL_QUADS;	605	glBegin GL_QUADS;
530	glVertex $x , $y;	606	glVertex 0 , 0;
531	glVertex $x + $self->{w}, $y;	607	glVertex $self->{w}, 0;
532	glVertex $x + $self->{w}, $y + $self->{h};	608	glVertex $self->{w}, $self->{h};
533	glVertex $x , $y + $self->{h};	609	glVertex 0 , $self->{h};
534	glEnd;	610	glEnd;
535	glDisable GL_BLEND;	611	glDisable GL_BLEND;
536	}	612	}
537		613
538	if ($ENV{PCLIENT_DEBUG}) {	614	if ($ENV{CFPLUS_DEBUG} & 1) {
539	glPushMatrix;	615	glPushMatrix;
540	glColor 1, 1, 0, 1;	616	glColor 1, 1, 0, 1;
541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	617	glTranslate 0.375, 0.375;
542	glBegin GL_LINE_LOOP;	618	glBegin GL_LINE_LOOP;
543	glVertex 0 , 0;	619	glVertex 0 , 0;
544	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
545	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
546	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
547	glEnd;	623	glEnd;
548	glPopMatrix;	624	glPopMatrix;
549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550	}	626	}
		627
		628	$self->_draw;
		629	glPopMatrix;
551	}	630	}
552		631
553	sub _draw {	632	sub _draw {
554	my ($self) = @_;	633	my ($self) = @_;
555		634
…		…
557	}	636	}
558		637
559	sub DESTROY {	638	sub DESTROY {
560	my ($self) = @_;	639	my ($self) = @_;
561		640
		641	return if CFPlus::in_destruct;
		642
562	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
563	#$self->deactivate;	644
		645	eval { $self->destroy };
		646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564	}	647	}
565		648
566	#############################################################################	649	#############################################################################
567		650
568	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
569		652
570	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
571		654
572	use strict;	655	use strict;
573	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
574		657
575	sub new {	658	sub new {
576	my $class = shift;	659	my $class = shift;
577		660
578	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
593		676
594	if ($color && (@$color < 4 || $color->[3])) {	677	if ($color && (@$color < 4 || $color->[3])) {
595	my ($w, $h) = @$self{qw(w h)};	678	my ($w, $h) = @$self{qw(w h)};
596		679
597	glEnable GL_BLEND;	680	glEnable GL_BLEND;
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	681	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599	glColor @$color;	682	glColor_premultiply @$color;
600		683
601	glBegin GL_QUADS;	684	glBegin GL_QUADS;
602	glVertex 0 , 0;	685	glVertex 0 , 0;
603	glVertex 0 , $h;	686	glVertex 0 , $h;
604	glVertex $w, $h;	687	glVertex $w, $h;
…		…
609	}	692	}
610	}	693	}
611		694
612	#############################################################################	695	#############################################################################
613		696
614	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
615		698
616	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
617		700
618	sub new {	701	sub new {
619	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
620	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
621	}	704	}
622		705
623	sub size_request {	706	sub size_request {
624	(0, 0)	707	my ($self) = @_;
		708
		709	($self->{w} + 0, $self->{h} + 0)
625	}	710	}
626		711
627	sub draw { }	712	sub draw { }
628		713
629	#############################################################################	714	#############################################################################
630		715
631	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
632		717
633	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
634		719
635	sub new {	720	sub new {
636	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
637		722
638	my $children = delete $arg{children} || [];	723	my $children = delete $arg{children};
639		724
640	my $self = $class->SUPER::new (	725	my $self = $class->SUPER::new (
641	children => [],	726	children => [],
642	can_events => 0,	727	can_events => 0,
643	%arg,	728	%arg,
644	);	729	);
		730
645	$self->add ($_) for @$children;	731	$self->add (@$children)
		732	if $children;
646		733
647	$self	734	$self
		735	}
		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
648	}	743	}
649		744
650	sub add {	745	sub add {
651	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
652		747
…		…
698	$x -= $self->{x};	793	$x -= $self->{x};
699	$y -= $self->{y};	794	$y -= $self->{y};
700		795
701	my $res;	796	my $res;
702		797
703	for (reverse @{ $self->{children} }) {	798	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	799	$res = $_->find_widget ($x, $y)
705	and return $res;	800	and return $res;
706	}	801	}
707		802
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	803	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
714	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
715	}	810	}
716		811
717	#############################################################################	812	#############################################################################
718		813
719	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
720		815
721	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
722		817
723	sub new {	818	sub new {
724	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
725		820
726	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
727		822
728	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
729	}	824	}
730		825
731	sub add {	826	sub add {
732	my ($self, $child) = @_;	827	my ($self, $child) = @_;
733		828
734	$self->{children} = [];	829	$self->SUPER::remove ($_) for @{ $self->{children} };
735
736	$self->SUPER::add ($child);	830	$self->SUPER::add ($child);
737	}	831	}
738		832
739	sub remove {	833	sub remove {
740	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
741		835
742	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
743		837
744	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
745	unless @{$self->{children}};	839	unless @{$self->{children}};
746	}	840	}
747		841
748	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
749		843
750	sub size_request {	844	sub size_request {
751	$_[0]{children}[0]->size_request	845	$_[0]{children}[0]->size_request
752	}	846	}
753		847
754	sub size_allocate {	848	sub invoke_size_allocate {
755	my ($self, $w, $h, $changed) = @_;	849	my ($self, $w, $h) = @_;
756		850
757	$self->{children}[0]->configure (0, 0, $w, $h);	851	$self->{children}[0]->configure (0, 0, $w, $h);
		852
		853	1
758	}	854	}
759		855
760	#############################################################################	856	#############################################################################
761		857
		858	# back-buffered drawing area
		859
762	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
763		861
764	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
765		863
766	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
767		865
768	sub new {	866	sub new {
769	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
770		868
771	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
776		874
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	875	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	876	$self->SUPER::update;
779	}	877	}
780		878
781	sub size_allocate {	879	sub invoke_size_allocate {
782	my ($self, $w, $h, $changed) = @_;	880	my ($self, $w, $h) = @_;
783		881
784	$self->SUPER::size_allocate ($w, $h, $changed);
785	$self->update	882	$self->update;
786	if $changed;	883
		884	$self->SUPER::invoke_size_allocate ($w, $h)
787	}	885	}
788		886
789	sub _render {	887	sub _render {
		888	my ($self) = @_;
		889
790	$_[0]{children}[0]->draw;	890	$self->{children}[0]->draw;
791	}	891	}
792		892
793	sub render_child {	893	sub render_child {
794	my ($self) = @_;	894	my ($self) = @_;
795		895
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
799		899
		900	{
		901	package CFPlus::UI::Base;
		902
		903	($draw_x, $draw_y, $draw_w, $draw_h) =
		904	(0, 0, $self->{w}, $self->{h});
		905	}
		906
800	$self->_render;	907	$self->_render;
801	};	908	};
802	}	909	}
803		910
804	sub _draw {	911	sub _draw {
805	my ($self) = @_;	912	my ($self) = @_;
806		913
807	my ($w, $h) = ($self->w, $self->h);	914	my ($w, $h) = @$self{qw(w h)};
808		915
809	my $tex = $self->{texture}	916	my $tex = $self->{texture}
810	or return;	917	or return;
811		918
812	glEnable GL_TEXTURE_2D;	919	glEnable GL_TEXTURE_2D;
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814	glColor 1, 1, 1, 1;	921	glColor 0, 0, 0, 1;
815		922
816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	923	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817		924
818	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
819	}	926	}
820		927
821	#############################################################################	928	#############################################################################
822		929
823	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
824		931
825	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
826		933
827	sub new {	934	sub new {
828	my $class = shift;	935	my $class = shift;
829		936
830	$class->SUPER::new (	937	$class->SUPER::new (
…		…
835	}	942	}
836		943
837	sub size_request {	944	sub size_request {
838	my ($self) = @_;	945	my ($self) = @_;
839		946
840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	947	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		948
842	$w = 10 if $self->{scroll_x};	949	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	950	$h = 10 if $self->{scroll_y};
844		951
845	($w, $h)	952	($w, $h)
846	}	953	}
847		954
848	sub size_allocate {	955	sub invoke_size_allocate {
849	my ($self, $w, $h, $changed) = @_;	956	my ($self, $w, $h) = @_;
850		957
		958	my $child = $self->child;
		959
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	960	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	961	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		962
854	$self->child->configure (0, 0, $w, $h);	963	$self->child->configure (0, 0, $w, $h);
855	$self->update;	964	$self->update;
		965
		966	1
856	}	967	}
857		968
858	sub set_offset {	969	sub set_offset {
859	my ($self, $x, $y) = @_;	970	my ($self, $x, $y) = @_;
860		971
…		…
886	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
887	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
888	) {	999	) {
889	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
890	} else {	1001	} else {
891	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
892	}	1003	}
893	}	1004	}
894		1005
895	sub _render {	1006	sub _render {
896	my ($self) = @_;	1007	my ($self) = @_;
897		1008
		1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1011
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		1013
900	$self->SUPER::_render;	1014	$self->SUPER::_render;
901	}	1015	}
902		1016
903	#############################################################################	1017	#############################################################################
904		1018
905	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
906		1020
907	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
908		1022
909	sub new {	1023	sub new {
910	my $class = shift;	1024	my ($class, %arg) = @_;
		1025
		1026	my $child = delete $arg{child};
911		1027
912	my $self;	1028	my $self;
913		1029
914	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
915	vertical => 1,	1031	vertical => 1,
916	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
917	on_changed => sub {	1033	on_changed => sub {
918	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
919	},	1035	},
920	;	1036	;
921		1037
922	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
924	slider => $slider,	1041	slider => $slider,
925	@_,	1042	%arg,
926	);	1043	);
927		1044
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
		1046	$self->add ($child) if $child;
931		1047
932	$self	1048	$self
933	}	1049	}
934		1050
		1051	#TODO# update range on size_allocate depending on child
		1052
		1053	sub add {
		1054	my ($self, $widget) = @_;
		1055
		1056	$self->{vp}->add ($self->{child} = $widget);
		1057	}
		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
		1069	sub update_slider {
		1070	my ($self) = @_;
		1071
		1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1073	}
		1074
935	sub update {	1075	sub update {
936	my ($self) = @_;	1076	my ($self) = @_;
937		1077
938	$self->SUPER::update;	1078	$self->SUPER::update;
939		1079
940	# todo: overwrite size_allocate of child	1080	$self->update_slider;
941	my $child = $self->{vp}->child;
942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943	}	1081	}
944		1082
945	sub size_allocate {	1083	sub invoke_size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1084	my ($self, $w, $h) = @_;
947		1085
		1086	$self->update_slider;
		1087
948	$self->SUPER::size_allocate ($w, $h, $changed);	1088	$self->SUPER::invoke_size_allocate ($w, $h)
949
950	my $child = $self->{vp}->child;
951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952	}	1089	}
953
954	#TODO# update range on size_allocate depending on child
955	# update viewport offset on scroll
956		1090
957	#############################################################################	1091	#############################################################################
958		1092
959	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
960		1094
961	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
962		1096
963	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
964		1098
965	sub new {	1099	sub new {
966	my $class = shift;	1100	my $class = shift;
967		1101
968	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
976		1110
977	if ($self->{bg}) {	1111	if ($self->{bg}) {
978	my ($w, $h) = @$self{qw(w h)};	1112	my ($w, $h) = @$self{qw(w h)};
979		1113
980	glEnable GL_BLEND;	1114	glEnable GL_BLEND;
981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1115	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982	glColor @{ $self->{bg} };	1116	glColor_premultiply @{ $self->{bg} };
983		1117
984	glBegin GL_QUADS;	1118	glBegin GL_QUADS;
985	glVertex 0 , 0;	1119	glVertex 0 , 0;
986	glVertex 0 , $h;	1120	glVertex 0 , $h;
987	glVertex $w, $h;	1121	glVertex $w, $h;
…		…
994	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
995	}	1129	}
996		1130
997	#############################################################################	1131	#############################################################################
998		1132
999	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1000		1134
1001	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1002		1136
1003	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1004		1138
1005	my @tex =	1139	my $bg =
		1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1141	mipmap => 1, wrap => 1;
		1142
		1143	my @border =
1006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008		1146
1009	sub new {	1147	sub new {
1010	my $class = shift;	1148	my ($class, %arg) = @_;
1011		1149
1012	my $self = $class->SUPER::new (	1150	my $self = $class->SUPER::new (
1013	bg => [1, 1, 1, 1],	1151	bg => [1, 1, 1, 1],
1014	border_bg => [1, 1, 1, 1],	1152	border_bg => [1, 1, 1, 1],
1015	border => 0.6,	1153	border => 0.6,
1016	is_toplevel => 1,
1017	can_events => 1,	1154	can_events => 1,
1018	@_	1155	min_w => 64,
		1156	min_h => 32,
		1157	%arg,
1019	);	1158	);
1020		1159
1021	$self->{title} &&= new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1022	align => 0,	1161	align => 0,
1023	valign => 1,	1162	valign => 1,
1024	text => $self->{title},	1163	text => $self->{title},
1025	fontsize => $self->{border};	1164	fontsize => $self->{border},
		1165	if exists $self->{title};
		1166
		1167	if ($self->{has_close_button}) {
		1168	$self->{close_button} =
		1169	new CFPlus::UI::ImageButton
		1170	path => 'x1_close.png',
		1171	on_activate => sub { $self->emit ("delete") };
		1172
		1173	$self->CFPlus::UI::Container::add ($self->{close_button});
		1174	}
1026		1175
1027	$self	1176	$self
		1177	}
		1178
		1179	sub add {
		1180	my ($self, @widgets) = @_;
		1181
		1182	$self->SUPER::add (@widgets);
		1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028	}	1185	}
1029		1186
1030	sub border {	1187	sub border {
1031	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1032	}	1189	}
1033		1190
1034	sub size_request {	1191	sub size_request {
1035	my ($self) = @_;	1192	my ($self) = @_;
		1193
		1194	$self->{title_widget}->size_request
		1195	if $self->{title_widget};
		1196
		1197	$self->{close_button}->size_request
		1198	if $self->{close_button};
1036		1199
1037	my ($w, $h) = $self->SUPER::size_request;	1200	my ($w, $h) = $self->SUPER::size_request;
1038		1201
1039	(	1202	(
1040	$w + $self->border * 2,	1203	$w + $self->border * 2,
1041	$h + $self->border * 2,	1204	$h + $self->border * 2,
1042	)	1205	)
1043	}	1206	}
1044		1207
1045	sub size_allocate {	1208	sub invoke_size_allocate {
1046	my ($self, $w, $h, $changed) = @_;	1209	my ($self, $w, $h) = @_;
1047		1210
1048	return unless $changed;	1211	if ($self->{title_widget}) {
		1212	$self->{title_widget}{w} = $w;
		1213	$self->{title_widget}{h} = $h;
		1214	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1215	}
1049		1216
		1217	my $border = $self->border;
		1218
1050	$h -= List::Util::max 0, $self->border * 2;	1219	$h -= List::Util::max 0, $border * 2;
1051	$w -= List::Util::max 0, $self->border * 2;	1220	$w -= List::Util::max 0, $border * 2;
1052		1221
1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054	if $self->{title};
1055
1056	$self->child->configure ($self->border, $self->border, $w, $h);	1222	$self->child->configure ($border, $border, $w, $h);
1057	}
1058		1223
		1224	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1225	if $self->{close_button};
		1226
		1227	1
		1228	}
		1229
		1230	sub invoke_delete {
		1231	my ($self) = @_;
		1232
		1233	$self->hide;
		1234
		1235	1
		1236	}
		1237
1059	sub button_down {	1238	sub invoke_button_down {
1060	my ($self, $ev, $x, $y) = @_;	1239	my ($self, $ev, $x, $y) = @_;
1061		1240
1062	my ($w, $h) = @$self{qw(w h)};	1241	my ($w, $h) = @$self{qw(w h)};
1063	my $border = $self->border;	1242	my $border = $self->border;
1064		1243
…		…
1077	my ($ev, $x, $y) = @_;	1256	my ($ev, $x, $y) = @_;
1078		1257
1079	my $dx = $ev->{x} - $ox;	1258	my $dx = $ev->{x} - $ox;
1080	my $dy = $ev->{y} - $oy;	1259	my $dy = $ev->{y} - $oy;
1081		1260
1082	$self->{user_x} = $wx + $dx * $mx;
1083	$self->{user_y} = $wy + $dy * $my;
1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1261	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1262	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086	$self->move ($self->{user_x}, $self->{user_y});	1263
		1264	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087	$self->realloc;	1265	$self->realloc;
1088	};	1266	};
1089		1267
1090	} elsif ($lr ^ $td) {	1268	} elsif ($lr ^ $td) {
1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1269	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1094	$self->{motion} = sub {	1272	$self->{motion} = sub {
1095	my ($ev, $x, $y) = @_;	1273	my ($ev, $x, $y) = @_;
1096		1274
1097	($x, $y) = ($ev->{x}, $ev->{y});	1275	($x, $y) = ($ev->{x}, $ev->{y});
1098		1276
1099	$self->{user_x} = $bx + $x - $ox;	1277	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100	$self->{user_y} = $by + $y - $oy;	1278	# HACK: the next line is required to enforce placement
1101		1279	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102	$self->move ($self->{user_x}, $self->{user_y});
1103	$self->realloc;
1104	};	1280	};
		1281	} else {
		1282	return 0;
		1283	}
		1284
1105	}	1285	1
1106	}	1286	}
1107		1287
1108	sub button_up {	1288	sub invoke_button_up {
1109	my ($self, $ev, $x, $y) = @_;	1289	my ($self, $ev, $x, $y) = @_;
1110		1290
1111	delete $self->{motion};	1291	! ! delete $self->{motion}
1112	}	1292	}
1113		1293
1114	sub mouse_motion {	1294	sub invoke_mouse_motion {
1115	my ($self, $ev, $x, $y) = @_;	1295	my ($self, $ev, $x, $y) = @_;
1116		1296
1117	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1298
		1299	! ! $self->{motion}
		1300	}
		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
1118	}	1308	}
1119		1309
1120	sub _draw {	1310	sub _draw {
1121	my ($self) = @_;	1311	my ($self) = @_;
1122		1312
		1313	my $child = $self->{children}[0];
		1314
1123	my ($w, $h ) = ($self->{w}, $self->{h});	1315	my ($w, $h ) = ($self->{w}, $self->{h});
1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1316	my ($cw, $ch) = ($child->{w}, $child->{h});
1125		1317
1126	glEnable GL_TEXTURE_2D;	1318	glEnable GL_TEXTURE_2D;
1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1319	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128		1320
1129	my $border = $self->border;	1321	my $border = $self->border;
1130		1322
1131	glColor @{ $self->{border_bg} };	1323	glColor @{ $self->{border_bg} };
1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1324	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1325	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1326	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1327	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136		1328
1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1329	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138	my $bg = $tex[0];	1330	glColor @{ $self->{bg} };
1139		1331
1140	# TODO: repeat texture not scale	1332	# TODO: repeat texture not scale
		1333	# solve this better(?)
1141	my $rep_x = $cw / $bg->{w};	1334	$bg->{s} = $cw / $bg->{w};
1142	my $rep_y = $ch / $bg->{h};	1335	$bg->{t} = $ch / $bg->{h};
1143
1144	glColor @{ $self->{bg} };
1145
1146	$bg->{s} = $rep_x;
1147	$bg->{t} = $rep_y;
1148	$bg->{wrap_mode} = 1;
1149	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1336	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150	}	1337	}
1151		1338
1152	glDisable GL_TEXTURE_2D;	1339	glDisable GL_TEXTURE_2D;
1153		1340
1154	$self->{title}->draw if $self->{title};
1155
1156	$self->child->draw;	1341	$child->draw;
		1342
		1343	if ($self->{title_widget}) {
		1344	glTranslate 0, $border - $self->{h};
		1345	$self->{title_widget}->_draw;
		1346
		1347	glTranslate 0, - ($border - $self->{h});
		1348	}
		1349
		1350	$self->{close_button}->draw
		1351	if $self->{close_button};
1157	}	1352	}
1158		1353
1159	#############################################################################	1354	#############################################################################
1160		1355
1161	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1162		1357
1163	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1164		1359
1165	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1166		1361
1167	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1168		1363
1169	sub new {	1364	sub new {
1170	my $class = shift;	1365	my $class = shift;
1171		1366
1172	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1178	sub children {	1373	sub children {
1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1180	}	1375	}
1181		1376
1182	sub add {	1377	sub add {
1183	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1184		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1185	$child->set_parent ($self);	1382	$child->set_parent ($self);
1186	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1187		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1188	$self->realloc;	1388	$self->realloc;
		1389	}
		1390
		1391	sub remove {
		1392	my ($self, $child) = @_;
		1393
		1394	# TODO: not yet implemented
1189	}	1395	}
1190		1396
1191	# TODO: move to container class maybe? send children a signal on removal?	1397	# TODO: move to container class maybe? send children a signal on removal?
1192	sub clear {	1398	sub clear {
1193	my ($self) = @_;	1399	my ($self) = @_;
…		…
1234	(sum @$ws),	1440	(sum @$ws),
1235	(sum @$hs),	1441	(sum @$hs),
1236	)	1442	)
1237	}	1443	}
1238		1444
1239	sub size_allocate {	1445	sub invoke_size_allocate {
1240	my ($self, $w, $h, $changed) = @_;	1446	my ($self, $w, $h) = @_;
1241		1447
1242	my ($ws, $hs) = $self->get_wh;	1448	my ($ws, $hs) = $self->get_wh;
1243		1449
1244	my $req_w = (sum @$ws) || 1;	1450	my $req_w = (sum @$ws) || 1;
1245	my $req_h = (sum @$hs) || 1;	1451	my $req_h = (sum @$hs) || 1;
…		…
1251		1457
1252	# linearly scale sizes	1458	# linearly scale sizes
1253	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1254	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1255		1461
1256	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1257	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1258		1464
1259	my $y;	1465	my $y;
1260		1466
1261	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1262	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1276	}	1482	}
1277		1483
1278	$y += $row_h;	1484	$y += $row_h;
1279	}	1485	}
1280		1486
		1487	1
1281	}	1488	}
1282		1489
1283	sub find_widget {	1490	sub find_widget {
1284	my ($self, $x, $y) = @_;	1491	my ($self, $x, $y) = @_;
1285		1492
…		…
1304	}	1511	}
1305	}	1512	}
1306		1513
1307	#############################################################################	1514	#############################################################################
1308		1515
1309	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1310		1517
1311	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1312		1519
1313	sub size_request {	1520	sub size_request {
1314	my ($self) = @_;	1521	my ($self) = @_;
1315		1522
1316	$self->{vertical}	1523	$self->{vertical}
…		…
1322	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1529	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1530	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1324	)	1531	)
1325	}	1532	}
1326		1533
1327	sub size_allocate {	1534	sub invoke_size_allocate {
1328	my ($self, $w, $h, $changed) = @_;	1535	my ($self, $w, $h) = @_;
1329		1536
1330	my $space = $self->{vertical} ? $h : $w;	1537	my $space = $self->{vertical} ? $h : $w;
1331	my $children = $self->{children};	1538	my @children = $self->visible_children;
1332		1539
1333	my @req;	1540	my @req;
1334		1541
1335	if ($self->{homogeneous}) {	1542	if ($self->{homogeneous}) {
1336	@req = ($space / (@$children || 1)) x @$children;	1543	@req = ($space / (@children || 1)) x @children;
1337	} else {	1544	} else {
1338	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1545	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1339	my $req = List::Util::sum @req;	1546	my $req = List::Util::sum @req;
1340		1547
1341	if ($req > $space) {	1548	if ($req > $space) {
1342	# ah well, not enough space	1549	# ah well, not enough space
1343	$_ *= $space / $req for @req;	1550	$_ *= $space / $req for @req;
1344	} else {	1551	} else {
1345	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1552	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1346		1553
1347	$space = ($space - $req) / $expand; # remaining space to give away	1554	$space = ($space - $req) / $expand; # remaining space to give away
1348		1555
1349	$req[$_] += $space * $children->[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1350	for 0 .. $#$children;	1557	for 0 .. $#children;
1351	}	1558	}
1352	}	1559	}
1353		1560
1354	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1355		1562
1356	my $pos = 0;	1563	my $pos = 0;
1357	for (0 .. $#$children) {	1564	for (0 .. $#children) {
1358	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1359	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360		1567
1361	$pos += $alloc;	1568	$pos += $alloc;
1362	}	1569	}
1363		1570
1364	1	1571	1
1365	}	1572	}
1366		1573
1367	#############################################################################	1574	#############################################################################
1368		1575
1369	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1370		1577
1371	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1372		1579
1373	sub new {	1580	sub new {
1374	my $class = shift;	1581	my $class = shift;
1375		1582
1376	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1379	)	1586	)
1380	}	1587	}
1381		1588
1382	#############################################################################	1589	#############################################################################
1383		1590
1384	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1385		1592
1386	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1387		1594
1388	sub new {	1595	sub new {
1389	my $class = shift;	1596	my $class = shift;
1390		1597
1391	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1394	)	1601	)
1395	}	1602	}
1396		1603
1397	#############################################################################	1604	#############################################################################
1398		1605
1399	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1400		1607
1401	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1402		1609
1403	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1404		1611
1405	sub new {	1612	sub new {
1406	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1407		1614
1408	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1412	#font => default_font	1619	#font => default_font
1413	#text => initial text	1620	#text => initial text
1414	#markup => initial narkup	1621	#markup => initial narkup
1415	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1416	ellipsise => 3, # end	1623	ellipsise => 3, # end
1417	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1418	fontsize => 1,	1625	fontsize => 1,
1419	align => -1,	1626	align => -1,
1420	valign => -1,	1627	valign => -1,
1421	padding => 2,	1628	padding_x => 2,
		1629	padding_y => 2,
1422	can_events => 0,	1630	can_events => 0,
1423	%arg	1631	%arg
1424	);	1632	);
1425		1633
1426	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1427	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1428	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1429	$self->{template} = $layout;	1637	$self->{template} = $layout;
1430	}	1638	}
1431		1639
1432	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1436	}	1644	}
1437		1645
1438	$self	1646	$self
1439	}	1647	}
1440		1648
1441	sub escape($) {
1442	local $_ = $_[0];
1443
1444	s/&/&amp;/g;
1445	s/>/&gt;/g;
1446	s/</&lt;/g;
1447
1448	$_
1449	}
1450
1451	sub update {	1649	sub update {
1452	my ($self) = @_;	1650	my ($self) = @_;
1453		1651
1454	delete $self->{texture};	1652	delete $self->{texture};
1455	$self->SUPER::update;	1653	$self->SUPER::update;
1456	}	1654	}
1457		1655
		1656	sub realloc {
		1657	my ($self) = @_;
		1658
		1659	delete $self->{ox};
		1660	$self->SUPER::realloc;
		1661	}
		1662
1458	sub set_text {	1663	sub set_text {
1459	my ($self, $text) = @_;	1664	my ($self, $text) = @_;
1460		1665
1461	return if $self->{text} eq "T$text";	1666	return if $self->{text} eq "T$text";
1462	$self->{text} = "T$text";	1667	$self->{text} = "T$text";
1463		1668
1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465	$self->{layout}->set_text ($text);	1669	$self->{layout}->set_text ($text);
1466		1670
		1671	delete $self->{size_req};
1467	$self->realloc;	1672	$self->realloc;
1468	$self->update;	1673	$self->update;
1469	}	1674	}
1470		1675
1471	sub set_markup {	1676	sub set_markup {
…		…
1474	return if $self->{text} eq "M$markup";	1679	return if $self->{text} eq "M$markup";
1475	$self->{text} = "M$markup";	1680	$self->{text} = "M$markup";
1476		1681
1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1682	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478		1683
1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480	$self->{layout}->set_markup ($markup);	1684	$self->{layout}->set_markup ($markup);
1481		1685
		1686	delete $self->{size_req};
1482	$self->realloc;	1687	$self->realloc;
1483	$self->update;	1688	$self->update;
1484	}	1689	}
1485		1690
1486	sub size_request {	1691	sub size_request {
1487	my ($self) = @_;	1692	my ($self) = @_;
1488		1693
		1694	$self->{size_req} ||= do {
1489	$self->{layout}->set_font ($self->{font}) if $self->{font};	1695	$self->{layout}->set_font ($self->{font}) if $self->{font};
1490	$self->{layout}->set_width ($self->{max_w} || -1);	1696	$self->{layout}->set_width ($self->{max_w} || -1);
1491	$self->{layout}->set_ellipsise ($self->{ellipsise});	1697	$self->{layout}->set_ellipsise ($self->{ellipsise});
1492	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1698	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1699	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494		1700
1495	my ($w, $h) = $self->{layout}->size;	1701	my ($w, $h) = $self->{layout}->size;
1496		1702
1497	if (exists $self->{template}) {	1703	if (exists $self->{template}) {
1498	$self->{template}->set_font ($self->{font}) if $self->{font};	1704	$self->{template}->set_font ($self->{font}) if $self->{font};
		1705	$self->{template}->set_width ($self->{max_w} || -1);
1499	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500		1707
1501	my ($w2, $h2) = $self->{template}->size;	1708	my ($w2, $h2) = $self->{template}->size;
1502		1709
1503	$w = List::Util::max $w, $w2;	1710	$w = List::Util::max $w, $w2;
1504	$h = List::Util::max $h, $h2;	1711	$h = List::Util::max $h, $h2;
		1712	}
		1713
		1714	[$w, $h]
1505	}	1715	};
1506		1716
1507	(	1717	@{ $self->{size_req} }
1508	$w + $self->{padding} * 2,
1509	$h + $self->{padding} * 2,
1510	)
1511	}	1718	}
1512		1719
		1720	sub baseline_shift {
		1721	$_[0]{layout}->descent
		1722	}
		1723
1513	sub size_allocate {	1724	sub invoke_size_allocate {
1514	my ($self, $w, $h, $changed) = @_;	1725	my ($self, $w, $h) = @_;
		1726
		1727	delete $self->{ox};
1515		1728
1516	delete $self->{texture}	1729	delete $self->{texture}
1517	if $changed;	1730	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1731
		1732	1
1518	}	1733	}
1519		1734
1520	sub set_fontsize {	1735	sub set_fontsize {
1521	my ($self, $fontsize) = @_;	1736	my ($self, $fontsize) = @_;
1522		1737
1523	$self->{fontsize} = $fontsize;	1738	$self->{fontsize} = $fontsize;
		1739	delete $self->{size_req};
1524	delete $self->{texture};	1740	delete $self->{texture};
1525		1741
1526	$self->realloc;	1742	$self->realloc;
1527	}	1743	}
1528		1744
		1745	sub reconfigure {
		1746	my ($self) = @_;
		1747
		1748	delete $self->{size_req};
		1749	delete $self->{texture};
		1750
		1751	$self->SUPER::reconfigure;
		1752	}
		1753
1529	sub _draw {	1754	sub _draw {
1530	my ($self) = @_;	1755	my ($self) = @_;
1531		1756
1532	$self->SUPER::_draw; # draw background, if applicable	1757	$self->SUPER::_draw; # draw background, if applicable
1533		1758
1534	my $tex = $self->{texture} ||= do {	1759	my $size = $self->{texture} ||= do {
1535	$self->{layout}->set_foreground (@{$self->{fg}});	1760	$self->{layout}->set_foreground (@{$self->{fg}});
1536	$self->{layout}->set_font ($self->{font}) if $self->{font};	1761	$self->{layout}->set_font ($self->{font}) if $self->{font};
1537	$self->{layout}->set_width ($self->{w});	1762	$self->{layout}->set_width ($self->{w});
1538	$self->{layout}->set_ellipsise ($self->{ellipsise});	1763	$self->{layout}->set_ellipsise ($self->{ellipsise});
1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1764	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1765	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541		1766
1542	my $tex = new_from_layout CFClient::Texture $self->{layout};	1767	[$self->{layout}->size]
1543
1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1546	: ($self->{w} - $tex->{w}) * 0.5);
1547
1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1550	: ($self->{h} - $tex->{h}) * 0.5);
1551
1552	$tex
1553	};	1768	};
1554		1769
1555	glEnable GL_TEXTURE_2D;	1770	unless (exists $self->{ox}) {
1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1771	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		1772	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		1773	: ($self->{w} - $size->[0]) * 0.5);
1557		1774
1558	if ($tex->{format} == GL_ALPHA) {	1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559	glColor @{$self->{fg}};	1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1777	: ($self->{h} - $size->[1]) * 0.5);
1561	} else {
1562	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563	}	1778	};
1564		1779
1565	glDisable GL_TEXTURE_2D;	1780	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1781	my $h = List::Util::min $self->{h} + 2, $size->[1];
		1782
		1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1566	}	1784	}
1567		1785
1568	#############################################################################	1786	#############################################################################
1569		1787
1570	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1571		1789
1572	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1573		1791
1574	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1575		1793
1576	sub new {	1794	sub new {
1577	my $class = shift;	1795	my $class = shift;
1578		1796
1579	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1584	can_hover => 1,	1802	can_hover => 1,
1585	can_focus => 1,	1803	can_focus => 1,
1586	valign => 0,	1804	valign => 0,
1587	can_events => 1,	1805	can_events => 1,
1588	#text => ...	1806	#text => ...
		1807	#hidden => "*",
1589	@_	1808	@_
1590	)	1809	)
1591	}	1810	}
1592		1811
1593	sub _set_text {	1812	sub _set_text {
…		…
1595		1814
1596	delete $self->{cur_h};	1815	delete $self->{cur_h};
1597		1816
1598	return if $self->{text} eq $text;	1817	return if $self->{text} eq $text;
1599		1818
1600	delete $self->{texture};
1601
1602	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1603	$self->{text} = $text;	1820	$self->{text} = $text;
1604		1821
1605	$text =~ s/./*/g if $self->{hidden};	1822	$text =~ s/./*/g if $self->{hidden};
1606	$self->{layout}->set_text ("$text ");	1823	$self->{layout}->set_text ("$text ");
		1824	delete $self->{size_req};
1607		1825
1608	$self->_emit (changed => $self->{text});	1826	$self->emit (changed => $self->{text});
		1827
		1828	$self->realloc;
		1829	$self->update;
1609	}	1830	}
1610		1831
1611	sub set_text {	1832	sub set_text {
1612	my ($self, $text) = @_;	1833	my ($self, $text) = @_;
1613		1834
1614	$self->{cursor} = length $text;	1835	$self->{cursor} = length $text;
1615	$self->_set_text ($text);	1836	$self->_set_text ($text);
1616
1617	$self->realloc;
1618	}	1837	}
1619		1838
1620	sub get_text {	1839	sub get_text {
1621	$_[0]{text}	1840	$_[0]{text}
1622	}	1841	}
…		…
1627	my ($w, $h) = $self->SUPER::size_request;	1846	my ($w, $h) = $self->SUPER::size_request;
1628		1847
1629	($w + 1, $h) # add 1 for cursor	1848	($w + 1, $h) # add 1 for cursor
1630	}	1849	}
1631		1850
1632	sub key_down {	1851	sub invoke_key_down {
1633	my ($self, $ev) = @_;	1852	my ($self, $ev) = @_;
1634		1853
1635	my $mod = $ev->{mod};	1854	my $mod = $ev->{mod};
1636	my $sym = $ev->{sym};	1855	my $sym = $ev->{sym};
1637	my $uni = $ev->{unicode};	1856	my $uni = $ev->{unicode};
…		…
1640		1859
1641	if ($uni == 8) {	1860	if ($uni == 8) {
1642	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1643	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1644	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1645	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1646	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1647	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1648	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1649	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1650	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1651	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1652	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1653	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1654	$self->_emit ('escape');	1873	$self->emit ('escape');
1655	} elsif ($uni) {	1874	} elsif ($uni) {
1656	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
		1876	} else {
		1877	return 0;
1657	}	1878	}
1658		1879
1659	$self->_set_text ($text);	1880	$self->_set_text ($text);
1660		1881
1661	$self->realloc;	1882	$self->realloc;
1662	}
1663		1883
		1884	1
		1885	}
		1886
1664	sub focus_in {	1887	sub invoke_focus_in {
1665	my ($self) = @_;	1888	my ($self) = @_;
1666		1889
1667	$self->{last_activity} = $::NOW;	1890	$self->{last_activity} = $::NOW;
1668		1891
1669	$self->SUPER::focus_in;	1892	$self->SUPER::invoke_focus_in
1670	}	1893	}
1671		1894
1672	sub button_down {	1895	sub invoke_button_down {
1673	my ($self, $ev, $x, $y) = @_;	1896	my ($self, $ev, $x, $y) = @_;
1674		1897
1675	$self->SUPER::button_down ($ev, $x, $y);	1898	$self->SUPER::invoke_button_down ($ev, $x, $y);
1676		1899
1677	my $idx = $self->{layout}->xy_to_index ($x, $y);	1900	my $idx = $self->{layout}->xy_to_index ($x, $y);
1678		1901
1679	# byte-index to char-index	1902	# byte-index to char-index
1680	my $text = $self->{text};	1903	my $text = $self->{text};
1681	utf8::encode $text;	1904	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1682	$self->{cursor} = length substr $text, 0, $idx;	1905	$self->{cursor} = length $text;
1683		1906
1684	$self->_set_text ($self->{text});	1907	$self->_set_text ($self->{text});
1685	$self->update;	1908	$self->update;
		1909
		1910	1
1686	}	1911	}
1687		1912
1688	sub mouse_motion {	1913	sub invoke_mouse_motion {
1689	my ($self, $ev, $x, $y) = @_;	1914	my ($self, $ev, $x, $y) = @_;
1690	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1915	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1916
		1917	1
1691	}	1918	}
1692		1919
1693	sub _draw {	1920	sub _draw {
1694	my ($self) = @_;	1921	my ($self) = @_;
1695		1922
1696	local $self->{fg} = $self->{fg};	1923	local $self->{fg} = $self->{fg};
1697		1924
1698	if ($FOCUS == $self) {	1925	if ($FOCUS == $self) {
1699	glColor @{$self->{active_bg}};	1926	glColor_premultiply @{$self->{active_bg}};
1700	$self->{fg} = $self->{active_fg};	1927	$self->{fg} = $self->{active_fg};
1701	} else {	1928	} else {
1702	glColor @{$self->{bg}};	1929	glColor_premultiply @{$self->{bg}};
1703	}	1930	}
1704		1931
1705	glEnable GL_BLEND;	1932	glEnable GL_BLEND;
1706	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1933	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707	glBegin GL_QUADS;	1934	glBegin GL_QUADS;
1708	glVertex 0 , 0;	1935	glVertex 0 , 0;
1709	glVertex 0 , $self->{h};	1936	glVertex 0 , $self->{h};
1710	glVertex $self->{w}, $self->{h};	1937	glVertex $self->{w}, $self->{h};
1711	glVertex $self->{w}, 0;	1938	glVertex $self->{w}, 0;
…		…
1730	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1731	glEnd;	1958	glEnd;
1732	}	1959	}
1733	}	1960	}
1734		1961
1735	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1736		1963
1737	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1738		1965
1739	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1740		1967
1741	sub key_down {	1968	sub invoke_key_down {
1742	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1743		1970
1744	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
1745		1972
1746	if ($sym == 13) {	1973	if ($sym == 13) {
1747	unshift @{$self->{history}},	1974	unshift @{$self->{history}},
1748	my $txt = $self->get_text;	1975	my $txt = $self->get_text;
		1976
1749	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1750	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1751	$self->_emit (activate => $txt);	1979	$self->emit (activate => $txt);
1752	$self->update;	1980	$self->update;
1753		1981
1754	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1755	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1756	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1757	}	1985	}
1758	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1759	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1761	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1762	}	1990	}
1763	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1764	}	1992	}
1765		1993
1766	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1767	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1768	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1769		1997
1770	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1771	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1772	} else {	2000	} else {
1773	$self->set_text ($self->{history_saveback});	2001	$self->set_text ($self->{history_saveback});
1774	}	2002	}
1775		2003
1776	} else {	2004	} else {
1777	$self->SUPER::key_down ($ev);	2005	return $self->SUPER::invoke_key_down ($ev)
		2006	}
		2007
1778	}	2008	1
1779
1780	}	2009	}
1781		2010
1782	#############################################################################	2011	#############################################################################
1783		2012
1784	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1785		2014
1786	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1787		2016
1788	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1789		2018
1790	my @tex =	2019	my @tex =
1791	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1792	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1793		2022
1794	sub new {	2023	sub new {
1795	my $class = shift;	2024	my $class = shift;
1796		2025
1797	$class->SUPER::new (	2026	$class->SUPER::new (
1798	padding => 4,	2027	padding_x => 4,
		2028	padding_y => 4,
1799	fg => [1, 1, 1],	2029	fg => [1, 1, 1],
1800	active_fg => [0, 0, 1],	2030	active_fg => [0, 0, 1],
1801	can_hover => 1,	2031	can_hover => 1,
1802	align => 0,	2032	align => 0,
1803	valign => 0,	2033	valign => 0,
1804	can_events => 1,	2034	can_events => 1,
1805	@_	2035	@_
1806	)	2036	)
1807	}	2037	}
1808		2038
1809	sub activate { }
1810
1811	sub button_up {	2039	sub invoke_button_up {
1812	my ($self, $ev, $x, $y) = @_;	2040	my ($self, $ev, $x, $y) = @_;
1813		2041
1814	$self->emit ("activate")	2042	$self->emit ("activate")
1815	if $x >= 0 && $x < $self->{w}	2043	if $x >= 0 && $x < $self->{w}
1816	&& $y >= 0 && $y < $self->{h};	2044	&& $y >= 0 && $y < $self->{h};
		2045
		2046	1
1817	}	2047	}
1818		2048
1819	sub _draw {	2049	sub _draw {
1820	my ($self) = @_;	2050	my ($self) = @_;
1821		2051
1822	local $self->{fg} = $self->{fg};	2052	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824	if ($GRAB == $self) {
1825	$self->{fg} = $self->{active_fg};
1826	}
1827		2053
1828	glEnable GL_TEXTURE_2D;	2054	glEnable GL_TEXTURE_2D;
1829	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830	glColor 0, 0, 0, 1;	2056	glColor 0, 0, 0, 1;
1831		2057
…		…
1836	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
1837	}	2063	}
1838		2064
1839	#############################################################################	2065	#############################################################################
1840		2066
1841	package CFClient::UI::CheckBox;	2067	package CFPlus::UI::CheckBox;
1842		2068
1843	our @ISA = CFClient::UI::DrawBG::;	2069	our @ISA = CFPlus::UI::DrawBG::;
1844		2070
1845	my @tex =	2071	my @tex =
1846	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2072	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1847	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2073	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1848		2074
1849	use CFClient::OpenGL;	2075	use CFPlus::OpenGL;
1850		2076
1851	sub new {	2077	sub new {
1852	my $class = shift;	2078	my $class = shift;
1853		2079
1854	$class->SUPER::new (	2080	$class->SUPER::new (
1855	padding => 2,	2081	padding_x => 2,
		2082	padding_y => 2,
1856	fg => [1, 1, 1],	2083	fg => [1, 1, 1],
1857	active_fg => [1, 1, 0],	2084	active_fg => [1, 1, 0],
1858	bg => [0, 0, 0, 0.2],	2085	bg => [0, 0, 0, 0.2],
1859	active_bg => [1, 1, 1, 0.5],	2086	active_bg => [1, 1, 1, 0.5],
1860	state => 0,	2087	state => 0,
…		…
1864	}	2091	}
1865		2092
1866	sub size_request {	2093	sub size_request {
1867	my ($self) = @_;	2094	my ($self) = @_;
1868		2095
1869	($self->{padding} * 2 + 6) x 2	2096	(6) x 2
1870	}	2097	}
1871		2098
		2099	sub toggle {
		2100	my ($self) = @_;
		2101
		2102	$self->{state} = !$self->{state};
		2103	$self->emit (changed => $self->{state});
		2104	$self->update;
		2105	}
		2106
1872	sub button_down {	2107	sub invoke_button_down {
1873	my ($self, $ev, $x, $y) = @_;	2108	my ($self, $ev, $x, $y) = @_;
1874		2109
1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2110	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2111	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877	$self->{state} = !$self->{state};	2112	$self->toggle;
1878	$self->_emit (changed => $self->{state});	2113	} else {
		2114	return 0
		2115	}
		2116
1879	}	2117	1
1880	}	2118	}
1881		2119
1882	sub _draw {	2120	sub _draw {
1883	my ($self) = @_;	2121	my ($self) = @_;
1884		2122
1885	$self->SUPER::_draw;	2123	$self->SUPER::_draw;
1886		2124
1887	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2125	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888		2126
1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2127	my ($w, $h) = @$self{qw(w h)};
		2128
		2129	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890		2130
1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2131	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892		2132
1893	my $tex = $self->{state} ? $tex[1] : $tex[0];	2133	my $tex = $self->{state} ? $tex[1] : $tex[0];
1894		2134
…		…
1897	glDisable GL_TEXTURE_2D;	2137	glDisable GL_TEXTURE_2D;
1898	}	2138	}
1899		2139
1900	#############################################################################	2140	#############################################################################
1901		2141
1902	package CFClient::UI::Image;	2142	package CFPlus::UI::Image;
1903		2143
1904	our @ISA = CFClient::UI::Base::;	2144	our @ISA = CFPlus::UI::Base::;
1905		2145
1906	use CFClient::OpenGL;	2146	use CFPlus::OpenGL;
1907	use Carp qw/confess/;
1908		2147
1909	our %loaded_images;	2148	our %texture_cache;
1910		2149
1911	sub new {	2150	sub new {
1912	my $class = shift;	2151	my $class = shift;
1913		2152
1914	my $self = $class->SUPER::new (can_events => 0, @_);	2153	my $self = $class->SUPER::new (
		2154	can_events => 0,
		2155	@_,
		2156	);
1915		2157
1916	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2158	$self->{path} || $self->{tex}
		2159	or Carp::croak "'path' or 'tex' attributes required";
1917		2160
1918	$loaded_images{$self->{image}} ||=	2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1919	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1920		2163
1921	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2164	Scalar::Util::weaken $texture_cache{$self->{path}};
1922		2165
1923	Scalar::Util::weaken $loaded_images{$self->{image}};	2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1924
1925	$self->{aspect} = $tex->{w} / $tex->{h};
1926		2167
1927	$self	2168	$self
1928	}	2169	}
1929		2170
		2171	sub STORABLE_freeze {
		2172	my ($self, $cloning) = @_;
		2173
		2174	$self->{path}
		2175	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2176
		2177	$self->{path}
		2178	}
		2179
		2180	sub STORABLE_attach {
		2181	my ($self, $cloning, $path) = @_;
		2182
		2183	$self->new (path => $path)
		2184	}
		2185
1930	sub size_request {	2186	sub size_request {
1931	my ($self) = @_;	2187	my ($self) = @_;
1932		2188
1933	($self->{tex}->{w}, $self->{tex}->{h})	2189	($self->{tex}{w}, $self->{tex}{h})
1934	}	2190	}
1935		2191
1936	sub _draw {	2192	sub _draw {
1937	my ($self) = @_;	2193	my ($self) = @_;
1938		2194
…		…
1948	}	2204	}
1949		2205
1950	glEnable GL_TEXTURE_2D;	2206	glEnable GL_TEXTURE_2D;
1951	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952		2208
1953	$tex->draw_quad_alpha (0, 0, $w, $h);	2209	$tex->draw_quad (0, 0, $w, $h);
1954		2210
1955	glDisable GL_TEXTURE_2D;	2211	glDisable GL_TEXTURE_2D;
1956	}	2212	}
1957		2213
1958	#############################################################################	2214	#############################################################################
1959		2215
		2216	package CFPlus::UI::ImageButton;
		2217
		2218	our @ISA = CFPlus::UI::Image::;
		2219
		2220	use CFPlus::OpenGL;
		2221
		2222	my %textures;
		2223
		2224	sub new {
		2225	my $class = shift;
		2226
		2227	my $self = $class->SUPER::new (
		2228	padding_x => 4,
		2229	padding_y => 4,
		2230	fg => [1, 1, 1],
		2231	active_fg => [0, 0, 1],
		2232	can_hover => 1,
		2233	align => 0,
		2234	valign => 0,
		2235	can_events => 1,
		2236	@_
		2237	);
		2238	}
		2239
		2240	sub invoke_button_up {
		2241	my ($self, $ev, $x, $y) = @_;
		2242
		2243	$self->emit ("activate")
		2244	if $x >= 0 && $x < $self->{w}
		2245	&& $y >= 0 && $y < $self->{h};
		2246
		2247	1
		2248	}
		2249
		2250	#############################################################################
		2251
1960	package CFClient::UI::VGauge;	2252	package CFPlus::UI::VGauge;
1961		2253
1962	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
1963		2255
1964	use List::Util qw(min max);	2256	use List::Util qw(min max);
1965		2257
1966	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
1967		2259
1968	my %tex = (	2260	my %tex = (
1969	food => [	2261	food => [
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1972	],	2264	],
1973	grace => [	2265	grace => [
1974	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1975	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1976	],	2268	],
1977	hp => [	2269	hp => [
1978	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1979	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1980	],	2272	],
1981	mana => [	2273	mana => [
1982	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1984	],	2276	],
1985	);	2277	);
1986		2278
1987	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2047	my $ycut1 = max 0, min 1, $ycut;	2339	my $ycut1 = max 0, min 1, $ycut;
2048	my $ycut2 = max 0, min 1, $ycut - 1;	2340	my $ycut2 = max 0, min 1, $ycut - 1;
2049		2341
2050	my $h1 = $self->{h} * (1 - $ycut1);	2342	my $h1 = $self->{h} * (1 - $ycut1);
2051	my $h2 = $self->{h} * (1 - $ycut2);	2343	my $h2 = $self->{h} * (1 - $ycut2);
		2344	my $h3 = $self->{h};
		2345
		2346	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2052		2347
2053	glEnable GL_BLEND;	2348	glEnable GL_BLEND;
2054	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2349	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2350	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055	glEnable GL_TEXTURE_2D;	2351	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2352	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057		2353
2058	glBindTexture GL_TEXTURE_2D, $t1->{name};	2354	glBindTexture GL_TEXTURE_2D, $t1->{name};
2059	glBegin GL_QUADS;	2355	glBegin GL_QUADS;
…		…
2074		2370
2075	if ($t3) {	2371	if ($t3) {
2076	glBindTexture GL_TEXTURE_2D, $t3->{name};	2372	glBindTexture GL_TEXTURE_2D, $t3->{name};
2077	glBegin GL_QUADS;	2373	glBegin GL_QUADS;
2078	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2374	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2079	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2375	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2080	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2376	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2081	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2377	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2082	glEnd;	2378	glEnd;
2083	}	2379	}
2084		2380
2085	glDisable GL_BLEND;	2381	glDisable GL_BLEND;
2086	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2087	}	2383	}
2088		2384
2089	#############################################################################	2385	#############################################################################
2090		2386
2091	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2092		2388
2093	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2094		2390
2095	sub new {	2391	sub new {
2096	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2097		2393
2098	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2100	can_hover => 1,	2396	can_hover => 1,
2101	can_events => 1,	2397	can_events => 1,
2102	%arg,	2398	%arg,
2103	);	2399	);
2104		2400
2105	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2401	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2106	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2402	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2107	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2403	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2108		2404
2109	$self	2405	$self
2110	}	2406	}
2111		2407
2112	sub set_fontsize {	2408	sub set_fontsize {
…		…
2133	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2134	}	2430	}
2135		2431
2136	#############################################################################	2432	#############################################################################
2137		2433
2138	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2139		2435
2140	use strict;	2436	use strict;
2141		2437
2142	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2143		2439
2144	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2145		2441
2146	my @tex =	2442	my @tex =
2147	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2148	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2149		2445
2150	sub new {	2446	sub new {
2151	my $class = shift;	2447	my $class = shift;
2152		2448
…		…
2159	fg => [1, 1, 1],	2455	fg => [1, 1, 1],
2160	active_fg => [0, 0, 0],	2456	active_fg => [0, 0, 0],
2161	bg => [0, 0, 0, 0.2],	2457	bg => [0, 0, 0, 0.2],
2162	active_bg => [1, 1, 1, 0.5],	2458	active_bg => [1, 1, 1, 0.5],
2163	range => [0, 0, 100, 10, 0],	2459	range => [0, 0, 100, 10, 0],
2164	req_w => $::WIDTH / 80,	2460	min_w => $::WIDTH / 80,
2165	req_h => $::WIDTH / 80,	2461	min_h => $::WIDTH / 80,
2166	vertical => 0,	2462	vertical => 0,
2167	can_hover => 1,	2463	can_hover => 1,
2168	inner_pad => 0.02,	2464	inner_pad => 0.02,
2169	@_	2465	@_
2170	);	2466	);
…		…
2173	$self->update;	2469	$self->update;
2174		2470
2175	$self	2471	$self
2176	}	2472	}
2177		2473
2178	sub changed { }
2179
2180	sub set_range {	2474	sub set_range {
2181	my ($self, $range) = @_;	2475	my ($self, $range) = @_;
2182		2476
2183	($range, $self->{range}) = ($self->{range}, $range);	2477	($range, $self->{range}) = ($self->{range}, $range);
2184		2478
2185	$self->update
2186	if "@$range" ne "@{$self->{range}}";	2479	if ("@$range" ne "@{$self->{range}}") {
		2480	$self->update;
		2481	$self->set_value ($self->{range}[0]);
		2482	}
2187	}	2483	}
2188		2484
2189	sub set_value {	2485	sub set_value {
2190	my ($self, $value) = @_;	2486	my ($self, $value) = @_;
2191		2487
…		…
2202	if $unit;	2498	if $unit;
2203		2499
2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2500	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205		2501
2206	if ($value != $old_value) {	2502	if ($value != $old_value) {
2207	$self->_emit (changed => $value);	2503	$self->emit (changed => $value);
2208	$self->update;	2504	$self->update;
2209	}	2505	}
2210	}	2506	}
2211		2507
2212	sub size_request {	2508	sub size_request {
2213	my ($self) = @_;	2509	my ($self) = @_;
2214		2510
2215	my $w = $self->{req_w};	2511	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2512	}
2220		2513
2221	sub button_down {	2514	sub invoke_button_down {
2222	my ($self, $ev, $x, $y) = @_;	2515	my ($self, $ev, $x, $y) = @_;
2223		2516
2224	$self->SUPER::button_down ($ev, $x, $y);	2517	$self->SUPER::invoke_button_down ($ev, $x, $y);
2225		2518
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2519	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2520
2228	$self->mouse_motion ($ev, $x, $y);	2521	$self->invoke_mouse_motion ($ev, $x, $y)
2229	}	2522	}
2230		2523
2231	sub mouse_motion {	2524	sub invoke_mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2525	my ($self, $ev, $x, $y) = @_;
2233		2526
2234	if ($GRAB == $self) {	2527	if ($GRAB == $self) {
2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2528	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236		2529
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2530	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2531
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2532	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2533
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2534	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2535	} else {
		2536	return 0;
		2537	}
		2538
2242	}	2539	1
		2540	}
		2541
		2542	sub invoke_mouse_wheel {
		2543	my ($self, $ev) = @_;
		2544
		2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2546
		2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2548
		2549	! ! $delta
2243	}	2550	}
2244		2551
2245	sub update {	2552	sub update {
2246	my ($self) = @_;	2553	my ($self) = @_;
2247		2554
2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2555	delete $self->{knob_w};
		2556	$self->SUPER::update;
		2557	}
		2558
		2559	sub _draw {
		2560	my ($self) = @_;
		2561
		2562	unless ($self->{knob_w}) {
2249	$self->set_value ($self->{range}[0]);	2563	$self->set_value ($self->{range}[0]);
2250		2564
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2565	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2566	my $range = ($hi - $page - $lo) || 1e-100;
2253		2567
…		…
2259	$value = ($value - $lo) / $range;	2573	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2574	$value = $value * $self->{scale} + $self->{offset};
2261		2575
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2576	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2577	$self->{knob_w} = $knob_w;
2264	});	2578	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2579
2272	$self->SUPER::_draw ();	2580	$self->SUPER::_draw ();
2273		2581
2274	glScale $self->{w}, $self->{h};	2582	glScale $self->{w}, $self->{h};
2275		2583
…		…
2295	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2296	}	2604	}
2297		2605
2298	#############################################################################	2606	#############################################################################
2299		2607
2300	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2301		2609
2302	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2303		2611
2304	sub new {	2612	sub new {
2305	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2306		2614
2307	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2308		2616
2309	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2312	to_value => sub { shift },	2620	to_value => sub { shift },
2313	from_value => sub { shift },	2621	from_value => sub { shift },
2314	%arg,	2622	%arg,
2315	);	2623	);
2316		2624
…		…
2336	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2337	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2338		2646
2339	#############################################################################	2647	#############################################################################
2340		2648
2341	package CFClient::UI::TextView;	2649	package CFPlus::UI::TextScroller;
2342		2650
2343	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2344		2652
2345	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2346		2654
2347	sub new {	2655	sub new {
2348	my $class = shift;	2656	my $class = shift;
2349		2657
2350	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2351	fontsize => 1,	2659	fontsize => 1,
2352	can_events => 0,	2660	can_events => 1,
		2661	indent => 0,
2353	#font => default_font	2662	#font => default_font
2354	@_,	2663	@_,
2355		2664
2356	layout => (new CFClient::Layout 1),	2665	layout => (new CFPlus::Layout),
2357	par => [],	2666	par => [],
2358	height => 0,	2667	height => 0,
2359	children => [	2668	children => [
2360	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2361	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2362	],	2671	],
2363	);	2672	);
2364		2673
2365	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2366		2675
…		…
2372		2681
2373	$self->{fontsize} = $fontsize;	2682	$self->{fontsize} = $fontsize;
2374	$self->reflow;	2683	$self->reflow;
2375	}	2684	}
2376		2685
		2686	sub size_request {
		2687	my ($self) = @_;
		2688
		2689	my ($empty, $slider) = @{ $self->{children} };
		2690
		2691	local $self->{children} = [$empty, $slider];
		2692	$self->SUPER::size_request
		2693	}
		2694
2377	sub size_allocate {	2695	sub invoke_size_allocate {
2378	my ($self, $w, $h, $changed) = @_;	2696	my ($self, $w, $h) = @_;
2379		2697
2380	$self->SUPER::size_allocate ($w, $h, $changed);	2698	my ($empty, $slider, @other) = @{ $self->{children} };
2381		2699	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2382	return unless $changed;
2383		2700
2384	$self->{layout}->set_font ($self->{font}) if $self->{font};	2701	$self->{layout}->set_font ($self->{font}) if $self->{font};
2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2702	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386	$self->{layout}->set_width ($self->{children}[0]{w});	2703	$self->{layout}->set_width ($empty->{w});
		2704	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387		2705
2388	$self->reflow;	2706	$self->reflow;
2389	}
2390		2707
2391	sub text_size {	2708	local $self->{children} = [$empty, $slider];
		2709	$self->SUPER::invoke_size_allocate ($w, $h)
		2710	}
		2711
		2712	sub invoke_mouse_wheel {
2392	my ($self, $text, $indent) = @_;	2713	my ($self, $ev) = @_;
		2714
		2715	return 0 unless $ev->{dy}; # only vertical movements
		2716
		2717	$self->{children}[1]->emit (mouse_wheel => $ev);
		2718
		2719	1
		2720	}
		2721
		2722	sub get_layout {
		2723	my ($self, $para) = @_;
2393		2724
2394	my $layout = $self->{layout};	2725	my $layout = $self->{layout};
2395		2726
		2727	$layout->set_font ($self->{font}) if $self->{font};
		2728	$layout->set_foreground (@{$para->{fg}});
2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2729	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397	$layout->set_width ($self->{children}[0]{w} - $indent);	2730	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2731	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398	$layout->set_markup ($text);	2732	$layout->set_markup ($para->{markup});
		2733
		2734	$layout->set_shapes (
		2735	map
		2736	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2737	@{$para->{widget}}
2399		2738	);
		2739
2400	$layout->size	2740	$layout
2401	}	2741	}
2402		2742
2403	sub reflow {	2743	sub reflow {
2404	my ($self) = @_;	2744	my ($self) = @_;
2405		2745
…		…
2414	$self->{children}[1]->set_value ($offset);	2754	$self->{children}[1]->set_value ($offset);
2415	}	2755	}
2416		2756
2417	sub clear {	2757	sub clear {
2418	my ($self) = @_;	2758	my ($self) = @_;
		2759
		2760	my (undef, undef, @other) = @{ $self->{children} };
		2761	$self->remove ($_) for @other;
2419		2762
2420	$self->{par} = [];	2763	$self->{par} = [];
2421	$self->{height} = 0;	2764	$self->{height} = 0;
2422	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2423	}	2766	}
2424		2767
2425	sub add_paragraph {	2768	sub add_paragraph {
2426	my ($self, $color, $text, $indent) = @_;	2769	my $self = shift;
2427		2770
2428	for my $line (split /\n/, $text) {	2771	for my $para (@_) {
2429	my ($w, $h) = $self->text_size ($line);	2772	$para = {
2430	$self->{height} += $h;	2773	fg => [1, 1, 1, 1],
2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2774	indent => 0,
2432	}	2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
		2778	w => 1e10,
		2779	wrapped => 1,
		2780	};
2433		2781
2434	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2783	push @{$self->{par}}, $para;
		2784	}
		2785
		2786	$self->{need_reflow}++;
		2787	$self->update;
		2788	}
		2789
		2790	sub scroll_to_bottom {
		2791	my ($self) = @_;
		2792
		2793	$self->{scroll_to_bottom} = 1;
		2794	$self->update;
2435	}	2795	}
2436		2796
2437	sub update {	2797	sub update {
2438	my ($self) = @_;	2798	my ($self) = @_;
2439		2799
…		…
2441		2801
2442	return unless $self->{h} > 0;	2802	return unless $self->{h} > 0;
2443		2803
2444	delete $self->{texture};	2804	delete $self->{texture};
2445		2805
2446	$ROOT->on_post_alloc ($self, sub {	2806	$ROOT->on_post_alloc ($self => sub {
2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2807	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448		2808
2449	if (delete $self->{need_reflow}) {	2809	if (delete $self->{need_reflow}) {
2450	my $height = 0;	2810	my $height = 0;
2451		2811
2452	my $layout = $self->{layout};
2453
2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2456	for (@{$self->{par}}) {	2812	for my $para (@{$self->{par}}) {
2457	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2813	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2458	$layout->set_width ($W - $_->[3]);	2814	my $layout = $self->get_layout ($para);
2459	$layout->set_markup ($_->[4]);
2460	my ($w, $h) = $layout->size;	2815	my ($w, $h) = $layout->size;
2461	$_->[0] = $w + $_->[3];	2816
2462	$_->[1] = $h;	2817	$para->{w} = $w + $para->{indent};
		2818	$para->{h} = $h;
		2819	$para->{wrapped} = $layout->has_wrapped;
2463	}	2820	}
2464		2821
2465	$height += $_->[1];	2822	$height += $para->{h};
2466	}	2823	}
2467		2824
2468	$self->{height} = $height;	2825	$self->{height} = $height;
2469		2826
2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2827	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2471		2828
2472	delete $self->{texture};	2829	delete $self->{texture};
2473	}	2830	}
2474		2831
		2832	if (delete $self->{scroll_to_bottom}) {
		2833	$self->{children}[1]->set_value (1e10);
		2834	}
		2835
2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2476	glClearColor 0.5, 0.5, 0.5, 0;	2837	glClearColor 0, 0, 0, 0;
2477	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2478		2839
2479	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2480		2841
2481	my $y0 = $top;	2842	my $y0 = $top;
2482	my $y1 = $top + $H;	2843	my $y1 = $top + $H;
2483		2844
2484	my $y = 0;	2845	my $y = 0;
2485		2846
2486	my $layout = $self->{layout};
2487
2488	$layout->set_font ($self->{font}) if $self->{font};
2489
2490	glEnable GL_BLEND;
2491	#TODO# not correct in windows where rgba is forced off
2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2493
2494	for my $par (@{$self->{par}}) {	2847	for my $para (@{$self->{par}}) {
2495	my $h = $par->[1];	2848	my $h = $para->{h};
2496		2849
2497	if ($y0 < $y + $h && $y < $y1) {	2850	if ($y0 < $y + $h && $y < $y1) {
2498	$layout->set_foreground (@{ $par->[2] });
2499	$layout->set_width ($W - $par->[3]);
2500	$layout->set_markup ($par->[4]);
2501		2851
2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2852	my $layout = $self->get_layout ($para);
2503		2853
2504	glRasterPos $par->[3], $y - $y0;	2854	$layout->render ($para->{indent}, $y - $y0);
2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2855
		2856	if (my @w = @{ $para->{widget} }) {
		2857	my @s = $layout->get_shapes;
		2858
		2859	for (@w) {
		2860	my ($dx, $dy) = splice @s, 0, 2, ();
		2861
		2862	$_->{x} = $dx + $para->{indent};
		2863	$_->{y} = $dy + $y - $y0;
		2864
		2865	$_->draw;
		2866	}
		2867	}
2506	}	2868	}
2507		2869
2508	$y += $h;	2870	$y += $h;
2509	}	2871	}
2510
2511	glDisable GL_BLEND;
2512	};	2872	};
2513	});	2873	});
2514	}	2874	}
2515		2875
		2876	sub reconfigure {
		2877	my ($self) = @_;
		2878
		2879	$self->SUPER::reconfigure;
		2880
		2881	$_->{w} = 1e10 for @{ $self->{par} };
		2882	$self->reflow;
		2883	}
		2884
2516	sub _draw {	2885	sub _draw {
2517	my ($self) = @_;	2886	my ($self) = @_;
2518		2887
2519	glEnable GL_TEXTURE_2D;	2888	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2889	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2890	glColor 0, 0, 0, 1;
2522	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2891	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523	glDisable GL_TEXTURE_2D;	2892	glDisable GL_TEXTURE_2D;
2524		2893
2525	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2526
2527	}	2895	}
2528		2896
2529	#############################################################################	2897	#############################################################################
2530		2898
2531	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2532		2900
2533	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2534		2902
2535	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2536		2904
2537	sub moveto {	2905	sub moveto {
2538	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2539		2907
2540	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2568	glPopMatrix;	2936	glPopMatrix;
2569	}	2937	}
2570		2938
2571	#############################################################################	2939	#############################################################################
2572		2940
2573	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2574		2942
2575	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2576		2944
2577	sub new {	2945	sub new {
2578	my $class = shift;	2946	my $class = shift;
2579		2947
2580	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2592	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2593	}	2961	}
2594		2962
2595	#############################################################################	2963	#############################################################################
2596		2964
2597	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2598		2966
2599	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2600		2968
2601	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2602		2970
2603	sub new {	2971	sub new {
2604	my $class = shift;	2972	my $class = shift;
2605		2973
2606	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2610	}	2978	}
2611		2979
2612	sub set_tooltip_from {	2980	sub set_tooltip_from {
2613	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
2614		2982
		2983	$widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
		2985
		2986	my $tooltip = $widget->{tooltip};
		2987
		2988	if ($ENV{CFPLUS_DEBUG} & 2) {
		2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2990	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2991	. "req $widget->{req_w} $widget->{req_h}\n"
		2992	. "visible $widget->{visible}";
		2993	}
		2994
		2995	$tooltip =~ s/^\n+//;
		2996	$tooltip =~ s/\n+$//;
		2997
2615	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2616	markup => $widget->{tooltip},	2999	markup => $tooltip,
2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618	fontsize => 0.8,	3001	fontsize => 0.8,
2619	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2620	ellipsise => 0,	3003	ellipsise => 0,
2621	font => ($widget->{tooltip_font} || $::FONT_PROP),	3004	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2628	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3011	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2629		3012
2630	($w + 4, $h + 4)	3013	($w + 4, $h + 4)
2631	}	3014	}
2632		3015
2633	sub size_allocate {	3016	sub invoke_size_allocate {
2634	my ($self, $w, $h, $changed) = @_;	3017	my ($self, $w, $h) = @_;
2635		3018
2636	return unless $changed;
2637
2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3019	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2639	}	3020	}
2640		3021
2641	sub visibility_change {	3022	sub invoke_visibility_change {
2642	my ($self, $visible) = @_;	3023	my ($self, $visible) = @_;
2643		3024
2644	return unless $visible;	3025	return unless $visible;
2645		3026
2646	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2647	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2648	or return;	3029	or return;
2649		3030
		3031	if ($widget->{visible}) {
2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651		3033
2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653	if $x + $self->{w} > $::WIDTH;	3035	if $x + $self->{w} > $self->{root}{w};
2654		3036
2655	$self->move ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2656	});	3041	});
2657	}	3042	}
2658		3043
2659	sub _draw {	3044	sub _draw {
2660	my ($self) = @_;	3045	my ($self) = @_;
…		…
2684	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2685	}	3070	}
2686		3071
2687	#############################################################################	3072	#############################################################################
2688		3073
2689	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2690		3075
2691	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2692		3077
2693	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2694		3079
2695	sub new {	3080	sub new {
2696	my $class = shift;	3081	my $class = shift;
2697		3082
2698	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
2733	sub _draw {	3118	sub _draw {
2734	my ($self) = @_;	3119	my ($self) = @_;
2735		3120
2736	return unless $::CONN;	3121	return unless $::CONN;
2737		3122
		3123	$self->SUPER::_draw;
		3124
2738	my $face;	3125	my $face;
2739		3126
2740	if ($self->{frame}) {	3127	if ($self->{frame}) {
2741	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
2742		3129
…		…
2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3134	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748		3135
2749	if ($tex) {	3136	if ($tex) {
2750	glEnable GL_TEXTURE_2D;	3137	glEnable GL_TEXTURE_2D;
2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3138	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752	glColor 1, 1, 1, 1;	3139	glColor 0, 0, 0, 1;
2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3140	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754	glDisable GL_TEXTURE_2D;	3141	glDisable GL_TEXTURE_2D;
2755	}	3142	}
2756	}	3143	}
2757		3144
2758	sub DESTROY {	3145	sub destroy {
2759	my ($self) = @_;	3146	my ($self) = @_;
2760		3147
2761	$self->{timer}->cancel	3148	$self->{timer}->cancel
2762	if $self->{timer};	3149	if $self->{timer};
2763		3150
2764	$self->SUPER::DESTROY;	3151	$self->SUPER::destroy;
2765	}	3152	}
2766		3153
2767	#############################################################################	3154	#############################################################################
2768		3155
2769	package CFClient::UI::Inventory;	3156	package CFPlus::UI::Buttonbar;
2770		3157
2771	our @ISA = CFClient::UI::ScrolledWindow::;	3158	our @ISA = CFPlus::UI::HBox::;
2772		3159
2773	sub new {	3160	# TODO: should actualyl wrap buttons and other goodies.
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808		3161
2809	#############################################################################	3162	#############################################################################
2810		3163
2811	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
2812		3165
2813	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
2814		3167
2815	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
2816		3169
2817	sub new {	3170	sub new {
2818	my $class = shift;	3171	my $class = shift;
2819		3172
2820	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2821	items => [],	3174	items => [],
2822	z => 100,	3175	z => 100,
2823	@_,	3176	@_,
2824	);	3177	);
2825		3178
2826	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2827		3180
2828	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
2829	my ($widget, $cb) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
2830		3183
2831	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
2832	if (!ref $widget) {	3185	if (!ref $widget) {
		3186	if ($widget =~ /\t/) {
		3187	my ($left, $right) = split /\t/, $widget, 2;
		3188
2833	$widget = new CFClient::UI::Label	3189	$widget = new CFPlus::UI::HBox
2834	can_hover => 1,	3190	can_hover => 1,
2835	can_events => 1,	3191	can_events => 1,
		3192	tooltip => $tooltip,
		3193	children => [
		3194	(new CFPlus::UI::Label markup => $left, expand => 1),
		3195	(new CFPlus::UI::Label markup => $right, align => +1),
		3196	],
		3197	;
		3198
		3199	} else {
		3200	$widget = new CFPlus::UI::Label
		3201	can_hover => 1,
		3202	can_events => 1,
2836	text => $widget;	3203	markup => $widget,
		3204	tooltip => $tooltip;
		3205	}
2837	}	3206	}
2838		3207
2839	$self->{item}{$widget} = $item;	3208	$self->{item}{$widget} = $item;
2840		3209
2841	$self->{vbox}->add ($widget);	3210	$self->{vbox}->add ($widget);
…		…
2846		3215
2847	# popup given the event (must be a mouse button down event currently)	3216	# popup given the event (must be a mouse button down event currently)
2848	sub popup {	3217	sub popup {
2849	my ($self, $ev) = @_;	3218	my ($self, $ev) = @_;
2850		3219
2851	$self->_emit ("popdown");	3220	$self->emit ("popdown");
2852		3221
2853	# maybe save $GRAB? must be careful about events...	3222	# maybe save $GRAB? must be careful about events...
2854	$GRAB = $self;	3223	$GRAB = $self;
2855	$self->{button} = $ev->{button};	3224	$self->{button} = $ev->{button};
2856		3225
2857	$self->show;	3226	$self->show;
2858	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3227	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859	}	3228	}
2860		3229
2861	sub mouse_motion {	3230	sub invoke_mouse_motion {
2862	my ($self, $ev, $x, $y) = @_;	3231	my ($self, $ev, $x, $y) = @_;
2863		3232
2864	# TODO: should use vbox->find_widget or so	3233	# TODO: should use vbox->find_widget or so
2865	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3234	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866	$self->{hover} = $self->{item}{$HOVER};	3235	$self->{hover} = $self->{item}{$HOVER};
2867	}
2868		3236
		3237	0
		3238	}
		3239
2869	sub button_up {	3240	sub invoke_button_up {
2870	my ($self, $ev, $x, $y) = @_;	3241	my ($self, $ev, $x, $y) = @_;
2871		3242
2872	if ($ev->{button} == $self->{button}) {	3243	if ($ev->{button} == $self->{button}) {
2873	undef $GRAB;	3244	undef $GRAB;
2874	$self->hide;	3245	$self->hide;
2875		3246
2876	$self->_emit ("popdown");	3247	$self->emit ("popdown");
2877	$self->{hover}[1]->() if $self->{hover};	3248	$self->{hover}[1]->() if $self->{hover};
		3249	} else {
		3250	return 0
		3251	}
		3252
2878	}	3253	1
2879	}	3254	}
2880		3255
2881	#############################################################################	3256	#############################################################################
2882		3257
2883	package CFClient::UI::Statusbox;	3258	package CFPlus::UI::Multiplexer;
2884		3259
2885	our @ISA = CFClient::UI::VBox::;	3260	our @ISA = CFPlus::UI::Container::;
2886		3261
2887	sub new {	3262	sub new {
2888	my $class = shift;	3263	my $class = shift;
2889		3264
2890	$class->SUPER::new (	3265	my $self = $class->SUPER::new (
		3266	@_,
		3267	);
		3268
		3269	$self->{current} = $self->{children}[0]
		3270	if @{ $self->{children} };
		3271
		3272	$self
		3273	}
		3274
		3275	sub add {
		3276	my ($self, @widgets) = @_;
		3277
		3278	$self->SUPER::add (@widgets);
		3279
		3280	$self->{current} = $self->{children}[0]
		3281	if @{ $self->{children} };
		3282	}
		3283
		3284	sub get_current_page {
		3285	my ($self) = @_;
		3286
		3287	$self->{current}
		3288	}
		3289
		3290	sub set_current_page {
		3291	my ($self, $page_or_widget) = @_;
		3292
		3293	my $widget = ref $page_or_widget
		3294	? $page_or_widget
		3295	: $self->{children}[$page_or_widget];
		3296
		3297	$self->{current} = $widget;
		3298	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3299
		3300	$self->emit (page_changed => $self->{current});
		3301
		3302	$self->realloc;
		3303	}
		3304
		3305	sub visible_children {
		3306	$_[0]{current}
		3307	}
		3308
		3309	sub size_request {
		3310	my ($self) = @_;
		3311
		3312	$self->{current}->size_request
		3313	}
		3314
		3315	sub invoke_size_allocate {
		3316	my ($self, $w, $h) = @_;
		3317
		3318	$self->{current}->configure (0, 0, $w, $h);
		3319
		3320	1
		3321	}
		3322
		3323	sub _draw {
		3324	my ($self) = @_;
		3325
		3326	$self->{current}->draw;
		3327	}
		3328
		3329	#############################################################################
		3330
		3331	package CFPlus::UI::Notebook;
		3332
		3333	our @ISA = CFPlus::UI::VBox::;
		3334
		3335	sub new {
		3336	my $class = shift;
		3337
		3338	my $self = $class->SUPER::new (
		3339	buttonbar => (new CFPlus::UI::Buttonbar),
		3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3341	# filter => # will be put between multiplexer and $self
		3342	@_,
		3343	);
		3344
		3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3346	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3347
		3348	$self
		3349	}
		3350
		3351	sub add {
		3352	my ($self, $title, $widget, $tooltip) = @_;
		3353
		3354	Scalar::Util::weaken $self;
		3355
		3356	$self->{buttonbar}->add (new CFPlus::UI::Button
		3357	markup => $title,
		3358	tooltip => $tooltip,
		3359	on_activate => sub { $self->set_current_page ($widget) },
		3360	);
		3361
		3362	$self->{multiplexer}->add ($widget);
		3363	}
		3364
		3365	sub get_current_page {
		3366	my ($self) = @_;
		3367
		3368	$self->{multiplexer}->get_current_page
		3369	}
		3370
		3371	sub set_current_page {
		3372	my ($self, $page) = @_;
		3373
		3374	$self->{multiplexer}->set_current_page ($page);
		3375	$self->emit (page_changed => $self->{multiplexer}{current});
		3376	}
		3377
		3378	#############################################################################
		3379
		3380	package CFPlus::UI::Selector;
		3381
		3382	use utf8;
		3383
		3384	our @ISA = CFPlus::UI::Button::;
		3385
		3386	sub new {
		3387	my $class = shift;
		3388
		3389	my $self = $class->SUPER::new (
		3390	options => [], # [value, title, longdesc], ...
		3391	value => undef,
		3392	@_,
		3393	);
		3394
		3395	$self->_set_value ($self->{value});
		3396
		3397	$self
		3398	}
		3399
		3400	sub invoke_button_down {
		3401	my ($self, $ev) = @_;
		3402
		3403	my @menu_items;
		3404
		3405	for (@{ $self->{options} }) {
		3406	my ($value, $title, $tooltip) = @$_;
		3407
		3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3409	}
		3410
		3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3412	}
		3413
		3414	sub _set_value {
		3415	my ($self, $value) = @_;
		3416
		3417	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3418	or return;
		3419
		3420	$self->{value} = $item->[0];
		3421	$self->set_markup ("$item->[1] ⇓");
		3422	$self->set_tooltip ($item->[2]);
		3423	}
		3424
		3425	sub set_value {
		3426	my ($self, $value) = @_;
		3427
		3428	return unless $self->{value} ne $value;
		3429
		3430	$self->_set_value ($value);
		3431	$self->emit (changed => $value);
		3432	}
		3433
		3434	#############################################################################
		3435
		3436	package CFPlus::UI::Statusbox;
		3437
		3438	our @ISA = CFPlus::UI::VBox::;
		3439
		3440	sub new {
		3441	my $class = shift;
		3442
		3443	my $self = $class->SUPER::new (
2891	fontsize => 0.8,	3444	fontsize => 0.8,
2892	@_,	3445	@_,
2893	)	3446	);
		3447
		3448	Scalar::Util::weaken (my $this = $self);
		3449
		3450	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3451
		3452	$self
2894	}	3453	}
2895		3454
2896	sub reorder {	3455	sub reorder {
2897	my ($self) = @_;	3456	my ($self) = @_;
2898	my $NOW = time;	3457	my $NOW = Time::HiRes::time;
		3458
		3459	# freeze display when hovering over any label
		3460	return if $CFPlus::UI::TOOLTIP->{owner}
		3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3462	values %{ $self->{item} };
2899		3463
2900	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
2901	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902	}	3466	}
2903		3467
…		…
2906	my @items = sort {	3470	my @items = sort {
2907	$a->{pri} <=> $b->{pri}	3471	$a->{pri} <=> $b->{pri}
2908	or $b->{id} <=> $a->{id}	3472	or $b->{id} <=> $a->{id}
2909	} values %{ $self->{item} };	3473	} values %{ $self->{item} };
2910		3474
		3475	$self->{timer}->interval (1);
		3476
2911	my $count = 10 + 1;	3477	my $count = 10 + 1;
2912	for my $item (@items) {	3478	for my $item (@items) {
2913	last unless --$count;	3479	last unless --$count;
2914		3480
2915	push @widgets, $item->{label} ||= do {	3481	my $label = $item->{label} ||= do {
2916	# TODO: doesn't handle markup well (read as: at all)	3482	# TODO: doesn't handle markup well (read as: at all)
2917	my $short = $item->{count} > 1	3483	my $short = $item->{count} > 1
2918	? "<b>$item->{count} ×</b> $item->{text}"	3484	? "<b>$item->{count} ×</b> $item->{text}"
2919	: $item->{text};	3485	: $item->{text};
2920		3486
2921	for ($short) {	3487	for ($short) {
2922	s/^\s+//;	3488	s/^\s+//;
2923	s/\s+/ /g;	3489	s/\s+/ /g;
2924	}	3490	}
2925		3491
2926	new CFClient::UI::Label	3492	new CFPlus::UI::Label
2927	markup => $short,	3493	markup => $short,
2928	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
2929	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
2930	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
2931	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
2932	max_w => $::WIDTH * 0.44,	3498	max_w => $::WIDTH * 0.44,
2933	fg => $item->{fg},	3499	fg => [@{ $item->{fg} }],
2934	can_events => 1,	3500	can_events => 1,
2935	can_hover => 1	3501	can_hover => 1
2936	};	3502	};
		3503
		3504	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3505	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3506	$label->update;
		3507	$label->set_max_size (undef, $label->{req_h} * $diff)
		3508	if $diff < 1;
		3509	$self->{timer}->interval (1/30);
		3510	} else {
		3511	$label->{fg}[3] = $item->{fg}[3] || 1;
		3512	}
		3513
		3514	push @widgets, $label;
2937	}	3515	}
2938		3516
2939	$self->clear;	3517	$self->clear;
2940	$self->SUPER::add (reverse @widgets);	3518	$self->SUPER::add (reverse @widgets);
2941	}	3519	}
…		…
2946	$text =~ s/^\s+//;	3524	$text =~ s/^\s+//;
2947	$text =~ s/\s+$//;	3525	$text =~ s/\s+$//;
2948		3526
2949	return unless $text;	3527	return unless $text;
2950		3528
2951	my $timeout = time + ((delete $arg{timeout}) || 60);	3529	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952		3530
2953	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3531	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954		3532
2955	if (my $item = $self->{item}{$group}) {	3533	if (my $item = $self->{item}{$group}) {
2956	if ($item->{text} eq $text) {	3534	if ($item->{text} eq $text) {
2957	$item->{count}++;	3535	$item->{count}++;
2958	} else {	3536	} else {
2959	$item->{count} = 1;	3537	$item->{count} = 1;
2960	$item->{text} = $item->{tooltip} = $text;	3538	$item->{text} = $item->{tooltip} = $text;
2961	}	3539	}
2962	$item->{id} = ++$self->{id};	3540	$item->{id} += 0.2;#d#
2963	$item->{timeout} = $timeout;	3541	$item->{timeout} = $timeout;
2964	delete $item->{label};	3542	delete $item->{label};
2965	} else {	3543	} else {
2966	$self->{item}{$group} = {	3544	$self->{item}{$group} = {
2967	id => ++$self->{id},	3545	id => ++$self->{id},
…		…
2973	count => 1,	3551	count => 1,
2974	%arg,	3552	%arg,
2975	};	3553	};
2976	}	3554	}
2977		3555
		3556	$ROOT->on_refresh (reorder => sub {
2978	$self->reorder;	3557	$self->reorder;
		3558	});
2979	}	3559	}
2980		3560
2981	sub reconfigure {	3561	sub reconfigure {
2982	my ($self) = @_;	3562	my ($self) = @_;
2983		3563
…		…
2986		3566
2987	$self->reorder;	3567	$self->reorder;
2988	$self->SUPER::reconfigure;	3568	$self->SUPER::reconfigure;
2989	}	3569	}
2990		3570
		3571	sub destroy {
		3572	my ($self) = @_;
		3573
		3574	$self->{timer}->cancel;
		3575
		3576	$self->SUPER::destroy;
		3577	}
		3578
2991	#############################################################################	3579	#############################################################################
2992		3580
		3581	package CFPlus::UI::Inventory;
		3582
		3583	our @ISA = CFPlus::UI::Table::;
		3584
		3585	sub new {
		3586	my $class = shift;
		3587
		3588	my $self = $class->SUPER::new (
		3589	col_expand => [0, 1, 0],
		3590	items => [],
		3591	@_,
		3592	);
		3593
		3594	$self->set_sort_order (undef);
		3595
		3596	$self
		3597	}
		3598
		3599	sub update_items {
		3600	my ($self) = @_;
		3601
		3602	$self->clear;
		3603
		3604	my @item = $self->{sort}->(@{ $self->{items} });
		3605
		3606	my @adds;
		3607	my $row = 0;
		3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3609	CFPlus::Item::update_widgets $item;
		3610
		3611	push @adds, 0, $row, $item->{face_widget};
		3612	push @adds, 1, $row, $item->{desc_widget};
		3613	push @adds, 2, $row, $item->{weight_widget};
		3614
		3615	$row++;
		3616	}
		3617
		3618	$self->add (@adds);
		3619	}
		3620
		3621	sub set_sort_order {
		3622	my ($self, $order) = @_;
		3623
		3624	$self->{sort} = $order ||= sub {
		3625	sort {
		3626	$a->{type} <=> $b->{type}
		3627	or $a->{name} cmp $b->{name}
		3628	} @_
		3629	};
		3630
		3631	$self->update_items;
		3632	}
		3633
		3634	sub set_items {
		3635	my ($self, $items) = @_;
		3636
		3637	$self->{items} = [$items ? values %$items : ()];
		3638	$self->update_items;
		3639	}
		3640
		3641	#############################################################################
		3642
		3643	package CFPlus::UI::SpellList;
		3644
		3645	our @ISA = CFPlus::UI::Table::;
		3646
		3647	sub new {
		3648	my $class = shift;
		3649
		3650	my $self = $class->SUPER::new (
		3651	binding => [],
		3652	commands => [],
		3653	@_,
		3654	)
		3655	}
		3656
		3657	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3658
		3659	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3660	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3661	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3662	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3663	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3664	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3665	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3666	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3667	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3669
		3670	sub rebuild_spell_list {
		3671	my ($self) = @_;
		3672
		3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
		3674	$self->clear;
		3675
		3676	return unless $::CONN;
		3677
		3678	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3679	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3680	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3681	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3683
		3684	my $row = 0;
		3685
		3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3687	my $spell = $self->{spell}{$_};
		3688
		3689	$row++;
		3690
		3691	my $spell_cb = sub {
		3692	my ($widget, $ev) = @_;
		3693
		3694	if ($ev->{button} == 1) {
		3695	$::CONN->user_send ("cast $spell->{name}");
		3696	} elsif ($ev->{button} == 2) {
		3697	$::CONN->user_send ("invoke $spell->{name}");
		3698	} elsif ($ev->{button} == 3) {
		3699	(new CFPlus::UI::Menu
		3700	items => [
		3701	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3703	],
		3704	)->popup ($ev);
		3705	} else {
		3706	return 0;
		3707	}
		3708
		3709	1
		3710	};
		3711
		3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3713
		3714	#TODO: add path info to tooltip
		3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3716
		3717	$self->add (0, $row, new CFPlus::UI::Face
		3718	face => $spell->{face},
		3719	can_hover => 1,
		3720	can_events => 1,
		3721	tooltip => $tooltip,
		3722	on_button_down => $spell_cb,
		3723	);
		3724
		3725	$self->add (1, $row, new CFPlus::UI::Label
		3726	expand => 1,
		3727	text => $spell->{name},
		3728	can_hover => 1,
		3729	can_events => 1,
		3730	tooltip => $tooltip,
		3731	on_button_down => $spell_cb,
		3732	);
		3733
		3734	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3735	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3736	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3738	}
		3739	});
		3740	}
		3741
		3742	sub add_spell {
		3743	my ($self, $spell) = @_;
		3744
		3745	$self->{spell}->{$spell->{name}} = $spell;
		3746	$self->rebuild_spell_list;
		3747	}
		3748
		3749	sub remove_spell {
		3750	my ($self, $spell) = @_;
		3751
		3752	delete $self->{spell}->{$spell->{name}};
		3753	$self->rebuild_spell_list;
		3754	}
		3755
		3756	sub clear_spells {
		3757	my ($self) = @_;
		3758
		3759	$self->{spell} = {};
		3760	$self->rebuild_spell_list;
		3761	}
		3762
		3763	#############################################################################
		3764
2993	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
2994		3766
2995	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
2996		3768
		3769	use List::Util qw(min max);
		3770
2997	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
2998		3772
2999	sub new {	3773	sub new {
3000	my $class = shift;	3774	my $class = shift;
3001		3775
3002	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3007	Scalar::Util::weaken ($self->{root} = $self);	3781	Scalar::Util::weaken ($self->{root} = $self);
3008		3782
3009	$self	3783	$self
3010	}	3784	}
3011		3785
3012	sub configure {
3013	my ($self, $x, $y, $w, $h) = @_;
3014
3015	$self->{w} = $w;
3016	$self->{h} = $h;
3017	}
3018
3019	sub reconfigure {
3020	my ($self) = @_;
3021
3022	$self->SUPER::reconfigure;
3023
3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
3025	if $self->{w};
3026	}
3027
3028	sub size_request {	3786	sub size_request {
3029	my ($self) = @_;	3787	my ($self) = @_;
3030		3788
3031	($self->{w}, $self->{h})	3789	($self->{w}, $self->{h})
3032	}	3790	}
3033		3791
		3792	sub _to_pixel {
		3793	my ($coord, $size, $max) = @_;
		3794
		3795	$coord =
		3796	$coord eq "center" ? ($max - $size) * 0.5
		3797	: $coord eq "max" ? $max
		3798	: $coord;
		3799
		3800	$coord = 0 if $coord < 0;
		3801	$coord = $max - $size if $coord > $max - $size;
		3802
		3803	int $coord + 0.5
		3804	}
		3805
3034	sub size_allocate {	3806	sub invoke_size_allocate {
3035	my ($self, $w, $h, $changed) = @_;	3807	my ($self, $w, $h) = @_;
3036		3808
3037	for my $child ($self->children) {	3809	for my $child ($self->children) {
3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3810	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039		3811
3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3812	$X = $child->{force_x} if exists $child->{force_x};
3041	if exists $child->{req_x};	3813	$Y = $child->{force_y} if exists $child->{force_y};
3042		3814
3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3815	$X = _to_pixel $X, $W, $self->{w};
3044	if exists $child->{req_y};	3816	$Y = _to_pixel $Y, $H, $self->{h};
3045
3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3817
3051	$child->configure ($X, $Y, $W, $H);	3818	$child->configure ($X, $Y, $W, $H);
3052	}	3819	}
		3820
		3821	1
3053	}	3822	}
3054		3823
3055	sub coord2local {	3824	sub coord2local {
3056	my ($self, $x, $y) = @_;	3825	my ($self, $x, $y) = @_;
3057		3826
…		…
3071	}	3840	}
3072		3841
3073	sub add {	3842	sub add {
3074	my ($self, @children) = @_;	3843	my ($self, @children) = @_;
3075		3844
3076	for my $child (@children) {
3077	$child->{is_toplevel} = 1;	3845	$_->{is_toplevel} = 1
3078		3846	for @children;
3079	# integerise window positions
3080	$child->{x} = int $child->{x};
3081	$child->{y} = int $child->{y};
3082	}
3083		3847
3084	$self->SUPER::add (@children);	3848	$self->SUPER::add (@children);
3085	}	3849	}
3086		3850
3087	sub remove {	3851	sub remove {
3088	my ($self, @children) = @_;	3852	my ($self, @children) = @_;
3089		3853
3090	$self->SUPER::remove (@children);	3854	$self->SUPER::remove (@children);
		3855
		3856	delete $self->{is_toplevel}
		3857	for @children;
3091		3858
3092	while (@children) {	3859	while (@children) {
3093	my $w = pop @children;	3860	my $w = pop @children;
3094	push @children, $w->children;	3861	push @children, $w->children;
3095	$w->set_invisible;	3862	$w->set_invisible;
…		…
3115	$_->()	3882	$_->()
3116	for values %{delete $self->{refresh_hook}};	3883	for values %{delete $self->{refresh_hook}};
3117	}	3884	}
3118		3885
3119	if ($self->{realloc}) {	3886	if ($self->{realloc}) {
		3887	my %queue;
3120	my @queue;	3888	my @queue;
		3889	my $widget;
3121		3890
		3891	outer:
3122	while () {	3892	while () {
3123	if ($self->{realloc}) {	3893	if (my $realloc = delete $self->{realloc}) {
3124	#TODO use array-of-depth approach	3894	for $widget (values %$realloc) {
		3895	$widget->{visible} or next; # do not resize invisible widgets
3125		3896
3126	@queue = sort { $a->{visible} <=> $b->{visible} }	3897	$queue{$widget+0}++ and next; # duplicates are common
3127	@queue, values %{delete $self->{realloc}};	3898
		3899	push @{ $queue[$widget->{visible}] }, $widget;
		3900	}
3128	}	3901	}
3129		3902
		3903	while () {
		3904	@queue or last outer;
		3905
		3906	$widget = pop @{ $queue[-1] || [] }
		3907	and last;
		3908
		3909	pop @queue;
		3910	}
		3911
		3912	delete $queue{$widget+0};
		3913
		3914	my ($w, $h) = $widget->size_request;
		3915
		3916	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3917	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3918
		3919	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3920	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3921
		3922	$w = $widget->{force_w} if exists $widget->{force_w};
		3923	$h = $widget->{force_h} if exists $widget->{force_h};
		3924
		3925	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3926	|| delete $widget->{force_realloc}) {
		3927	$widget->{req_w} = $w;
		3928	$widget->{req_h} = $h;
		3929
		3930	$self->{size_alloc}{$widget+0} = $widget;
		3931
		3932	if (my $parent = $widget->{parent}) {
		3933	$self->{realloc}{$parent+0} = $parent
		3934	unless $queue{$parent+0};
		3935
		3936	$parent->{force_size_alloc} = 1;
		3937	$self->{size_alloc}{$parent+0} = $parent;
		3938	}
		3939	}
		3940
		3941	delete $self->{realloc}{$widget+0};
		3942	}
		3943	}
		3944
		3945	while (my $size_alloc = delete $self->{size_alloc}) {
		3946	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3947	values %$size_alloc;
		3948
		3949	while () {
3130	my $widget = pop @queue || last;	3950	my $widget = pop @queue || last;
3131		3951
3132	$widget->{visible} or last; # do not resize invisible widgets	3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135	? @$widget{qw(def_w def_h)}
3136	: $widget->size_request;
3137
3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140	$widget->{req_w} = $w;
3141	$widget->{req_h} = $h;
3142
3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145	push @queue, $widget->{parent}
3146	if $widget->{parent};
3147	}
3148	}
3149
3150	while (my $size_alloc = delete $self->{size_alloc}) {
3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152	values %$size_alloc;
3153
3154	while () {
3155	my ($widget, $w, $h) = @{ pop @queue or last };
3156		3953
3157	$w = 0 if $w < 0;	3954	$w = 0 if $w < 0;
3158	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3159		3956
3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3957	$w = max $widget->{min_w}, $w;
		3958	$h = max $widget->{min_h}, $h;
3161		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
		3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3965
		3966	$w = int $w + 0.5;
		3967	$h = int $h + 0.5;
		3968
		3969	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3970	$widget->{old_w} = $widget->{w};
		3971	$widget->{old_h} = $widget->{h};
		3972
3162	$widget->{w} = $w;	3973	$widget->{w} = $w;
3163	$widget->{h} = $h;	3974	$widget->{h} = $h;
3164		3975
3165	$widget->emit (size_allocate => $w, $h, $changed);	3976	$widget->emit (size_allocate => $w, $h);
		3977	}
3166	}	3978	}
3167	}	3979	}
3168		3980
3169	while ($self->{post_alloc_hook}) {	3981	while ($self->{post_alloc_hook}) {
3170	$_->()	3982	$_->()
3171	for values %{delete $self->{post_alloc_hook}};	3983	for values %{delete $self->{post_alloc_hook}};
3172	}	3984	}
		3985
3173		3986
3174	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3987	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3988	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176	glClear GL_COLOR_BUFFER_BIT;	3989	glClear GL_COLOR_BUFFER_BIT;
3177		3990
…		…
3179	glLoadIdentity;	3992	glLoadIdentity;
3180	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3182	glLoadIdentity;	3995	glLoadIdentity;
3183		3996
		3997	{
		3998	package CFPlus::UI::Base;
		3999
		4000	($draw_x, $draw_y, $draw_w, $draw_h) =
		4001	(0, 0, $self->{w}, $self->{h});
		4002	}
		4003
3184	$self->_draw;	4004	$self->_draw;
3185	}	4005	}
3186		4006
3187	#############################################################################	4007	#############################################################################
3188		4008
3189	package CFClient::UI;	4009	package CFPlus::UI;
3190		4010
3191	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3192	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3193		4013
3194	1	4014	1
3195		4015

Diff Legend

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