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

Diff Legend

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