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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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