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

Diff Legend

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