ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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