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.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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