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

Diff Legend

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