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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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