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.249 by root, Sun May 28 01:40:02 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}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 237}
235 238
236sub destroy { 239sub destroy {
237 my ($self) = @_; 240 my ($self) = @_;
238 241
… …
246 return if $self->{parent}; 249 return if $self->{parent};
247 250
248 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
249} 252}
250 253
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 { 254sub set_visible {
264 my ($self) = @_; 255 my ($self) = @_;
265 256
266 return if $self->{visible}; 257 return if $self->{visible};
267 258
268 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
270 261
271 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
272} 267}
273 268
274sub set_invisible { 269sub set_invisible {
275 my ($self) = @_; 270 my ($self) = @_;
276 271
277 return unless $self->{visible}; 272 return unless $self->{visible};
278 273
279 # broken show/hide model 274 $_->set_invisible for $self->children;
280 275
281 delete $self->{root}; 276 delete $self->{root};
282 delete $self->{visible}; 277 delete $self->{visible};
283 278
284 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
286 281
287 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
289 284
290 $self->focus_out; 285 $self->focus_out;
291 286
292 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
… …
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
327 339
328sub configure { 340sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
330 342
331 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
334 348
335 # use alignment to adjust x, y 349 # use alignment to adjust x, y
336 350
337 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 353 }
342 354
343 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 356 $self->{x} = $x;
345 $self->{y} = $y; 357 $self->{y} = $y;
346 $self->update; 358 $self->update;
347 } 359 }
348 360
349 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
351 } 368 }
352} 369}
353 370
354sub size_allocate { 371sub size_allocate {
355 # nothing to be done 372 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 373}
364 374
365sub children { 375sub children {
366} 376}
367 377
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub 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}
450 530
451sub draw { 531sub draw {
452 my ($self) = @_; 532 my ($self) = @_;
453 533
454 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
471 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
472 glEnd; 552 glEnd;
473 glDisable GL_BLEND; 553 glDisable GL_BLEND;
474 } 554 }
475 555
476 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 557 glPushMatrix;
478 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 561 glVertex 0 , 0;
… …
492 my ($self) = @_; 572 my ($self) = @_;
493 573
494 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
495} 575}
496 576
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 { 577sub DESTROY {
557 my ($self) = @_; 578 my ($self) = @_;
558 579
559 delete $WIDGET{$self+0}; 580 delete $WIDGET{$self+0};
560 #$self->deactivate; 581 #$self->deactivate;
… …
616 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
618} 639}
619 640
620sub size_request { 641sub size_request {
621 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
622} 645}
623 646
624sub draw { } 647sub draw { }
625 648
626############################################################################# 649#############################################################################
… …
655 $self->{children} = [ 678 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
658 ]; 681 ];
659 682
660 $self->check_size (1); 683 $self->realloc;
661 $self->update;
662} 684}
663 685
664sub children { 686sub children {
665 @{ $_[0]{children} } 687 @{ $_[0]{children} }
666} 688}
… …
671 delete $child->{parent}; 693 delete $child->{parent};
672 $child->hide; 694 $child->hide;
673 695
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 697
676 $self->check_size (1); 698 $self->realloc;
677 $self->update;
678} 699}
679 700
680sub clear { 701sub clear {
681 my ($self) = @_; 702 my ($self) = @_;
682 703
… …
686 for (@$children) { 707 for (@$children) {
687 delete $_->{parent}; 708 delete $_->{parent};
688 $_->hide; 709 $_->hide;
689 } 710 }
690 711
691 $self->check_size; 712 $self->realloc;
692 $self->update;
693} 713}
694 714
695sub find_widget { 715sub find_widget {
696 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
697 717
… …
834} 854}
835 855
836sub size_request { 856sub size_request {
837 my ($self) = @_; 857 my ($self) = @_;
838 858
839 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)};
840 860
841 $w = 10 if $self->{scroll_x}; 861 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 862 $h = 10 if $self->{scroll_y};
843 863
844 ($w, $h) 864 ($w, $h)
845} 865}
846 866
847sub size_allocate { 867sub size_allocate {
848 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
849 869
870 my $child = $self->child;
871
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 874
853 $self->child->configure (0, 0, $w, $h); 875 $self->child->configure (0, 0, $w, $h);
854 $self->update; 876 $self->update;
855} 877}
856 878
… …
999 1021
1000our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
1001 1023
1002use CFClient::OpenGL; 1024use CFClient::OpenGL;
1003 1025
1004my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 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); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1033
1008sub new { 1034sub new {
1009 my $class = shift; 1035 my $class = shift;
1010 1036
1011 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1040 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
1017 @_ 1044 @_
1018 ); 1045 );
1019 1046
1020 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
1021 align => 0, 1048 align => 0,
… …
1074 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1075 1102
1076 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
1078 1105
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1108
1084 $self->check_size; 1109 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1111 };
1086 1112
1087 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1117 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
1093 1119
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1121
1096 $self->{user_x} = $bx + $x - $ox; 1122 $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 }; 1123 };
1102 } 1124 }
1103} 1125}
1104 1126
1105sub button_up { 1127sub button_up {
… …
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1147
1126 my $border = $self->border; 1148 my $border = $self->border;
1127 1149
1128 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1155
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
1136 1158
1137 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1162 $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); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1164 }
1148 1165
1149 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1150 1167
… …
1180 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1181 1198
1182 $child->set_parent ($self); 1199 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1184 1201
1185 $self->check_size (1); 1202 $self->realloc;
1186} 1203}
1187 1204
1188# 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?
1189sub clear { 1206sub clear {
1190 my ($self) = @_; 1207 my ($self) = @_;
… …
1195 for (@children) { 1212 for (@children) {
1196 delete $_->{parent}; 1213 delete $_->{parent};
1197 $_->hide; 1214 $_->hide;
1198 } 1215 }
1199 1216
1200 $self->check_size (1); 1217 $self->realloc;
1201 $self->update;
1202} 1218}
1203 1219
1204sub get_wh { 1220sub get_wh {
1205 my ($self) = @_; 1221 my ($self) = @_;
1206 1222
… …
1414 ellipsise => 3, # end 1430 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1416 fontsize => 1, 1432 fontsize => 1,
1417 align => -1, 1433 align => -1,
1418 valign => -1, 1434 valign => -1,
1419 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1420 can_events => 0, 1437 can_events => 0,
1421 %arg 1438 %arg
1422 ); 1439 );
1423 1440
1424 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1461 1478
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1464 1481
1482 $self->realloc;
1465 $self->update; 1483 $self->update;
1466 $self->check_size;
1467} 1484}
1468 1485
1469sub set_markup { 1486sub set_markup {
1470 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1471 1488
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1493
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1479 1496
1497 $self->realloc;
1480 $self->update; 1498 $self->update;
1481 $self->check_size;
1482} 1499}
1483 1500
1484sub size_request { 1501sub size_request {
1485 my ($self) = @_; 1502 my ($self) = @_;
1486 1503
… …
1500 1517
1501 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1503 } 1520 }
1504 1521
1505 ( 1522 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1523}
1510 1524
1511sub size_allocate { 1525sub size_allocate {
1512 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1513 1527
1514 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1530}
1516 1531
1517sub set_fontsize { 1532sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1519 1534
1520 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1536 delete $self->{texture};
1522 1537
1523 $self->update; 1538 $self->realloc;
1524 $self->check_size;
1525} 1539}
1526 1540
1527sub _draw { 1541sub _draw {
1528 my ($self) = @_; 1542 my ($self) = @_;
1529 1543
… …
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1553
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1541 1555
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1545 1559
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1549 1563
1550 $tex 1564 $tex
1551 }; 1565 };
1552 1566
… …
1609sub set_text { 1623sub set_text {
1610 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1611 1625
1612 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1627 $self->_set_text ($text);
1614 $self->update; 1628
1615 $self->check_size; 1629 $self->realloc;
1616} 1630}
1617 1631
1618sub get_text { 1632sub get_text {
1619 $_[0]{text} 1633 $_[0]{text}
1620} 1634}
… …
1653 } elsif ($uni) { 1667 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1669 }
1656 1670
1657 $self->_set_text ($text); 1671 $self->_set_text ($text);
1658 $self->update; 1672
1659 $self->check_size; 1673 $self->realloc;
1660} 1674}
1661 1675
1662sub focus_in { 1676sub focus_in {
1663 my ($self) = @_; 1677 my ($self) = @_;
1664 1678
… …
1791 1805
1792sub new { 1806sub new {
1793 my $class = shift; 1807 my $class = shift;
1794 1808
1795 $class->SUPER::new ( 1809 $class->SUPER::new (
1796 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1797 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1799 can_hover => 1, 1814 can_hover => 1,
1800 align => 0, 1815 align => 0,
1801 valign => 0, 1816 valign => 0,
… …
1848 1863
1849sub new { 1864sub new {
1850 my $class = shift; 1865 my $class = shift;
1851 1866
1852 $class->SUPER::new ( 1867 $class->SUPER::new (
1853 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1854 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1874 state => 0,
… …
1862} 1878}
1863 1879
1864sub size_request { 1880sub size_request {
1865 my ($self) = @_; 1881 my ($self) = @_;
1866 1882
1867 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1868} 1884}
1869 1885
1870sub button_down { 1886sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1872 1888
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1877 } 1893 }
1878} 1894}
1879 1895
1880sub _draw { 1896sub _draw {
1881 my ($self) = @_; 1897 my ($self) = @_;
1882 1898
1883 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1884 1900
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1902
1887 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;
1888 1906
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1908
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1910
… …
2157 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2179 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2164 vertical => 0, 2182 vertical => 0,
2165 can_hover => 1, 2183 can_hover => 1,
2166 inner_pad => 0.02, 2184 inner_pad => 0.02,
2167 @_ 2185 @_
2168 ); 2186 );
… …
2171 $self->update; 2189 $self->update;
2172 2190
2173 $self 2191 $self
2174} 2192}
2175 2193
2194sub changed { }
2195
2176sub set_range { 2196sub set_range {
2177 my ($self, $range) = @_; 2197 my ($self, $range) = @_;
2178 2198
2179 ($range, $self->{range}) = ($self->{range}, $range); 2199 ($range, $self->{range}) = ($self->{range}, $range);
2180 2200
… …
2206} 2226}
2207 2227
2208sub size_request { 2228sub size_request {
2209 my ($self) = @_; 2229 my ($self) = @_;
2210 2230
2211 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2232}
2216 2233
2217sub button_down { 2234sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2219 2236
… …
2604} 2621}
2605 2622
2606sub set_tooltip_from { 2623sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2608 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
2609 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2638 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2640 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2626 2652
2627sub size_allocate { 2653sub size_allocate {
2628 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2629 2655
2630 $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 });
2631} 2675}
2632 2676
2633sub _draw { 2677sub _draw {
2634 my ($self) = @_; 2678 my ($self) = @_;
2635 2679
… …
2652 glVertex $w, $h; 2696 glVertex $w, $h;
2653 glVertex $w, 0; 2697 glVertex $w, 0;
2654 glEnd; 2698 glEnd;
2655 2699
2656 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2657 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2658} 2703}
2659 2704
2660############################################################################# 2705#############################################################################
2661 2706
… …
2737 $self->SUPER::DESTROY; 2782 $self->SUPER::DESTROY;
2738} 2783}
2739 2784
2740############################################################################# 2785#############################################################################
2741 2786
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; 2787package CFClient::UI::Menu;
2785 2788
2786our @ISA = CFClient::UI::FancyFrame::; 2789our @ISA = CFClient::UI::FancyFrame::;
2787 2790
2788use CFClient::OpenGL; 2791use CFClient::OpenGL;
… …
2826 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2830 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2829 2832
2830 $self->show; 2833 $self->show;
2831 $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);
2832} 2835}
2833 2836
2834sub mouse_motion { 2837sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2836 2839
… …
2961 $self->SUPER::reconfigure; 2964 $self->SUPER::reconfigure;
2962} 2965}
2963 2966
2964############################################################################# 2967#############################################################################
2965 2968
2966package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2967 2970
2968our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 2972
2972sub new { 2973sub new {
2973 my $class = shift; 2974 my $class = shift;
2974 2975
2975 $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 (
2976 visible => 1, 3270 visible => 1,
2977 @_, 3271 @_,
2978 ) 3272 );
2979}
2980 3273
2981sub configure { 3274 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3275
2984 $self->{w} = $w; 3276 $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} 3277}
2994 3278
2995sub size_request { 3279sub size_request {
2996 my ($self) = @_; 3280 my ($self) = @_;
2997 3281
2998 ($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
2999} 3297}
3000 3298
3001sub size_allocate { 3299sub size_allocate {
3002 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
3003 3301
3004 for my $child ($self->children) { 3302 for my $child ($self->children) {
3005 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)};
3006 3304
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3009 3307
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3309 $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 3310
3018 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
3019 } 3312 }
3020} 3313}
3021 3314
… …
3032} 3325}
3033 3326
3034sub update { 3327sub update {
3035 my ($self) = @_; 3328 my ($self) = @_;
3036 3329
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
3039} 3331}
3040 3332
3041sub add { 3333sub add {
3042 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
3043 3335
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3336 $_->{is_toplevel} = 1
3046 3337 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3338
3052 $self->SUPER::add (@children); 3339 $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} 3340}
3060 3341
3061sub remove { 3342sub remove {
3062 my ($self, @children) = @_; 3343 my ($self, @children) = @_;
3063 3344
3064 $self->SUPER::remove (@children); 3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3065 3349
3066 while (@children) { 3350 while (@children) {
3067 my $w = pop @children; 3351 my $w = pop @children;
3068 push @children, $w->children; 3352 push @children, $w->children;
3069 $w->set_invisible; 3353 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
3089 $_->() 3373 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
3091 } 3375 }
3092 3376
3093 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
3378 my %queue;
3094 my @queue; 3379 my @queue;
3380 my $widget;
3095 3381
3096 for (;;) { 3382 outer:
3097 if ($self->{check_size}) { 3383 while () {
3098 #TODO use array-of-depth approach 3384 if (my $realloc = delete $self->{realloc}) {
3385 for $widget (values %$realloc) {
3386 $widget->{visible} or next; # do not resize invisible widgets
3099 3387
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3388 $queue{$widget+0}++ and next; # duplicates are common
3101 @queue, values %{delete $self->{check_size}}; 3389
3390 push @{ $queue[$widget->{visible}] }, $widget;
3391 }
3102 } 3392 }
3103 3393
3394 while () {
3395 @queue or last outer;
3396
3104 my $widget = pop @queue || last; 3397 $widget = pop @{ $queue[-1] || [] }
3105 3398 and last;
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
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 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}) {
3116 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
3118 3417
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
3120 3419
3121 $widget->{parent}->check_size
3122 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 }
3123 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3124 } 3430 }
3125 } 3431 }
3126 3432
3127 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} } 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3130 values %{delete $self->{size_alloc}} 3435 values %$size_alloc;
3131 ) { 3436
3132 my ($widget, $w, $h) = @$_; 3437 while () {
3438 my $widget = pop @queue || last;
3439
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133 3441
3134 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
3136 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
3137 $widget->{w} = $w; 3452 $widget->{w} = $w;
3138 $widget->{h} = $h; 3453 $widget->{h} = $h;
3454
3139 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
3140 } 3457 }
3141 } 3458 }
3142 3459
3143 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3144 $_->() 3461 $_->()
3145 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3146 } 3463 }
3464
3147 3465
3148 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3149 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3150 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3151 3469

Diff Legend

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