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

Diff Legend

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