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

Diff Legend

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