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.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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