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.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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