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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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