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

Diff Legend

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