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

Diff Legend

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