[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.178 by root, Tue Apr 25 13:51:48 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC

…		…
232	$self->{y} = $y;	232	$self->{y} = $y;
233	$self->update;	233	$self->update;
234	}	234	}
235		235
236	if ($self->{w} != $w \|\| $self->{h} != $h) {	236	if ($self->{w} != $w \|\| $self->{h} != $h) {
237	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	}	238	}
243	}	239	}
244		240
245	sub size_allocate {	241	sub size_allocate {
246	# nothing to be done	242	# nothing to be done
247	}	243	}
248		244
249	sub children {	245	sub children {
250	}	246	}
251		247
252	# call when resoltuion changes etc.	248	# call when resolution changes etc.
253	sub reconfigure {	249	sub reconfigure {
254	my ($self) = @_;	250	my ($self) = @_;
255		251
256	$_->reconfigure	252	$_->reconfigure
257	for $self->children;	253	for $self->children;
258		254
259	$_->check_size;	255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
260	}	258	}
261		259
262	sub set_max_size {	260	sub set_max_size {
263	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
264		262
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}
268
269	# return top left coordinates
270	sub _topleft {
271	my ($self, $x, $y) = @_;
272
273	$self->{parent}
274	or Carp::confess "no parent widget in _topleft\n";#d#
275
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277	}	265	}
278		266
279	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
280	sub coord2local {	268	sub coord2local {
281	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
282		270
283	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	272	}
286		273
287	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
288	sub coord2global {	275	sub coord2global {
289	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
290		277
291	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	279	}
294		280
295	sub focus_in {	281	sub focus_in {
296	my ($self) = @_;	282	my ($self) = @_;
297		283
…		…
394	}	380	}
395		381
396	sub set_parent {	382	sub set_parent {
397	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
398		384
		385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
399	Scalar::Util::weaken ($self->{parent} = $parent);	386	Scalar::Util::weaken ($self->{parent} = $parent);
400	}	387	}
401		388
402	sub check_size {	389	sub check_size {
403	my ($self) = @_;	390	my ($self) = @_;
404		391
405	$self->{parent}	392	$CFClient::UI::ROOT->{check_size}{$self} = $self;
406	or return 1;
407
408	my ($w, $h) = $self->{user_w} && $self->{user_h}
409	? @$self{qw(user_w user_h)}
410	: $self->size_request;
411
412	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
413	$self->{req_w} = $w;
414	$self->{req_h} = $h;
415
416	$self->{parent}->check_size
417	or $self->size_allocate (
418	(List::Util::max $self->{w}, $w),
419	(List::Util::max $self->{h}, $h),
420	);
421
422	1
423	} else {
424	0
425	}
426	}	393	}
427		394
428	sub update {	395	sub update {
429	my ($self) = @_;	396	my ($self) = @_;
430		397
…		…
527		494
528	$self	495	$self
529	}	496	}
530		497
531	sub add {	498	sub add {
532	my ($self, $child) = @_;	499	my ($self, @widgets) = @_;
533		500
534	$child->set_parent ($self);	501	$_->set_parent ($self)
		502	for @widgets;
535		503
536	use sort 'stable';	504	use sort 'stable';
537		505
538	$self->{children} = [	506	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	507	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	508	@{$self->{children}}, @widgets
541	];	509	];
542		510
543	$child->check_size;	511	$_->check_size
		512	for @widgets;
		513
		514	$self->update;
544	}	515	}
545		516
546	sub children {	517	sub children {
547	@{ $_[0]{children} }	518	@{ $_[0]{children} }
548	}	519	}
…		…
567		538
568	for (@$children) {	539	for (@$children) {
569	delete $_->{parent};	540	delete $_->{parent};
570	$_->hide;	541	$_->hide;
571	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
572	}	546	}
573		547
574	sub find_widget {	548	sub find_widget {
575	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
576		550
…		…
662		636
663	$self->SUPER::size_allocate ($w, $h);	637	$self->SUPER::size_allocate ($w, $h);
664	$self->update;	638	$self->update;
665	}	639	}
666		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
667	sub render_child {	645	sub render_child {
668	my ($self) = @_;	646	my ($self) = @_;
669		647
670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671	glClearColor 0, 0, 0, 0;	649	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	650	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	651
		652	$self->_render;
674	# glColorMask 1, 1, 1, 0;	653	# glColorMask 1, 1, 1, 0;
675	# glEnable GL_BLEND;	654	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;	655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;	656	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};	657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
…		…
705		684
706	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
707		686
708	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
709		688
710	sub new { die }
711
712	sub size_request {	689	sub size_request {
713	my ($self) = @_;	690	my ($self) = @_;
714		691
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
717		694
718	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
719	}	696	}
720		697
721	sub _draw {	698	sub size_allocate {
722	my ($self) = @_;	699	my ($self, $w, $h) = @_;
723		700
724	$self->{children}[1]->draw;	701	$self->update;
725	}	702	}
726		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
		706
		707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
		709
		710	$self->update;
		711	}
		712
		713	# hmm, this does not work for topleft of $self... but we should not ask for that
		714	sub coord2local {
		715	my ($self, $x, $y) = @_;
		716
		717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
		727	}
		728
		729	sub find_widget {
		730	my ($self, $x, $y) = @_;
		731
		732	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		733	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		734	) {
		735	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		736	} else {
		737	$self->CFClient::UI::Base::find_widget ($x, $y)
		738	}
		739	}
		740
		741	sub _render {
		742	my ($self) = @_;
		743
		744	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		745
		746	$self->SUPER::_render;
		747	}
		748
		749	#############################################################################
		750
		751	package CFClient::UI::ScrolledWindow;
		752
		753	our @ISA = CFClient::UI::HBox::;
		754
		755	sub new {
		756	my $class = shift;
		757
		758	my $self;
		759
		760	my $slider = new CFClient::UI::Slider
		761	vertical => 1,
		762	range => [0, 0, 1, 0.01], # HACK fix
		763	connect_changed => sub {
		764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		765	},
		766	;
		767
		768	$self = $class->SUPER::new (
		769	vp => (new CFClient::UI::ViewPort),
		770	slider => $slider,
		771	@_,
		772	);
		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
		778	$self
		779	}
		780
		781	#TODO# update range on size_allocate depeneing on child
		782	# update viewport offset on scroll
727		783
728	#############################################################################	784	#############################################################################
729		785
730	package CFClient::UI::Frame;	786	package CFClient::UI::Frame;
731		787
…		…
1244		1300
1245	delete $self->{texture};	1301	delete $self->{texture};
1246	$self->SUPER::update;	1302	$self->SUPER::update;
1247	}	1303	}
1248		1304
1249	sub reconfigure {
1250	my ($self) = @_;
1251
1252	delete $self->{texture};
1253	}
1254
1255	sub set_text {	1305	sub set_text {
1256	my ($self, $text) = @_;	1306	my ($self, $text) = @_;
1257		1307
1258	return if $self->{text} eq "T$text";	1308	return if $self->{text} eq "T$text";
1259	$self->{text} = "T$text";	1309	$self->{text} = "T$text";
1260		1310
1261	$self->{layout}->set_text ($text);	1311	$self->{layout}->set_text ($text);
1262		1312
1263	delete $self->{texture};
1264	$self->update;	1313	$self->update;
1265	$self->check_size;	1314	$self->check_size;
1266	}	1315	}
1267		1316
1268	sub set_markup {	1317	sub set_markup {
…		…
1271	return if $self->{text} eq "M$markup";	1320	return if $self->{text} eq "M$markup";
1272	$self->{text} = "M$markup";	1321	$self->{text} = "M$markup";
1273		1322
1274	$self->{layout}->set_markup ($markup);	1323	$self->{layout}->set_markup ($markup);
1275		1324
1276	delete $self->{texture};
1277	$self->update;	1325	$self->update;
1278	$self->check_size;	1326	$self->check_size;
1279	}	1327	}
1280		1328
1281	sub size_request {	1329	sub size_request {
…		…
1312	sub set_fontsize {	1360	sub set_fontsize {
1313	my ($self, $fontsize) = @_;	1361	my ($self, $fontsize) = @_;
1314		1362
1315	$self->{fontsize} = $fontsize;	1363	$self->{fontsize} = $fontsize;
1316	delete $self->{texture};	1364	delete $self->{texture};
		1365
		1366	$self->update;
1317	$self->check_size;	1367	$self->check_size;
1318	$self->update;
1319	}	1368	}
1320		1369
1321	sub _draw {	1370	sub _draw {
1322	my ($self) = @_;	1371	my ($self) = @_;
1323		1372
…		…
1957	# TODO: calculations are off	2006	# TODO: calculations are off
1958	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1959	fg => [1, 1, 1],	2008	fg => [1, 1, 1],
1960	active_fg => [0, 0, 0],	2009	active_fg => [0, 0, 0],
1961	range => [0, 0, 100, 10],	2010	range => [0, 0, 100, 10],
1962	req_w => 20,	2011	req_w => $::WIDTH / 80,
1963	req_h => 20,	2012	req_h => $::WIDTH / 80,
1964	vertical => 0,	2013	vertical => 0,
1965	can_hover => 1,	2014	can_hover => 1,
1966	inner_pad => 5,	2015	inner_pad => 5,
1967	@_	2016	@_
1968	);	2017	);
…		…
2402		2451
2403	sub size_request {	2452	sub size_request {
2404	(32, 8)	2453	(32, 8)
2405	}	2454	}
2406		2455
2407	sub draw {	2456	sub _draw {
2408	my ($self) = @_;	2457	my ($self) = @_;
2409		2458
		2459	return unless $::CONN;#d# manage and cache textures differently
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411		2461
2412	# TODO animation	2462	# TODO animation
2413	if ($tex) {	2463	if ($tex) {
2414	glEnable GL_BLEND;	2464	glEnable GL_BLEND;
…		…
2422	}	2472	}
2423	}	2473	}
2424		2474
2425	#############################################################################	2475	#############################################################################
2426		2476
		2477	package CFClient::UI::InventoryItem;
		2478
		2479	our @ISA = CFClient::UI::HBox::;
		2480
		2481	sub new {
		2482	my $class = shift;
		2483
		2484	my %args = @_;
		2485
		2486	my $item = delete $args{item};
		2487
		2488	my $desc = $item->{nrof} < 2
		2489	? $item->{name}
		2490	: "$item->{nrof} $item->{name_pl}";
		2491
		2492
		2493	my $self = $class->SUPER::new (
		2494	can_hover => 1,
		2495	can_events => 1,
		2496	tooltip => (CFClient::UI::Label->escape ($desc)
		2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2498	connect_button_down => sub {
		2499	my ($self, $ev, $x, $y) = @_;
		2500
		2501	# todo: maybe put examine on 1? but should just be a tooltip :(
		2502	if ($ev->{button} == 1) {
		2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2504	} elsif ($ev->{button} == 2) {
		2505	$::CONN->send ("apply $item->{tag}");
		2506	} elsif ($ev->{button} == 3) {
		2507	CFClient::UI::Menu->new (
		2508	items => [
		2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2510	[
		2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2512	sub { $::CONN->send ("lock $item->{tag}") },
		2513	],
		2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2517	],
		2518	)->popup ($ev);
		2519	}
		2520
		2521	1
		2522	},
		2523	%args
		2524	);
		2525
		2526	$self->add (new CFClient::UI::Face
		2527	can_events => 0,
		2528	face => $item->{face},
		2529	anim => $item->{anim},
		2530	animspeed => $item->{animspeed},
		2531	);
		2532
		2533	$self->add (new CFClient::UI::Label
		2534	can_events => 0,
		2535	text => $desc,
		2536	);
		2537
		2538	$self
		2539	}
		2540
		2541	#############################################################################
		2542
		2543	package CFClient::UI::Inventory;
		2544
		2545	our @ISA = CFClient::UI::ScrolledWindow::;
		2546
		2547	sub new {
		2548	my $class = shift;
		2549
		2550	my $self = $class->SUPER::new (
		2551	scrolled => (new CFClient::UI::VBox),
		2552	@_,
		2553	);
		2554
		2555	$self
		2556	}
		2557
		2558	sub set_items {
		2559	my ($self, $items) = @_;
		2560
		2561	$self->{scrolled}->clear;
		2562	return unless $items;
		2563
		2564	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2565
		2566	$self->{real_items} = \@items;
		2567
		2568	for my $item (@items) {
		2569	my $desc = $item->{nrof} < 2
		2570	? $item->{name}
		2571	: "$item->{nrof} $item->{name_pl}";
		2572
		2573	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
		2574	}
		2575
		2576	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2577	}
		2578
		2579	sub size_request {
		2580	my ($self) = @_;
		2581	($self->{req_w}, $self->{req_h});
		2582	}
		2583
		2584	#############################################################################
		2585
2427	package CFClient::UI::Menu;	2586	package CFClient::UI::Menu;
2428		2587
2429	our @ISA = CFClient::UI::FancyFrame::;	2588	our @ISA = CFClient::UI::FancyFrame::;
2430		2589
2431	use CFClient::OpenGL;	2590	use CFClient::OpenGL;
…		…
2475	}	2634	}
2476		2635
2477	sub mouse_motion {	2636	sub mouse_motion {
2478	my ($self, $ev, $x, $y) = @_;	2637	my ($self, $ev, $x, $y) = @_;
2479		2638
2480	# TODO: should use vbox->fdind_widget or so	2639	# TODO: should use vbox->find_widget or so
2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2640	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482	$self->{hover} = $self->{item}{$HOVER};	2641	$self->{hover} = $self->{item}{$HOVER};
2483	}	2642	}
2484		2643
2485	sub button_up {	2644	sub button_up {
…		…
2500		2659
2501	our @ISA = CFClient::UI::Container::;	2660	our @ISA = CFClient::UI::Container::;
2502		2661
2503	use CFClient::OpenGL;	2662	use CFClient::OpenGL;
2504		2663
2505	sub check_size {	2664	sub new {
2506	my ($self) = @_;	2665	my $class = shift;
2507		2666
2508	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2667	$class->SUPER::new (
2509	}	2668	@_,
2510		2669	)
2511	sub size_request {
2512	($::WIDTH, $::HEIGHT)
2513	}	2670	}
2514		2671
2515	sub configure {	2672	sub configure {
2516	my ($self, $x, $y, $w, $h) = @_;	2673	my ($self, $x, $y, $w, $h) = @_;
2517		2674
2518	$self->SUPER::configure ($x, $y, $w, $h);	2675	$self->{w} = $w;
		2676	$self->{h} = $h;
		2677	}
2519		2678
		2679	sub check_size {
		2680	my ($self) = @_;
		2681
		2682	$self->size_allocate ($self->{w}, $self->{h})
		2683	if $self->{w};
		2684	}
		2685
		2686	sub size_request {
		2687	my ($self) = @_;
		2688
		2689	($self->{w}, $self->{h})
		2690	}
		2691
		2692	sub size_allocate {
		2693	my ($self, $w, $h) = @_;
		2694
		2695	my $old_w = $self->{old_w};
		2696	my $old_h = $self->{old_h};
		2697
		2698	if ($old_w && $old_h) {
		2699	for my $child ($self->children) {
		2700	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2701	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2702	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2703	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2704	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2705	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2706	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2707	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2708	}
		2709	}
		2710
2520	for my $child (@{$self->{children}}) {	2711	for my $child ($self->children) {
2521	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2712	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522		2713
2523	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2714	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2524	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2715	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2525	$child->configure ($X, $Y, $W,$H);	2716	$child->configure ($X, $Y, $W, $H);
2526	}	2717	}
2527	}
2528		2718
2529	sub _topleft {	2719	$self->{old_w} = $w;
		2720	$self->{old_h} = $h;
		2721	}
		2722
		2723	sub coord2local {
2530	my ($self, $x, $y) = @_;	2724	my ($self, $x, $y) = @_;
2531		2725
2532	($x, $y)	2726	($x, $y)
2533	}	2727	}
2534		2728
		2729	sub coord2global {
		2730	my ($self, $x, $y) = @_;
		2731
		2732	($x, $y)
		2733	}
		2734
2535	sub update {	2735	sub update {
2536	my ($self) = @_;	2736	my ($self) = @_;
2537		2737
2538	$self->check_size;	2738	$self->check_size;
2539	::refresh ();	2739	$::WANT_REFRESH++;
2540	}	2740	}
2541		2741
2542	sub add {	2742	sub add {
2543	my ($self, $child) = @_;	2743	my ($self, $child) = @_;
2544		2744
2545	# integerize window positions	2745	# integerise window positions
2546	$child->{x} = int $child->{x};	2746	$child->{x} = int $child->{x};
2547	$child->{y} = int $child->{y};	2747	$child->{y} = int $child->{y};
2548		2748
2549	$self->SUPER::add ($child);	2749	$self->SUPER::add ($child);
2550	}	2750	}
…		…
2553	my ($self, $id, $cb) = @_;	2753	my ($self, $id, $cb) = @_;
2554		2754
2555	$self->{refresh_hook}{$id} = $cb;	2755	$self->{refresh_hook}{$id} = $cb;
2556	}	2756	}
2557		2757
2558	sub draw {	2758	sub draw {
2559	my ($self) = @_;	2759	my ($self) = @_;
2560		2760
		2761	if ($self->{check_size}) {
		2762	my @queue = ([], []);
		2763
		2764	for (;;) {
		2765	if ($self->{check_size}) {
		2766	# heuristic: check containers last
		2767	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2768	for values %{delete $self->{check_size}}
		2769	}
		2770
		2771	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2772
		2773	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2774	? @$widget{qw(user_w user_h)}
		2775	: $widget->size_request;
		2776
		2777	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {
		2778	$widget->{req_w} = $w;
		2779	$widget->{req_h} = $h;
		2780
		2781	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2782
		2783	$widget->{parent}->check_size
		2784	if $widget->{parent};
		2785	}
		2786	}
		2787	}
		2788
		2789	while ($self->{size_alloc}) {
		2790	for (values %{delete $self->{size_alloc}}) {
		2791	my ($widget, $w, $h) = @$_;
		2792
		2793	$widget->{w} = $w;
		2794	$widget->{h} = $h;
		2795	$widget->size_allocate ($w, $h);
		2796	$widget->emit (size_allocate => $w, $h);
		2797	}
		2798	}
		2799
2561	while (my $rcb = delete $self->{refresh_hook}) {	2800	while ($self->{refresh_hook}) {
2562	$_->() for values %$rcb;	2801	$_->()
		2802	for values %{delete $self->{refresh_hook}};
2563	}	2803	}
2564		2804
2565	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567	glClear GL_COLOR_BUFFER_BIT;	2807	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.178 by root, Tue Apr 25 13:51:48 2006 UTC vs. Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.178 by root, Tue Apr 25 13:51:48 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC