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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

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

Diff Legend

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