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

Diff Legend

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