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.281 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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