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

Diff Legend

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