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

Diff Legend

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