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

Diff Legend

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