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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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