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

Diff Legend

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