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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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