ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub 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
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
40 if (!$GRAB) { 45 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
43 48
44 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
45 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
46 53
47 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
48 55
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 57
51 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 59 $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 } 60 }
63 61
64 return; 62 return;
65 } 63 }
66 } 64 }
… …
172sub rescale_widgets { 170sub rescale_widgets {
173 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
174 172
175 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $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}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
183 } 188 }
184 } 189 }
185 190
186 reconfigure_widgets; 191 reconfigure_widgets;
187} 192}
… …
196 201
197sub new { 202sub new {
198 my $class = shift; 203 my $class = shift;
199 204
200 my $self = bless { 205 my $self = bless {
201 x => 0, 206 x => "center",
202 y => 0, 207 y => "center",
203 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
204 can_events => 1, 211 can_events => 1,
205 @_ 212 @_
206 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 216
208 for (keys %$self) { 217 for (keys %$self) {
209 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
211 } 220 }
212 } 221 }
213 222
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $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; 227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
221 } 233 }
222 234
223 $self 235 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 236}
235 237
236sub destroy { 238sub destroy {
237 my ($self) = @_; 239 my ($self) = @_;
238 240
… …
246 return if $self->{parent}; 248 return if $self->{parent};
247 249
248 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
249} 251}
250 252
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible { 253sub set_visible {
264 my ($self) = @_; 254 my ($self) = @_;
265 255
266 return if $self->{visible}; 256 return if $self->{visible};
267 257
268 $self->{root} = $self->{parent}{root}; 258 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 259 $self->{visible} = $self->{parent}{visible} + 1;
270 260
271 $self->emit (visibility_change => 1); 261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
272} 266}
273 267
274sub set_invisible { 268sub set_invisible {
275 my ($self) = @_; 269 my ($self) = @_;
276 270
277 return unless $self->{visible}; 271 return unless $self->{visible};
278 272
279 # broken show/hide model 273 $_->set_invisible for $self->children;
280 274
281 delete $self->{root}; 275 delete $self->{root};
282 delete $self->{visible}; 276 delete $self->{visible};
283 277
284 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
286 280
287 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
289 283
290 $self->focus_out; 284 $self->focus_out;
291 285
292 $self->emit (visibility_change => 0); 286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
293} 304}
294 305
295sub hide { 306sub hide {
296 my ($self) = @_; 307 my ($self) = @_;
297 308
… …
299 310
300 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
301 if $self->{parent}; 312 if $self->{parent};
302} 313}
303 314
304sub move { 315sub move_abs {
305 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
306 317
307 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
310 321
311 $self->update; 322 $self->update;
312} 323}
313 324
314sub set_size { 325sub set_size {
315 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
316 327
317 $self->{def_w} = $w; 328 $self->{force_w} = $w;
318 $self->{def_h} = $h; 329 $self->{force_h} = $h;
319 330
320 $self->check_size; 331 $self->realloc;
321} 332}
322 333
323sub size_request { 334sub size_request {
324 require Carp; 335 require Carp;
325 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
327 338
328sub configure { 339sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
330 341
331 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
334 347
335 # use alignment to adjust x, y 348 # use alignment to adjust x, y
336 349
337 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 352 }
342 353
343 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 355 $self->{x} = $x;
345 $self->{y} = $y; 356 $self->{y} = $y;
346 $self->update; 357 $self->update;
347 } 358 }
348 359
349 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
351 } 367 }
352} 368}
353 369
354sub size_allocate { 370sub size_allocate {
355 # nothing to be done 371 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 372}
364 373
365sub children { 374sub children {
366} 375}
367 376
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
450 529
451sub draw { 530sub draw {
452 my ($self) = @_; 531 my ($self) = @_;
453 532
454 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
471 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
472 glEnd; 551 glEnd;
473 glDisable GL_BLEND; 552 glDisable GL_BLEND;
474 } 553 }
475 554
476 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 556 glPushMatrix;
478 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
492 my ($self) = @_; 571 my ($self) = @_;
493 572
494 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
495} 574}
496 575
497sub 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
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554}
555
556sub DESTROY { 576sub DESTROY {
557 my ($self) = @_; 577 my ($self) = @_;
558 578
559 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
560 #$self->deactivate; 580 #$self->deactivate;
… …
616 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
618} 638}
619 639
620sub size_request { 640sub size_request {
621 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
622} 644}
623 645
624sub draw { } 646sub draw { }
625 647
626############################################################################# 648#############################################################################
… …
655 $self->{children} = [ 677 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
658 ]; 680 ];
659 681
660 $self->check_size (1); 682 $self->realloc;
661 $self->update;
662} 683}
663 684
664sub children { 685sub children {
665 @{ $_[0]{children} } 686 @{ $_[0]{children} }
666} 687}
… …
671 delete $child->{parent}; 692 delete $child->{parent};
672 $child->hide; 693 $child->hide;
673 694
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 696
676 $self->check_size (1); 697 $self->realloc;
677 $self->update;
678} 698}
679 699
680sub clear { 700sub clear {
681 my ($self) = @_; 701 my ($self) = @_;
682 702
… …
686 for (@$children) { 706 for (@$children) {
687 delete $_->{parent}; 707 delete $_->{parent};
688 $_->hide; 708 $_->hide;
689 } 709 }
690 710
691 $self->check_size; 711 $self->realloc;
692 $self->update;
693} 712}
694 713
695sub find_widget { 714sub find_widget {
696 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
697 716
… …
834} 853}
835 854
836sub size_request { 855sub size_request {
837 my ($self) = @_; 856 my ($self) = @_;
838 857
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840 859
841 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
843 862
844 ($w, $h) 863 ($w, $h)
845} 864}
846 865
847sub size_allocate { 866sub size_allocate {
848 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
849 868
869 my $child = $self->child;
870
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 873
853 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
854 $self->update; 875 $self->update;
855} 876}
856 877
… …
999 1020
1000our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
1001 1022
1002use CFClient::OpenGL; 1023use CFClient::OpenGL;
1003 1024
1004my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1032
1008sub new { 1033sub new {
1009 my $class = shift; 1034 my $class = shift;
1010 1035
1011 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1039 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1017 @_ 1043 @_
1018 ); 1044 );
1019 1045
1020 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1021 align => 0, 1047 align => 0,
… …
1074 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1075 1101
1076 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1078 1104
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1107
1084 $self->check_size; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1110 };
1086 1111
1087 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1116 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1093 1118
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1120
1096 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1122 };
1102 } 1123 }
1103} 1124}
1104 1125
1105sub button_up { 1126sub button_up {
… …
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1146
1126 my $border = $self->border; 1147 my $border = $self->border;
1127 1148
1128 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1154
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1136 1157
1137 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1140
1141 glColor @{ $self->{bg} };
1142
1143 $bg->{s} = $rep_x;
1144 $bg->{t} = $rep_y;
1145 $bg->{wrap_mode} = 1;
1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1163 }
1148 1164
1149 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1150 1166
… …
1180 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1181 1197
1182 $child->set_parent ($self); 1198 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1184 1200
1185 $self->check_size (1); 1201 $self->realloc;
1186} 1202}
1187 1203
1188# TODO: move to container class maybe? send children a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1205sub clear {
1190 my ($self) = @_; 1206 my ($self) = @_;
… …
1195 for (@children) { 1211 for (@children) {
1196 delete $_->{parent}; 1212 delete $_->{parent};
1197 $_->hide; 1213 $_->hide;
1198 } 1214 }
1199 1215
1200 $self->check_size (1); 1216 $self->realloc;
1201 $self->update;
1202} 1217}
1203 1218
1204sub get_wh { 1219sub get_wh {
1205 my ($self) = @_; 1220 my ($self) = @_;
1206 1221
… …
1414 ellipsise => 3, # end 1429 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1416 fontsize => 1, 1431 fontsize => 1,
1417 align => -1, 1432 align => -1,
1418 valign => -1, 1433 valign => -1,
1419 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1420 can_events => 0, 1436 can_events => 0,
1421 %arg 1437 %arg
1422 ); 1438 );
1423 1439
1424 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1461 1477
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1464 1480
1481 $self->realloc;
1465 $self->update; 1482 $self->update;
1466 $self->check_size;
1467} 1483}
1468 1484
1469sub set_markup { 1485sub set_markup {
1470 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1471 1487
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1492
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1479 1495
1496 $self->realloc;
1480 $self->update; 1497 $self->update;
1481 $self->check_size;
1482} 1498}
1483 1499
1484sub size_request { 1500sub size_request {
1485 my ($self) = @_; 1501 my ($self) = @_;
1486 1502
… …
1500 1516
1501 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1503 } 1519 }
1504 1520
1505 ( 1521 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1522}
1510 1523
1511sub size_allocate { 1524sub size_allocate {
1512 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1513 1526
1514 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1515} 1529}
1516 1530
1517sub set_fontsize { 1531sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1519 1533
1520 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1535 delete $self->{texture};
1522 1536
1523 $self->update; 1537 $self->realloc;
1524 $self->check_size;
1525} 1538}
1526 1539
1527sub _draw { 1540sub _draw {
1528 my ($self) = @_; 1541 my ($self) = @_;
1529 1542
… …
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1552
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1541 1554
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1545 1558
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1549 1562
1550 $tex 1563 $tex
1551 }; 1564 };
1552 1565
… …
1609sub set_text { 1622sub set_text {
1610 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1611 1624
1612 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1626 $self->_set_text ($text);
1614 $self->update; 1627
1615 $self->check_size; 1628 $self->realloc;
1616} 1629}
1617 1630
1618sub get_text { 1631sub get_text {
1619 $_[0]{text} 1632 $_[0]{text}
1620} 1633}
… …
1653 } elsif ($uni) { 1666 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1668 }
1656 1669
1657 $self->_set_text ($text); 1670 $self->_set_text ($text);
1658 $self->update; 1671
1659 $self->check_size; 1672 $self->realloc;
1660} 1673}
1661 1674
1662sub focus_in { 1675sub focus_in {
1663 my ($self) = @_; 1676 my ($self) = @_;
1664 1677
… …
1791 1804
1792sub new { 1805sub new {
1793 my $class = shift; 1806 my $class = shift;
1794 1807
1795 $class->SUPER::new ( 1808 $class->SUPER::new (
1796 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1797 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1799 can_hover => 1, 1813 can_hover => 1,
1800 align => 0, 1814 align => 0,
1801 valign => 0, 1815 valign => 0,
… …
1848 1862
1849sub new { 1863sub new {
1850 my $class = shift; 1864 my $class = shift;
1851 1865
1852 $class->SUPER::new ( 1866 $class->SUPER::new (
1853 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1854 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1873 state => 0,
… …
1862} 1877}
1863 1878
1864sub size_request { 1879sub size_request {
1865 my ($self) = @_; 1880 my ($self) = @_;
1866 1881
1867 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1868} 1883}
1869 1884
1870sub button_down { 1885sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1872 1887
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1877 } 1892 }
1878} 1893}
1879 1894
1880sub _draw { 1895sub _draw {
1881 my ($self) = @_; 1896 my ($self) = @_;
1882 1897
1883 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1884 1899
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1901
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1905
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1907
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1909
… …
2157 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2178 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2164 vertical => 0, 2181 vertical => 0,
2165 can_hover => 1, 2182 can_hover => 1,
2166 inner_pad => 0.02, 2183 inner_pad => 0.02,
2167 @_ 2184 @_
2168 ); 2185 );
… …
2171 $self->update; 2188 $self->update;
2172 2189
2173 $self 2190 $self
2174} 2191}
2175 2192
2193sub changed { }
2194
2176sub set_range { 2195sub set_range {
2177 my ($self, $range) = @_; 2196 my ($self, $range) = @_;
2178 2197
2179 ($range, $self->{range}) = ($self->{range}, $range); 2198 ($range, $self->{range}) = ($self->{range}, $range);
2180 2199
… …
2206} 2225}
2207 2226
2208sub size_request { 2227sub size_request {
2209 my ($self) = @_; 2228 my ($self) = @_;
2210 2229
2211 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2231}
2216 2232
2217sub button_down { 2233sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2219 2235
… …
2604} 2620}
2605 2621
2606sub set_tooltip_from { 2622sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2608 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2609 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2637 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2639 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2626 2651
2627sub size_allocate { 2652sub size_allocate {
2628 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2629 2654
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2631} 2674}
2632 2675
2633sub _draw { 2676sub _draw {
2634 my ($self) = @_; 2677 my ($self) = @_;
2635 2678
… …
2652 glVertex $w, $h; 2695 glVertex $w, $h;
2653 glVertex $w, 0; 2696 glVertex $w, 0;
2654 glEnd; 2697 glEnd;
2655 2698
2656 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2657 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2658} 2702}
2659 2703
2660############################################################################# 2704#############################################################################
2661 2705
… …
2737 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2738} 2782}
2739 2783
2740############################################################################# 2784#############################################################################
2741 2785
2742package CFClient::UI::Inventory;
2743
2744our @ISA = CFClient::UI::ScrolledWindow::;
2745
2746sub new {
2747 my $class = shift;
2748
2749 my $self = $class->SUPER::new (
2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751 @_,
2752 );
2753
2754 $self
2755}
2756
2757sub set_items {
2758 my ($self, $items) = @_;
2759
2760 $self->{scrolled}->clear;
2761 return unless $items;
2762
2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2767
2768 $self->{real_items} = \@items;
2769
2770 my $row = 0;
2771 for my $item (@items) {
2772 CFClient::Item::update_widgets $item;
2773
2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778 $row++;
2779 }
2780}
2781
2782#############################################################################
2783
2784package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
2785 2787
2786our @ISA = CFClient::UI::FancyFrame::; 2788our @ISA = CFClient::UI::FancyFrame::;
2787 2789
2788use CFClient::OpenGL; 2790use CFClient::OpenGL;
… …
2826 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2829 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2829 2831
2830 $self->show; 2832 $self->show;
2831 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832} 2834}
2833 2835
2834sub mouse_motion { 2836sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2836 2838
… …
2961 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2962} 2964}
2963 2965
2964############################################################################# 2966#############################################################################
2965 2967
2966package CFClient::UI::Root; 2968package CFClient::UI::Inventory;
2967 2969
2968our @ISA = CFClient::UI::Container::; 2970our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 2971
2972sub new { 2972sub new {
2973 my $class = shift; 2973 my $class = shift;
2974 2974
2975 $class->SUPER::new ( 2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
3259package CFClient::UI::Root;
3260
3261our @ISA = CFClient::UI::Container::;
3262
3263use CFClient::OpenGL;
3264
3265sub new {
3266 my $class = shift;
3267
3268 my $self = $class->SUPER::new (
2976 visible => 1, 3269 visible => 1,
2977 @_, 3270 @_,
2978 ) 3271 );
2979}
2980 3272
2981sub configure { 3273 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3274
2984 $self->{w} = $w; 3275 $self
2985 $self->{h} = $h;
2986}
2987
2988sub check_size {
2989 my ($self) = @_;
2990
2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2993} 3276}
2994 3277
2995sub size_request { 3278sub size_request {
2996 my ($self) = @_; 3279 my ($self) = @_;
2997 3280
2998 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
2999} 3296}
3000 3297
3001sub size_allocate { 3298sub size_allocate {
3002 my ($self, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
3003 3300
3004 for my $child ($self->children) { 3301 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3303
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3304 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3009 3306
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3307 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3308 $Y = _to_pixel $Y, $H, $self->{h};
3012
3013 delete @$child{qw(req_x req_y)};
3014
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3309
3018 $child->configure ($X, $Y, $W, $H); 3310 $child->configure ($X, $Y, $W, $H);
3019 } 3311 }
3020} 3312}
3021 3313
… …
3032} 3324}
3033 3325
3034sub update { 3326sub update {
3035 my ($self) = @_; 3327 my ($self) = @_;
3036 3328
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3329 $::WANT_REFRESH++;
3039} 3330}
3040 3331
3041sub add { 3332sub add {
3042 my ($self, @children) = @_; 3333 my ($self, @children) = @_;
3043 3334
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3335 $_->{is_toplevel} = 1
3046 3336 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3337
3052 $self->SUPER::add (@children); 3338 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059} 3339}
3060 3340
3061sub remove { 3341sub remove {
3062 my ($self, @children) = @_; 3342 my ($self, @children) = @_;
3063 3343
3064 $self->SUPER::remove (@children); 3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3065 3348
3066 while (@children) { 3349 while (@children) {
3067 my $w = pop @children; 3350 my $w = pop @children;
3068 push @children, $w->children; 3351 push @children, $w->children;
3069 $w->set_invisible; 3352 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
3089 $_->() 3372 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3373 for values %{delete $self->{refresh_hook}};
3091 } 3374 }
3092 3375
3093 if ($self->{check_size}) { 3376 if ($self->{realloc}) {
3094 my @queue; 3377 my @queue;
3095 3378
3096 for (;;) { 3379 while () {
3097 if ($self->{check_size}) { 3380 if ($self->{realloc}) {
3098 #TODO use array-of-depth approach 3381 #TODO use array-of-depth approach
3099 3382
3383 use sort 'stable';
3384
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}}; 3386 @queue, values %{delete $self->{realloc}};
3102 } 3387 }
3103 3388
3104 my $widget = pop @queue || last; 3389 my $widget = pop @queue || last;
3105 3390
3106 defined $widget->{visible} or last; # do not resize invisible widgets 3391 $widget->{visible} or last; # do not resize invisible widgets
3107 3392
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
3111 3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3112 if (delete $widget->{force_alloc} 3402 || delete $widget->{force_realloc}) {
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115
3116 $widget->{req_w} = $w; 3403 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3404 $widget->{req_h} = $h;
3118 3405
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3406 $self->{size_alloc}{$widget+0} = $widget;
3120 3407
3121 $widget->{parent}->check_size
3122 if $widget->{parent}; 3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3123 } 3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3124 } 3417 }
3125 } 3418 }
3126 3419
3127 while ($self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (values %{delete $self->{size_alloc}}) { 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3129 my ($widget, $w, $h) = @$_; 3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130 3428
3131 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3132 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3133 3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3134 $widget->{w} = $w; 3436 $widget->{w} = $w;
3135 $widget->{h} = $h; 3437 $widget->{h} = $h;
3438
3136 $widget->emit (size_allocate => $w, $h); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3137 } 3441 }
3138 } 3442 }
3139 3443
3140 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3141 $_->() 3445 $_->()
3142 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3143 } 3447 }
3448
3144 3449
3145 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3148 3453

Diff Legend

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