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

Diff Legend

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