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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub show_centered {
251	my ($self) = @_;
252	return if $self->{parent};
253
254	$self->show;
255
256	$CFClient::UI::ROOT->on_post_alloc (
257	"centered $self" => sub {
258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259	},
260	);
261	}	252	}
262		253
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$self->emit (visibility_change => 1)	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}	373	}
357		374
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}
364
365	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
366	}	381	}
367		382
368	sub set_max_size {	383	sub set_max_size {
369	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
370		385
…		…
429		444
430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431	unless $FOCUS;	446	unless $FOCUS;
432	}	447	}
433		448
434	sub mouse_motion { }	449	sub mouse_motion { 0 }
435	sub button_up { }	450	sub button_up { 0 }
436	sub key_down { }	451	sub key_down { 0 }
437	sub key_up { }	452	sub key_up { 0 }
438		453
439	sub button_down {	454	sub button_down {
440	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
441		456
442	$self->focus_in;	457	$self->focus_in;
443	}
444		458
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
449	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450		535
451	sub draw {	536	sub draw {
452	my ($self) = @_;	537	my ($self) = @_;
453		538
454	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455		550
456	glPushMatrix;	551	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;
459	glPopMatrix;
460		553
461	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
462	my ($x, $y) = @$self{qw(x y)};
463
464	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465	glEnable GL_BLEND;	556	glEnable GL_BLEND;
466	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467	glBegin GL_QUADS;	558	glBegin GL_QUADS;
468	glVertex $x , $y;	559	glVertex 0 , 0;
469	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
470	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
471	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
472	glEnd;	563	glEnd;
473	glDisable GL_BLEND;	564	glDisable GL_BLEND;
474	}	565	}
475		566
476	if ($ENV{PCLIENT_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	568	glPushMatrix;
478	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
480	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	572	glVertex 0 , 0;
482	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
483	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
484	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
485	glEnd;	576	glEnd;
486	glPopMatrix;	577	glPopMatrix;
487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
489	}	583	}
490		584
491	sub _draw {	585	sub _draw {
492	my ($self) = @_;	586	my ($self) = @_;
493		587
494	warn "no draw defined for $self\n";	588	warn "no draw defined for $self\n";
495	}
496
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible;
515
516	$self->check_size;
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}	589	}
556		590
557	sub DESTROY {	591	sub DESTROY {
558	my ($self) = @_;	592	my ($self) = @_;
559		593
…		…
591		625
592	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
593	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
594		628
595	glEnable GL_BLEND;	629	glEnable GL_BLEND;
596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597	glColor @$color;	631	glColor_premultiply @$color;
598		632
599	glBegin GL_QUADS;	633	glBegin GL_QUADS;
600	glVertex 0 , 0;	634	glVertex 0 , 0;
601	glVertex 0 , $h;	635	glVertex 0 , $h;
602	glVertex $w, $h;	636	glVertex $w, $h;
…		…
617	my ($class, %arg) = @_;	651	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	652	$class->SUPER::new (can_events => 0, %arg);
619	}	653	}
620		654
621	sub size_request {	655	sub size_request {
622	(0, 0)	656	my ($self) = @_;
		657
		658	($self->{w} + 0, $self->{h} + 0)
623	}	659	}
624		660
625	sub draw { }	661	sub draw { }
626		662
627	#############################################################################	663	#############################################################################
…		…
631	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
632		668
633	sub new {	669	sub new {
634	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
635		671
636	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
637		673
638	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
639	children => [],	675	children => [],
640	can_events => 0,	676	can_events => 0,
641	%arg,	677	%arg,
642	);	678	);
		679
643	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
644		682
645	$self	683	$self
646	}	684	}
647		685
648	sub add {	686	sub add {
…		…
656	$self->{children} = [	694	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	695	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	696	@{$self->{children}}, @widgets
659	];	697	];
660		698
661	$self->check_size (1);	699	$self->realloc;
662	$self->update;
663	}	700	}
664		701
665	sub children {	702	sub children {
666	@{ $_[0]{children} }	703	@{ $_[0]{children} }
667	}	704	}
…		…
672	delete $child->{parent};	709	delete $child->{parent};
673	$child->hide;	710	$child->hide;
674		711
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		713
677	$self->check_size (1);	714	$self->realloc;
678	$self->update;
679	}	715	}
680		716
681	sub clear {	717	sub clear {
682	my ($self) = @_;	718	my ($self) = @_;
683		719
…		…
687	for (@$children) {	723	for (@$children) {
688	delete $_->{parent};	724	delete $_->{parent};
689	$_->hide;	725	$_->hide;
690	}	726	}
691		727
692	$self->check_size;	728	$self->realloc;
693	$self->update;
694	}	729	}
695		730
696	sub find_widget {	731	sub find_widget {
697	my ($self, $x, $y) = @_;	732	my ($self, $x, $y) = @_;
698		733
699	$x -= $self->{x};	734	$x -= $self->{x};
700	$y -= $self->{y};	735	$y -= $self->{y};
701		736
702	my $res;	737	my $res;
703		738
704	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
705	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
706	and return $res;	741	and return $res;
707	}	742	}
708		743
709	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
758	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
759	}	794	}
760		795
761	#############################################################################	796	#############################################################################
762		797
		798	# back-buffered drawing area
		799
763	package CFClient::UI::Window;	800	package CFClient::UI::Window;
764		801
765	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
766		803
767	use CFClient::OpenGL;	804	use CFClient::OpenGL;
…		…
785	$self->SUPER::size_allocate ($w, $h);	822	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	823	$self->update;
787	}	824	}
788		825
789	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
790	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
791	}	830	}
792		831
793	sub render_child {	832	sub render_child {
794	my ($self) = @_;	833	my ($self) = @_;
795		834
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
799		838
		839	{
		840	package CFClient::UI::Base;
		841
		842	($draw_x, $draw_y, $draw_w, $draw_h) =
		843	(0, 0, $self->{w}, $self->{h});
		844	}
		845
800	$self->_render;	846	$self->_render;
801	};	847	};
802	}	848	}
803		849
804	sub _draw {	850	sub _draw {
805	my ($self) = @_;	851	my ($self) = @_;
806		852
807	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
808		854
809	my $tex = $self->{texture}	855	my $tex = $self->{texture}
810	or return;	856	or return;
811		857
812	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		860	glEnable GL_BLEND;
		861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
814	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
815		863
816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
817		865
		866	glDisable GL_BLEND;
818	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
819	}	868	}
820		869
821	#############################################################################	870	#############################################################################
822		871
…		…
835	}	884	}
836		885
837	sub size_request {	886	sub size_request {
838	my ($self) = @_;	887	my ($self) = @_;
839		888
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		890
842	@$self{qw(child_w child_h)}	891	$w = 10 if $self->{scroll_x};
		892	$h = 10 if $self->{scroll_y};
		893
		894	($w, $h)
843	}	895	}
844		896
845	sub size_allocate {	897	sub size_allocate {
846	my ($self, $w, $h) = @_;	898	my ($self, $w, $h) = @_;
847		899
		900	my $child = $self->child;
		901
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		904
851	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
852	$self->update;	906	$self->update;
853	}	907	}
854		908
…		…
890	}	944	}
891		945
892	sub _render {	946	sub _render {
893	my ($self) = @_;	947	my ($self) = @_;
894		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		953
897	$self->SUPER::_render;	954	$self->SUPER::_render;
898	}	955	}
899		956
…		…
902	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
903		960
904	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
905		962
906	sub new {	963	sub new {
907	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
908		967
909	my $self;	968	my $self;
910		969
911	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
912	vertical => 1,	971	vertical => 1,
…		…
917	;	976	;
918		977
919	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
920	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
921	slider => $slider,	980	slider => $slider,
922	@_,	981	%arg,
923	);	982	);
924		983
925	$self->{vp}->add ($self->{scrolled});
926	$self->add ($self->{vp});
927	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
928		986
929	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
930	}	994	}
931		995
932	sub update {	996	sub update {
933	my ($self) = @_;	997	my ($self) = @_;
934		998
…		…
973		1037
974	if ($self->{bg}) {	1038	if ($self->{bg}) {
975	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
976		1040
977	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
980		1044
981	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
982	glVertex 0 , 0;	1046	glVertex 0 , 0;
983	glVertex 0 , $h;	1047	glVertex 0 , $h;
984	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
997		1061
998	our @ISA = CFClient::UI::Bin::;	1062	our @ISA = CFClient::UI::Bin::;
999		1063
1000	use CFClient::OpenGL;	1064	use CFClient::OpenGL;
1001		1065
1002	my @tex =	1066	my $bg =
		1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1068	mipmap => 1, wrap => 1;
		1069
		1070	my @border =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1073
1006	sub new {	1074	sub new {
1007	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1008		1078
1009	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1010	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1011	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1012	border => 0.6,	1082	border => 0.6,
1013	is_toplevel => 1,
1014	can_events => 1,	1083	can_events => 1,
1015	@_	1084	min_w => 16,
		1085	min_h => 16,
		1086	%arg,
1016	);	1087	);
1017		1088
1018	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1019	align => 0,	1090	align => 0,
1020	valign => 1,	1091	valign => 1,
1021	text => $self->{title},	1092	text => $title,
1022	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1023		1095
1024	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1025	}	1104	}
1026		1105
1027	sub border {	1106	sub border {
1028	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1029	}	1108	}
1030		1109
1031	sub size_request {	1110	sub size_request {
1032	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1033		1115
1034	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1035		1117
1036	(	1118	(
1037	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1040	}	1122	}
1041		1123
1042	sub size_allocate {	1124	sub size_allocate {
1043	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1044		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
1045	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1046	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1047		1137
1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049	if $self->{title};
1050
1051	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1052	}	1139	}
1053		1140
1054	sub button_down {	1141	sub button_down {
1055	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1056		1143
…		…
1072	my ($ev, $x, $y) = @_;	1159	my ($ev, $x, $y) = @_;
1073		1160
1074	my $dx = $ev->{x} - $ox;	1161	my $dx = $ev->{x} - $ox;
1075	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1076		1163
1077	$self->{user_x} = $wx + $dx * $mx;
1078	$self->{user_y} = $wy + $dy * $my;
1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081	$self->move ($self->{user_x}, $self->{user_y});	1166
1082	$self->check_size;	1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1168	$self->realloc;
1083	};	1169	};
1084		1170
1085	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1089	$self->{motion} = sub {	1175	$self->{motion} = sub {
1090	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1091		1177
1092	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1093		1179
1094	$self->{user_x} = $bx + $x - $ox;	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095	$self->{user_y} = $by + $y - $oy;	1181	# HACK: the next line is required to enforce placement
1096		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097	$self->move ($self->{user_x}, $self->{user_y});
1098	$self->update;
1099	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1100	}	1188	1
1101	}	1189	}
1102		1190
1103	sub button_up {	1191	sub button_up {
1104	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1105		1193
1106	delete $self->{motion};	1194	!!delete $self->{motion}
1107	}	1195	}
1108		1196
1109	sub mouse_motion {	1197	sub mouse_motion {
1110	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1111		1199
1112	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1113	}	1203	}
1114		1204
1115	sub _draw {	1205	sub _draw {
1116	my ($self) = @_;	1206	my ($self) = @_;
1117		1207
		1208	my $child = $self->{children}[0];
		1209
1118	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1120		1212
1121	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123		1215
1124	my $border = $self->border;	1216	my $border = $self->border;
1125		1217
1126	glColor @{ $self->{border_bg} };	1218	glColor @{ $self->{border_bg} };
1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131		1223
1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133	my $bg = $tex[0];	1225	glColor @{ $self->{bg} };
1134		1226
1135	# TODO: repeat texture not scale	1227	# TODO: repeat texture not scale
		1228	# solve this better(?)
1136	my $rep_x = $cw / $bg->{w};	1229	$bg->{s} = $cw / $bg->{w};
1137	my $rep_y = $ch / $bg->{h};	1230	$bg->{t} = $ch / $bg->{h};
1138
1139	glColor @{ $self->{bg} };
1140
1141	$bg->{s} = $rep_x;
1142	$bg->{t} = $rep_y;
1143	$bg->{wrap_mode} = 1;
1144	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145	}	1232	}
1146		1233
1147	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1148		1235
1149	$self->{title}->draw if $self->{title};
1150
1151	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1152	}	1242	}
1153		1243
1154	#############################################################################	1244	#############################################################################
1155		1245
1156	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1178	my ($self, $x, $y, $child) = @_;	1268	my ($self, $x, $y, $child) = @_;
1179		1269
1180	$child->set_parent ($self);	1270	$child->set_parent ($self);
1181	$self->{children}[$y][$x] = $child;	1271	$self->{children}[$y][$x] = $child;
1182		1272
1183	$self->check_size (1);	1273	$self->realloc;
1184	}	1274	}
1185		1275
1186	# TODO: move to container class maybe? send children a signal on removal?	1276	# TODO: move to container class maybe? send children a signal on removal?
1187	sub clear {	1277	sub clear {
1188	my ($self) = @_;	1278	my ($self) = @_;
…		…
1193	for (@children) {	1283	for (@children) {
1194	delete $_->{parent};	1284	delete $_->{parent};
1195	$_->hide;	1285	$_->hide;
1196	}	1286	}
1197		1287
1198	$self->check_size (1);	1288	$self->realloc;
1199	$self->update;
1200	}	1289	}
1201		1290
1202	sub get_wh {	1291	sub get_wh {
1203	my ($self) = @_;	1292	my ($self) = @_;
1204		1293
…		…
1324	my ($self, $w, $h) = @_;	1413	my ($self, $w, $h) = @_;
1325		1414
1326	my $space = $self->{vertical} ? $h : $w;	1415	my $space = $self->{vertical} ? $h : $w;
1327	my $children = $self->{children};	1416	my $children = $self->{children};
1328		1417
1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1418	my @req;
1330	my $req = List::Util::sum @req;
1331		1419
1332	if ($req > $space) {	1420	if ($self->{homogeneous}) {
1333	# ah well, not enough space	1421	@req = ($space / (@$children || 1)) x @$children;
1334	$_ *= $space / $req for @req;
1335	} else {	1422	} else {
		1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1424	my $req = List::Util::sum @req;
		1425
		1426	if ($req > $space) {
		1427	# ah well, not enough space
		1428	$_ *= $space / $req for @req;
		1429	} else {
1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337		1431
		1432	$space = ($space - $req) / $expand; # remaining space to give away
		1433
1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand	1434	$req[$_] += $space * $children->[$_]{expand}
1339	for 0 .. $#$children;	1435	for 0 .. $#$children;
		1436	}
1340	}	1437	}
1341		1438
1342	CFClient::UI::harmonize \@req;	1439	CFClient::UI::harmonize \@req;
1343		1440
1344	my $pos = 0;	1441	my $pos = 0;
…		…
1404	ellipsise => 3, # end	1501	ellipsise => 3, # end
1405	layout => (new CFClient::Layout),	1502	layout => (new CFClient::Layout),
1406	fontsize => 1,	1503	fontsize => 1,
1407	align => -1,	1504	align => -1,
1408	valign => -1,	1505	valign => -1,
1409	padding => 2,	1506	padding_x => 2,
		1507	padding_y => 2,
1410	can_events => 0,	1508	can_events => 0,
1411	%arg	1509	%arg
1412	);	1510	);
1413		1511
1414	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1450	$self->{text} = "T$text";	1548	$self->{text} = "T$text";
1451		1549
1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453	$self->{layout}->set_text ($text);	1551	$self->{layout}->set_text ($text);
1454		1552
		1553	$self->realloc;
1455	$self->update;	1554	$self->update;
1456	$self->check_size;
1457	}	1555	}
1458		1556
1459	sub set_markup {	1557	sub set_markup {
1460	my ($self, $markup) = @_;	1558	my ($self, $markup) = @_;
1461		1559
…		…
1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1563	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466		1564
1467	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468	$self->{layout}->set_markup ($markup);	1566	$self->{layout}->set_markup ($markup);
1469		1567
		1568	$self->realloc;
1470	$self->update;	1569	$self->update;
1471	$self->check_size;
1472	}	1570	}
1473		1571
1474	sub size_request {	1572	sub size_request {
1475	my ($self) = @_;	1573	my ($self) = @_;
1476		1574
…		…
1490		1588
1491	$w = List::Util::max $w, $w2;	1589	$w = List::Util::max $w, $w2;
1492	$h = List::Util::max $h, $h2;	1590	$h = List::Util::max $h, $h2;
1493	}	1591	}
1494		1592
1495	(	1593	($w, $h)
1496	$w + $self->{padding} * 2,
1497	$h + $self->{padding} * 2,
1498	)
1499	}	1594	}
1500		1595
1501	sub size_allocate {	1596	sub size_allocate {
1502	my ($self, $w, $h) = @_;	1597	my ($self, $w, $h) = @_;
1503		1598
		1599	delete $self->{ox};
		1600
1504	delete $self->{texture};	1601	delete $self->{texture}
		1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505	}	1603	}
1506		1604
1507	sub set_fontsize {	1605	sub set_fontsize {
1508	my ($self, $fontsize) = @_;	1606	my ($self, $fontsize) = @_;
1509		1607
1510	$self->{fontsize} = $fontsize;	1608	$self->{fontsize} = $fontsize;
1511	delete $self->{texture};	1609	delete $self->{texture};
1512		1610
1513	$self->update;	1611	$self->realloc;
1514	$self->check_size;
1515	}	1612	}
1516		1613
1517	sub _draw {	1614	sub _draw {
1518	my ($self) = @_;	1615	my ($self) = @_;
1519		1616
…		…
1525	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1626
1530	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1531		1629
		1630	unless (exists $self->{ox}) {
1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1535		1634
1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1539
1540	$tex
1541	};	1638	};
1542		1639
1543	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545		1642
…		…
1583		1680
1584	delete $self->{cur_h};	1681	delete $self->{cur_h};
1585		1682
1586	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1587		1684
1588	delete $self->{texture};
1589
1590	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1591	$self->{text} = $text;	1686	$self->{text} = $text;
1592		1687
1593	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1594	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1595		1690
1596	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1597	}	1693	}
1598		1694
1599	sub set_text {	1695	sub set_text {
1600	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1601		1697
1602	$self->{cursor} = length $text;	1698	$self->{cursor} = length $text;
1603	$self->_set_text ($text);	1699	$self->_set_text ($text);
1604	$self->update;	1700
1605	$self->check_size;	1701	$self->realloc;
1606	}	1702	}
1607		1703
1608	sub get_text {	1704	sub get_text {
1609	$_[0]{text}	1705	$_[0]{text}
1610	}	1706	}
…		…
1640	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1641	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1642	$self->_emit ('escape');	1738	$self->_emit ('escape');
1643	} elsif ($uni) {	1739	} elsif ($uni) {
1644	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1645	}	1743	}
1646		1744
1647	$self->_set_text ($text);	1745	$self->_set_text ($text);
1648	$self->update;	1746
1649	$self->check_size;	1747	$self->realloc;
		1748
		1749	1
1650	}	1750	}
1651		1751
1652	sub focus_in {	1752	sub focus_in {
1653	my ($self) = @_;	1753	my ($self) = @_;
1654		1754
…		…
1669	utf8::encode $text;	1769	utf8::encode $text;
1670	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1671		1771
1672	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1673	$self->update;	1773	$self->update;
		1774
		1775	1
1674	}	1776	}
1675		1777
1676	sub mouse_motion {	1778	sub mouse_motion {
1677	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1678	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1781
		1782	0
1679	}	1783	}
1680		1784
1681	sub _draw {	1785	sub _draw {
1682	my ($self) = @_;	1786	my ($self) = @_;
1683		1787
1684	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1685		1789
1686	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1687	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1688	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1689	} else {	1793	} else {
1690	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1691	}	1795	}
1692		1796
1693	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1694	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1696	glVertex 0 , 0;	1800	glVertex 0 , 0;
1697	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1698	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1699	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1760	} else {	1864	} else {
1761	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1762	}	1866	}
1763		1867
1764	} else {	1868	} else {
1765	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1766	}	1872	1
1767
1768	}	1873	}
1769		1874
1770	#############################################################################	1875	#############################################################################
1771		1876
1772	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1781		1886
1782	sub new {	1887	sub new {
1783	my $class = shift;	1888	my $class = shift;
1784		1889
1785	$class->SUPER::new (	1890	$class->SUPER::new (
1786	padding => 4,	1891	padding_x => 4,
		1892	padding_y => 4,
1787	fg => [1, 1, 1],	1893	fg => [1, 1, 1],
1788	active_fg => [0, 0, 1],	1894	active_fg => [0, 0, 1],
1789	can_hover => 1,	1895	can_hover => 1,
1790	align => 0,	1896	align => 0,
1791	valign => 0,	1897	valign => 0,
…		…
1800	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1801		1907
1802	$self->emit ("activate")	1908	$self->emit ("activate")
1803	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1804	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1805	}	1913	}
1806		1914
1807	sub _draw {	1915	sub _draw {
1808	my ($self) = @_;	1916	my ($self) = @_;
1809		1917
…		…
1838		1946
1839	sub new {	1947	sub new {
1840	my $class = shift;	1948	my $class = shift;
1841		1949
1842	$class->SUPER::new (	1950	$class->SUPER::new (
1843	padding => 2,	1951	padding_x => 2,
		1952	padding_y => 2,
1844	fg => [1, 1, 1],	1953	fg => [1, 1, 1],
1845	active_fg => [1, 1, 0],	1954	active_fg => [1, 1, 0],
1846	bg => [0, 0, 0, 0.2],	1955	bg => [0, 0, 0, 0.2],
1847	active_bg => [1, 1, 1, 0.5],	1956	active_bg => [1, 1, 1, 0.5],
1848	state => 0,	1957	state => 0,
…		…
1852	}	1961	}
1853		1962
1854	sub size_request {	1963	sub size_request {
1855	my ($self) = @_;	1964	my ($self) = @_;
1856		1965
1857	($self->{padding} * 2 + 6) x 2	1966	(6) x 2
1858	}	1967	}
1859		1968
1860	sub button_down {	1969	sub button_down {
1861	my ($self, $ev, $x, $y) = @_;	1970	my ($self, $ev, $x, $y) = @_;
1862		1971
1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1866	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1867	}	1980	1
1868	}	1981	}
1869		1982
1870	sub _draw {	1983	sub _draw {
1871	my ($self) = @_;	1984	my ($self) = @_;
1872		1985
1873	$self->SUPER::_draw;	1986	$self->SUPER::_draw;
1874		1987
1875	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1988	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876		1989
1877	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1990	my ($w, $h) = @$self{qw(w h)};
		1991
		1992	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878		1993
1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1994	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880		1995
1881	my $tex = $self->{state} ? $tex[1] : $tex[0];	1996	my $tex = $self->{state} ? $tex[1] : $tex[0];
1882		1997
…		…
2037		2152
2038	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2039	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2040		2155
2041	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045		2161
2046	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2047	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2147	fg => [1, 1, 1],	2263	fg => [1, 1, 1],
2148	active_fg => [0, 0, 0],	2264	active_fg => [0, 0, 0],
2149	bg => [0, 0, 0, 0.2],	2265	bg => [0, 0, 0, 0.2],
2150	active_bg => [1, 1, 1, 0.5],	2266	active_bg => [1, 1, 1, 0.5],
2151	range => [0, 0, 100, 10, 0],	2267	range => [0, 0, 100, 10, 0],
2152	req_w => $::WIDTH / 80,	2268	min_w => $::WIDTH / 80,
2153	req_h => $::WIDTH / 80,	2269	min_h => $::WIDTH / 80,
2154	vertical => 0,	2270	vertical => 0,
2155	can_hover => 1,	2271	can_hover => 1,
2156	inner_pad => 0.02,	2272	inner_pad => 0.02,
2157	@_	2273	@_
2158	);	2274	);
…		…
2161	$self->update;	2277	$self->update;
2162		2278
2163	$self	2279	$self
2164	}	2280	}
2165		2281
		2282	sub changed { }
		2283
2166	sub set_range {	2284	sub set_range {
2167	my ($self, $range) = @_;	2285	my ($self, $range) = @_;
2168		2286
2169	($range, $self->{range}) = ($self->{range}, $range);	2287	($range, $self->{range}) = ($self->{range}, $range);
2170		2288
…		…
2196	}	2314	}
2197		2315
2198	sub size_request {	2316	sub size_request {
2199	my ($self) = @_;	2317	my ($self) = @_;
2200		2318
2201	my $w = $self->{req_w};	2319	($self->{req_w}, $self->{req_h})
2202	my $h = $self->{req_h};
2203
2204	$self->{vertical} ? ($h, $w) : ($w, $h)
2205	}	2320	}
2206		2321
2207	sub button_down {	2322	sub button_down {
2208	my ($self, $ev, $x, $y) = @_;	2323	my ($self, $ev, $x, $y) = @_;
2209		2324
2210	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2211		2326
2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213		2328
2214	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2215	}	2330	}
2216		2331
2217	sub mouse_motion {	2332	sub mouse_motion {
2218	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2219		2334
…		…
2223	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2224		2339
2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226		2341
2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2342	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2343	} else {
		2344	return 0;
		2345	}
		2346
2228	}	2347	1
2229	}	2348	}
2230		2349
2231	sub update {	2350	sub update {
2232	my ($self) = @_;	2351	my ($self) = @_;
2233		2352
2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2353	delete $self->{knob_w};
		2354	$self->SUPER::update;
		2355	}
		2356
		2357	sub _draw {
		2358	my ($self) = @_;
		2359
		2360	unless ($self->{knob_w}) {
2235	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2236		2362
2237	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2238	my $range = ($hi - $page - $lo) || 1e-100;	2364	my $range = ($hi - $page - $lo) || 1e-100;
2239		2365
…		…
2245	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2246	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2247		2373
2248	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2249	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2250	});	2376	}
2251
2252	$self->SUPER::update;
2253	}
2254
2255	sub _draw {
2256	my ($self) = @_;
2257		2377
2258	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2259		2379
2260	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2261		2381
…		…
2594	}	2714	}
2595		2715
2596	sub set_tooltip_from {	2716	sub set_tooltip_from {
2597	my ($self, $widget) = @_;	2717	my ($self, $widget) = @_;
2598		2718
		2719	my $tooltip = $widget->{tooltip};
		2720
		2721	if ($ENV{CFPLUS_DEBUG} & 2) {
		2722	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2724	. "req $widget->{req_w} $widget->{req_h}\n"
		2725	. "visible $widget->{visible}";
		2726	}
		2727
2599	$self->add (new CFClient::UI::Label	2728	$self->add (new CFClient::UI::Label
2600	markup => $widget->{tooltip},	2729	markup => $tooltip,
2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602	fontsize => 0.8,	2731	fontsize => 0.8,
2603	fg => [0, 0, 0, 1],	2732	fg => [0, 0, 0, 1],
2604	ellipsise => 0,	2733	ellipsise => 0,
2605	font => ($widget->{tooltip_font} || $::FONT_PROP),	2734	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2616		2745
2617	sub size_allocate {	2746	sub size_allocate {
2618	my ($self, $w, $h) = @_;	2747	my ($self, $w, $h) = @_;
2619		2748
2620	$self->SUPER::size_allocate ($w - 4, $h - 4);	2749	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2750	}
		2751
		2752	sub visibility_change {
		2753	my ($self, $visible) = @_;
		2754
		2755	return unless $visible;
		2756
		2757	$self->{root}->on_post_alloc ("move_$self" => sub {
		2758	my $widget = $self->{owner}
		2759	or return;
		2760
		2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2762
		2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2764	if $x + $self->{w} > $::WIDTH;
		2765
		2766	$self->move_abs ($x, $y);
		2767	});
2621	}	2768	}
2622		2769
2623	sub _draw {	2770	sub _draw {
2624	my ($self) = @_;	2771	my ($self) = @_;
2625		2772
…		…
2642	glVertex $w, $h;	2789	glVertex $w, $h;
2643	glVertex $w, 0;	2790	glVertex $w, 0;
2644	glEnd;	2791	glEnd;
2645		2792
2646	glTranslate 2 - 0.375, 2 - 0.375;	2793	glTranslate 2 - 0.375, 2 - 0.375;
		2794
2647	$self->SUPER::_draw;	2795	$self->SUPER::_draw;
2648	}	2796	}
2649		2797
2650	#############################################################################	2798	#############################################################################
2651		2799
…		…
2727	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2728	}	2876	}
2729		2877
2730	#############################################################################	2878	#############################################################################
2731		2879
2732	package CFClient::UI::Inventory;	2880	package CFClient::UI::Buttonbar;
2733		2881
2734	our @ISA = CFClient::UI::ScrolledWindow::;	2882	our @ISA = CFClient::UI::HBox::;
2735		2883
2736	sub new {	2884	# TODO: should actualyl wrap buttons and other goodies.
2737	my $class = shift;
2738
2739	my $self = $class->SUPER::new (
2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741	@_,
2742	);
2743
2744	$self
2745	}
2746
2747	sub set_items {
2748	my ($self, $items) = @_;
2749
2750	$self->{scrolled}->clear;
2751	return unless $items;
2752
2753	my @items = sort {
2754	($a->{type} <=> $b->{type})
2755	or ($a->{name} cmp $b->{name})
2756	} @$items;
2757
2758	$self->{real_items} = \@items;
2759
2760	my $row = 0;
2761	for my $item (@items) {
2762	CFClient::Item::update_widgets $item;
2763
2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768	$row++;
2769	}
2770	}
2771		2885
2772	#############################################################################	2886	#############################################################################
2773		2887
2774	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2775		2889
…		…
2816	# maybe save $GRAB? must be careful about events...	2930	# maybe save $GRAB? must be careful about events...
2817	$GRAB = $self;	2931	$GRAB = $self;
2818	$self->{button} = $ev->{button};	2932	$self->{button} = $ev->{button};
2819		2933
2820	$self->show;	2934	$self->show;
2821	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822	}	2936	}
2823		2937
2824	sub mouse_motion {	2938	sub mouse_motion {
2825	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2826		2940
2827	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2828	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2830	}	2946	}
2831		2947
2832	sub button_up {	2948	sub button_up {
2833	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2834		2950
…		…
2836	undef $GRAB;	2952	undef $GRAB;
2837	$self->hide;	2953	$self->hide;
2838		2954
2839	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2840	$self->{hover}[1]->() if $self->{hover};	2956	$self->{hover}[1]->() if $self->{hover};
		2957	} else {
		2958	return 0
		2959	}
		2960
		2961	1
		2962	}
		2963
		2964	#############################################################################
		2965
		2966	package CFClient::UI::Multiplexer;
		2967
		2968	our @ISA = CFClient::UI::Container::;
		2969
		2970	sub new {
		2971	my $class = shift;
		2972
		2973	my $self = $class->SUPER::new (
		2974	@_,
		2975	);
		2976
		2977	$self->{current} = $self->{children}[0]
		2978	if @{ $self->{children} };
		2979
		2980	$self
		2981	}
		2982
		2983	sub add {
		2984	my ($self, @widgets) = @_;
		2985
		2986	$self->SUPER::add (@widgets);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990	}
		2991
		2992	sub set_current_page {
		2993	my ($self, $page_or_widget) = @_;
		2994
		2995	my $widget = ref $page_or_widget
		2996	? $page_or_widget
		2997	: $self->{children}[$page_or_widget];
		2998
		2999	$self->{current} = $widget;
		3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3001
		3002	$self->_emit (page_changed => $self->{current});
		3003
		3004	$self->realloc;
		3005	}
		3006
		3007	sub visible_children {
		3008	$_[0]{current}
		3009	}
		3010
		3011	sub size_request {
		3012	my ($self) = @_;
		3013
		3014	$self->{current}->size_request
		3015	}
		3016
		3017	sub size_allocate {
		3018	my ($self, $w, $h) = @_;
		3019
		3020	$self->{current}->configure (0, 0, $w, $h);
		3021	}
		3022
		3023	sub _draw {
		3024	my ($self) = @_;
		3025
		3026	$self->{current}->draw;
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::Notebook;
		3032
		3033	our @ISA = CFClient::UI::VBox::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (
		3039	buttonbar => (new CFClient::UI::Buttonbar),
		3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3041	# filter => # will be put between multiplexer and $self
		3042	@_,
		3043	);
2841	}	3044
		3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3046	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3047
		3048	$self
		3049	}
		3050
		3051	sub add {
		3052	my ($self, $title, $widget, $tooltip) = @_;
		3053
		3054	Scalar::Util::weaken $self;
		3055
		3056	$self->{buttonbar}->add (new CFClient::UI::Button
		3057	markup => $title,
		3058	tooltip => $tooltip,
		3059	on_activate => sub { $self->set_current_page ($widget) },
		3060	);
		3061
		3062	$self->{multiplexer}->add ($widget);
		3063	}
		3064
		3065	sub set_current_page {
		3066	my ($self, $page) = @_;
		3067
		3068	$self->{multiplexer}->set_current_page ($page);
		3069	$self->_emit (page_changed => $self->{multiplexer}{current});
2842	}	3070	}
2843		3071
2844	#############################################################################	3072	#############################################################################
2845		3073
2846	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2951	$self->SUPER::reconfigure;	3179	$self->SUPER::reconfigure;
2952	}	3180	}
2953		3181
2954	#############################################################################	3182	#############################################################################
2955		3183
2956	package CFClient::UI::Root;	3184	package CFClient::UI::Inventory;
2957		3185
2958	our @ISA = CFClient::UI::Container::;	3186	our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960	use CFClient::OpenGL;
2961		3187
2962	sub new {	3188	sub new {
2963	my $class = shift;	3189	my $class = shift;
2964		3190
2965	$class->SUPER::new (	3191	my $self = $class->SUPER::new (
		3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3193	@_,
		3194	);
		3195
		3196	$self
		3197	}
		3198
		3199	sub set_items {
		3200	my ($self, $items) = @_;
		3201
		3202	$self->{child}->clear;
		3203	return unless $items;
		3204
		3205	my @items = sort {
		3206	($a->{type} <=> $b->{type})
		3207	or ($a->{name} cmp $b->{name})
		3208	} @$items;
		3209
		3210	$self->{real_items} = \@items;
		3211
		3212	my $row = 0;
		3213	for my $item (@items) {
		3214	CFClient::Item::update_widgets $item;
		3215
		3216	$self->{child}->add (0, $row, $item->{face_widget});
		3217	$self->{child}->add (1, $row, $item->{desc_widget});
		3218	$self->{child}->add (2, $row, $item->{weight_widget});
		3219
		3220	$row++;
		3221	}
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::BindEditor;
		3227
		3228	our @ISA = CFClient::UI::FancyFrame::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3234
		3235	$self->add (my $vb = new CFClient::UI::VBox);
		3236
		3237
		3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3239	text => "start recording",
		3240	tooltip => "Start/Stops recording of actions."
		3241	."All subsequent actions after the recording started will be captured."
		3242	."The actions are displayed after the record was stopped."
		3243	."To bind the action you have to click on the 'Bind' button",
		3244	on_activate => sub {
		3245	unless ($self->{recording}) {
		3246	$self->start;
		3247	} else {
		3248	$self->stop;
		3249	}
		3250	});
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Actions:");
		3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3254
		3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3256	$vb->add (my $hb = new CFClient::UI::HBox);
		3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3258	$hb->add (new CFClient::UI::Button
		3259	text => "bind",
		3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3261	on_activate => sub {
		3262	$self->ask_for_bind;
		3263	});
		3264
		3265	$vb->add (my $hb = new CFClient::UI::HBox);
		3266	$hb->add (new CFClient::UI::Button
		3267	text => "ok",
		3268	expand => 1,
		3269	tooltip => "This closes the binding editor and saves the binding",
		3270	on_activate => sub {
		3271	$self->hide;
		3272	$self->commit;
		3273	});
		3274
		3275	$hb->add (new CFClient::UI::Button
		3276	text => "cancel",
		3277	expand => 1,
		3278	tooltip => "This closes the binding editor without saving",
		3279	on_activate => sub {
		3280	$self->hide;
		3281	$self->{binding_cancel}->()
		3282	if $self->{binding_cancel};
		3283	});
		3284
		3285	$self->update_binding_widgets;
		3286
		3287	$self
		3288	}
		3289
		3290	sub commit {
		3291	my ($self) = @_;
		3292	my ($mod, $sym, $cmds) = $self->get_binding;
		3293	if ($sym != 0 && @$cmds > 0) {
		3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3295	."'. Don't forget 'Save Config'!");
		3296	$self->{binding_change}->($mod, $sym, $cmds)
		3297	if $self->{binding_change};
		3298	} else {
		3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3300	$self->{binding_cancel}->()
		3301	if $self->{binding_cancel};
		3302	}
		3303	}
		3304
		3305	sub start {
		3306	my ($self) = @_;
		3307
		3308	$self->{rec_btn}->set_text ("stop recording");
		3309	$self->{recording} = 1;
		3310	$self->clear_command_list;
		3311	$::CONN->start_record if $::CONN;
		3312	}
		3313
		3314	sub stop {
		3315	my ($self) = @_;
		3316
		3317	$self->{rec_btn}->set_text ("start recording");
		3318	$self->{recording} = 0;
		3319
		3320	my $rec;
		3321	$rec = $::CONN->stop_record if $::CONN;
		3322	return unless ref $rec eq 'ARRAY';
		3323	$self->set_command_list ($rec);
		3324	}
		3325
		3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
		3332	sub ask_for_bind {
		3333	my ($self, $commit) = @_;
		3334
		3335	CFClient::Binder::open_binding_dialog (sub {
		3336	my ($mod, $sym) = @_;
		3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3338	$self->update_binding_widgets;
		3339	$self->commit if $commit;
		3340	});
		3341	}
		3342
		3343	# $mod and $sym are the modifiers and key symbol
		3344	# $cmds is a array ref of strings (the commands)
		3345	# $cb is the callback that is executed on OK
		3346	# $ccb is the callback that is executed on CANCEL and
		3347	# when the binding was unsuccessful on OK
		3348	sub set_binding {
		3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3350
		3351	$self->clear_command_list;
		3352	$self->{recording} = 0;
		3353	$self->{rec_btn}->set_text ("start recording");
		3354
		3355	$self->{binding} = [$mod, $sym];
		3356	$self->{commands} = $cmds;
		3357
		3358	$self->{binding_change} = $cb;
		3359	$self->{binding_cancel} = $ccb;
		3360
		3361	$self->update_binding_widgets;
		3362	}
		3363
		3364	# this is a shortcut method that asks for a binding
		3365	# and then just binds it.
		3366	sub do_quick_binding {
		3367	my ($self, $cmds) = @_;
		3368	$self->set_binding (undef, undef, $cmds, sub {
		3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3370	});
		3371	$self->ask_for_bind (1);
		3372	}
		3373
		3374	sub update_binding_widgets {
		3375	my ($self) = @_;
		3376	my ($mod, $sym, $cmds) = $self->get_binding;
		3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3378	$self->set_command_list ($cmds);
		3379	}
		3380
		3381	sub get_binding {
		3382	my ($self) = @_;
		3383	return (
		3384	$self->{binding}->[0],
		3385	$self->{binding}->[1],
		3386	[ grep { defined $_ } @{$self->{commands}} ]
		3387	);
		3388	}
		3389
		3390	sub clear_command_list {
		3391	my ($self) = @_;
		3392	$self->{cmdbox}->clear ();
		3393	}
		3394
		3395	sub set_command_list {
		3396	my ($self, $cmds) = @_;
		3397
		3398	$self->{cmdbox}->clear ();
		3399	$self->{commands} = $cmds;
		3400
		3401	my $idx = 0;
		3402
		3403	for (@$cmds) {
		3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3405
		3406	my $i = $idx;
		3407	$hb->add (new CFClient::UI::Label text => $_);
		3408	$hb->add (new CFClient::UI::Button
		3409	text => "delete",
		3410	tooltip => "Deletes the action from the record",
		3411	on_activate => sub {
		3412	$self->{cmdbox}->remove ($hb);
		3413	$cmds->[$i] = undef;
		3414	});
		3415
		3416
		3417	$idx++
		3418	}
		3419	}
		3420
		3421	#############################################################################
		3422
		3423	package CFClient::UI::SpellList;
		3424
		3425	our @ISA = CFClient::UI::Table::;
		3426
		3427	sub new {
		3428	my $class = shift;
		3429
		3430	my $self = $class->SUPER::new (
		3431	binding => [],
		3432	commands => [],
		3433	@_,
		3434	)
		3435	}
		3436
		3437	# XXX: Do sorting? Argl...
		3438	sub add_spell {
		3439	my ($self, $spell) = @_;
		3440	$self->{spells}->{$spell->{name}} = $spell;
		3441
		3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3443	face => $spell->{face},
		3444	can_hover => 1,
		3445	can_events => 1,
		3446	tooltip => $spell->{message});
		3447
		3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => $spell->{name},
		3450	can_hover => 1,
		3451	can_events => 1,
		3452	tooltip => $spell->{message},
		3453	expand => 1);
		3454
		3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3458	expand => 1);
		3459
		3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3461	text => "bind to key",
		3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3463	}
		3464
		3465	sub rebuild_spell_list {
		3466	my ($self) = @_;
		3467	$self->{tbl_idx} = 0;
		3468	$self->add_spell ($_) for values %{$self->{spells}};
		3469	}
		3470
		3471	sub remove_spell {
		3472	my ($self, $spell) = @_;
		3473	delete $self->{spells}->{$spell->{name}};
		3474	$self->rebuild_spell_list;
		3475	}
		3476
		3477	#############################################################################
		3478
		3479	package CFClient::UI::Root;
		3480
		3481	our @ISA = CFClient::UI::Container::;
		3482
		3483	use CFClient::OpenGL;
		3484
		3485	sub new {
		3486	my $class = shift;
		3487
		3488	my $self = $class->SUPER::new (
2966	visible => 1,	3489	visible => 1,
2967	@_,	3490	@_,
2968	)	3491	);
2969	}
2970		3492
2971	sub configure {	3493	Scalar::Util::weaken ($self->{root} = $self);
2972	my ($self, $x, $y, $w, $h) = @_;
2973		3494
2974	$self->{w} = $w;	3495	$self
2975	$self->{h} = $h;
2976	}
2977
2978	sub check_size {
2979	my ($self) = @_;
2980
2981	$self->size_allocate ($self->{w}, $self->{h})
2982	if $self->{w};
2983	}	3496	}
2984		3497
2985	sub size_request {	3498	sub size_request {
2986	my ($self) = @_;	3499	my ($self) = @_;
2987		3500
2988	($self->{w}, $self->{h})	3501	($self->{w}, $self->{h})
		3502	}
		3503
		3504	sub _to_pixel {
		3505	my ($coord, $size, $max) = @_;
		3506
		3507	$coord =
		3508	$coord eq "center" ? ($max - $size) * 0.5
		3509	: $coord eq "max" ? $max
		3510	: $coord;
		3511
		3512	$coord = 0 if $coord < 0;
		3513	$coord = $max - $size if $coord > $max - $size;
		3514
		3515	int $coord + 0.5
2989	}	3516	}
2990		3517
2991	sub size_allocate {	3518	sub size_allocate {
2992	my ($self, $w, $h) = @_;	3519	my ($self, $w, $h) = @_;
2993		3520
2994	for my $child ($self->children) {	3521	for my $child ($self->children) {
2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996		3523
2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3524	$X = $child->{force_x} if exists $child->{force_x};
2998	if exists $child->{req_x};	3525	$Y = $child->{force_y} if exists $child->{force_y};
2999		3526
3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3527	$X = _to_pixel $X, $W, $self->{w};
3001	if exists $child->{req_y};	3528	$Y = _to_pixel $Y, $H, $self->{h};
3002
3003	delete @$child{qw(req_x req_y)};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3529
3008	$child->configure ($X, $Y, $W, $H);	3530	$child->configure ($X, $Y, $W, $H);
3009	}	3531	}
3010	}	3532	}
3011		3533
…		…
3022	}	3544	}
3023		3545
3024	sub update {	3546	sub update {
3025	my ($self) = @_;	3547	my ($self) = @_;
3026		3548
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3549	$::WANT_REFRESH++;
3029	}	3550	}
3030		3551
3031	sub add {	3552	sub add {
3032	my ($self, @children) = @_;	3553	my ($self, @children) = @_;
3033		3554
3034	for my $child (@children) {
3035	$child->{is_toplevel} = 1;	3555	$_->{is_toplevel} = 1
3036		3556	for @children;
3037	# integerise window positions
3038	$child->{x} = int $child->{x};
3039	$child->{y} = int $child->{y};
3040	}
3041		3557
3042	$self->SUPER::add (@children);	3558	$self->SUPER::add (@children);
3043
3044	for (my @widgets = @children; my $w = pop @widgets; ) {
3045	push @widgets, $w->children;
3046	$w->set_visible;
3047	}
3048
3049	}	3559	}
3050		3560
3051	sub remove {	3561	sub remove {
3052	my ($self, @children) = @_;	3562	my ($self, @children) = @_;
3053		3563
3054	$self->SUPER::remove (@children);	3564	$self->SUPER::remove (@children);
		3565
		3566	delete $self->{is_toplevel}
		3567	for @children;
3055		3568
3056	while (@children) {	3569	while (@children) {
3057	my $w = pop @children;	3570	my $w = pop @children;
3058	push @children, $w->children;	3571	push @children, $w->children;
3059	$w->set_invisible;	3572	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3591	while ($self->{refresh_hook}) {
3079	$_->()	3592	$_->()
3080	for values %{delete $self->{refresh_hook}};	3593	for values %{delete $self->{refresh_hook}};
3081	}	3594	}
3082		3595
3083	if ($self->{check_size}) {	3596	if ($self->{realloc}) {
		3597	my %queue;
3084	my @queue;	3598	my @queue;
		3599	my $widget;
3085		3600
3086	for (;;) {	3601	outer:
3087	if ($self->{check_size}) {	3602	while () {
3088	#TODO use array-of-depth approach	3603	if (my $realloc = delete $self->{realloc}) {
		3604	for $widget (values %$realloc) {
		3605	$widget->{visible} or next; # do not resize invisible widgets
3089		3606
3090	@queue = sort { $a->{visible} <=> $b->{visible} }	3607	$queue{$widget+0}++ and next; # duplicates are common
3091	@queue, values %{delete $self->{check_size}};	3608
		3609	push @{ $queue[$widget->{visible}] }, $widget;
		3610	}
3092	}	3611	}
3093		3612
		3613	while () {
		3614	@queue or last outer;
		3615
3094	my $widget = pop @queue || last;	3616	$widget = pop @{ $queue[-1] || [] }
3095		3617	and last;
3096	defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099	? @$widget{qw(def_w def_h)}
3100	: $widget->size_request;
3101
3102	if (delete $widget->{force_alloc}
3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105		3618
		3619	pop @queue;
		3620	}
		3621
		3622	delete $queue{$widget+0};
		3623
		3624	my ($w, $h) = $widget->size_request;
		3625
		3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3628
		3629	$w = $widget->{force_w} if exists $widget->{force_w};
		3630	$h = $widget->{force_h} if exists $widget->{force_h};
		3631
		3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3633	|| delete $widget->{force_realloc}) {
3106	$widget->{req_w} = $w;	3634	$widget->{req_w} = $w;
3107	$widget->{req_h} = $h;	3635	$widget->{req_h} = $h;
3108		3636
3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3637	$self->{size_alloc}{$widget+0} = $widget;
3110		3638
3111	$widget->{parent}->check_size
3112	if $widget->{parent};	3639	if (my $parent = $widget->{parent}) {
		3640	$self->{realloc}{$parent+0} = $parent
		3641	unless $queue{$parent+0};
		3642
		3643	$parent->{force_size_alloc} = 1;
		3644	$self->{size_alloc}{$parent+0} = $parent;
		3645	}
3113	}	3646	}
		3647
		3648	delete $self->{realloc}{$widget+0};
3114	}	3649	}
3115	}	3650	}
3116		3651
3117	while ($self->{size_alloc}) {	3652	while (my $size_alloc = delete $self->{size_alloc}) {
3118	for (values %{delete $self->{size_alloc}}) {	3653	my @queue = sort { $b->{visible} <=> $a->{visible} }
3119	my ($widget, $w, $h) = @$_;	3654	values %$size_alloc;
		3655
		3656	while () {
		3657	my $widget = pop @queue || last;
		3658
		3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120		3660
3121	$w = 0 if $w < 0;	3661	$w = 0 if $w < 0;
3122	$h = 0 if $h < 0;	3662	$h = 0 if $h < 0;
3123		3663
		3664	$w = int $w + 0.5;
		3665	$h = int $h + 0.5;
		3666
		3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3668	$widget->{old_w} = $widget->{w};
		3669	$widget->{old_h} = $widget->{h};
		3670
3124	$widget->{w} = $w;	3671	$widget->{w} = $w;
3125	$widget->{h} = $h;	3672	$widget->{h} = $h;
		3673
3126	$widget->emit (size_allocate => $w, $h);	3674	$widget->emit (size_allocate => $w, $h);
		3675	}
3127	}	3676	}
3128	}	3677	}
3129		3678
3130	while ($self->{post_alloc_hook}) {	3679	while ($self->{post_alloc_hook}) {
3131	$_->()	3680	$_->()
3132	for values %{delete $self->{post_alloc_hook}};	3681	for values %{delete $self->{post_alloc_hook}};
3133	}	3682	}
		3683
3134		3684
3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137	glClear GL_COLOR_BUFFER_BIT;	3687	glClear GL_COLOR_BUFFER_BIT;
3138		3688
…		…
3140	glLoadIdentity;	3690	glLoadIdentity;
3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3143	glLoadIdentity;	3693	glLoadIdentity;
3144		3694
		3695	{
		3696	package CFClient::UI::Base;
		3697
		3698	($draw_x, $draw_y, $draw_w, $draw_h) =
		3699	(0, 0, $self->{w}, $self->{h});
		3700	}
		3701
3145	$self->_draw;	3702	$self->_draw;
3146	}	3703	}
3147		3704
3148	#############################################################################	3705	#############################################################################
3149		3706

Diff Legend

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