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

Diff Legend

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