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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
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};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
233 275
234 delete $self->{root}; 276 delete $self->{root};
235 delete $self->{visible}; 277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
240 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
242 284
243 $self->focus_out; 285 $self->focus_out;
286
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;
244} 305}
245 306
246sub hide { 307sub hide {
247 my ($self) = @_; 308 my ($self) = @_;
248 309
250 311
251 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
252 if $self->{parent}; 313 if $self->{parent};
253} 314}
254 315
255sub move { 316sub move_abs {
256 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
257 318
258 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
259 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
260 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
261 322
262 $self->update; 323 $self->update;
263} 324}
264 325
265sub set_size { 326sub set_size {
266 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
267 328
268 $self->{user_w} = $w; 329 $self->{force_w} = $w;
269 $self->{user_h} = $h; 330 $self->{force_h} = $h;
270 331
271 $self->check_size; 332 $self->realloc;
272} 333}
273 334
274sub size_request { 335sub size_request {
275 require Carp; 336 require Carp;
276 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
278 339
279sub configure { 340sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
281 342
282 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
285 348
286 # use alignment to adjust x, y 349 # use alignment to adjust x, y
287 350
288 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 353 }
293 354
294 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 356 $self->{x} = $x;
296 $self->{y} = $y; 357 $self->{y} = $y;
297 $self->update; 358 $self->update;
298 } 359 }
299 360
300 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $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;
302 } 368 }
303} 369}
304 370
305sub size_allocate { 371sub size_allocate {
306 # nothing to be done 372 # nothing to be done
307} 373}
308 374
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
317} 381}
318 382
319sub set_max_size { 383sub set_max_size {
320 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
321 385
380 444
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS; 446 unless $FOCUS;
383} 447}
384 448
385sub mouse_motion { } 449sub mouse_motion { 0 }
386sub button_up { } 450sub button_up { 0 }
387sub key_down { } 451sub key_down { 0 }
388sub key_up { } 452sub key_up { 0 }
389 453
390sub button_down { 454sub button_down {
391 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
392 456
393 $self->focus_in; 457 $self->focus_in;
394}
395 458
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
400sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
401 535
402sub draw { 536sub draw {
403 my ($self) = @_; 537 my ($self) = @_;
404 538
405 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
406 550
407 glPushMatrix; 551 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw; 553 $self->_draw;
410 glPopMatrix; 554 glPopMatrix;
422 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
423 glEnd; 567 glEnd;
424 glDisable GL_BLEND; 568 glDisable GL_BLEND;
425 } 569 }
426 570
427 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 572 glPushMatrix;
429 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
431 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 576 glVertex 0 , 0;
443 my ($self) = @_; 587 my ($self) = @_;
444 588
445 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
446} 590}
447 591
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506}
507
508sub DESTROY { 592sub DESTROY {
509 my ($self) = @_; 593 my ($self) = @_;
510 594
511 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
512 #$self->deactivate; 596 #$self->deactivate;
568 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
570} 654}
571 655
572sub size_request { 656sub size_request {
573 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
574} 660}
575 661
576sub draw { } 662sub draw { }
577 663
578############################################################################# 664#############################################################################
582our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
583 669
584sub new { 670sub new {
585 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
586 672
587 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
588 674
589 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
590 children => [], 676 children => [],
591 can_events => 0, 677 can_events => 0,
592 %arg, 678 %arg,
593 ); 679 );
680
594 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
595 683
596 $self 684 $self
597} 685}
598 686
599sub add { 687sub add {
607 $self->{children} = [ 695 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
610 ]; 698 ];
611 699
612 $self->check_size (1); 700 $self->realloc;
613 $self->update;
614} 701}
615 702
616sub children { 703sub children {
617 @{ $_[0]{children} } 704 @{ $_[0]{children} }
618} 705}
623 delete $child->{parent}; 710 delete $child->{parent};
624 $child->hide; 711 $child->hide;
625 712
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 714
628 $self->check_size (1); 715 $self->realloc;
629 $self->update;
630} 716}
631 717
632sub clear { 718sub clear {
633 my ($self) = @_; 719 my ($self) = @_;
634 720
638 for (@$children) { 724 for (@$children) {
639 delete $_->{parent}; 725 delete $_->{parent};
640 $_->hide; 726 $_->hide;
641 } 727 }
642 728
643 $self->check_size; 729 $self->realloc;
644 $self->update;
645} 730}
646 731
647sub find_widget { 732sub find_widget {
648 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
649 734
650 $x -= $self->{x}; 735 $x -= $self->{x};
651 $y -= $self->{y}; 736 $y -= $self->{y};
652 737
653 my $res; 738 my $res;
654 739
655 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
657 and return $res; 742 and return $res;
658 } 743 }
659 744
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
736 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 822 $self->update;
738} 823}
739 824
740sub _render { 825sub _render {
826 my ($self) = @_;
827
741 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
742} 829}
743 830
744sub render_child { 831sub render_child {
745 my ($self) = @_; 832 my ($self) = @_;
746 833
747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
748 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
750 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
751 $self->_render; 845 $self->_render;
752 }; 846 };
753} 847}
754 848
755sub _draw { 849sub _draw {
756 my ($self) = @_; 850 my ($self) = @_;
757 851
758 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
759 853
760 my $tex = $self->{texture} 854 my $tex = $self->{texture}
761 or return; 855 or return;
762 856
763 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
786} 880}
787 881
788sub size_request { 882sub size_request {
789 my ($self) = @_; 883 my ($self) = @_;
790 884
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 886
793 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
794} 891}
795 892
796sub size_allocate { 893sub size_allocate {
797 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
798 895
896 my $child = $self->child;
897
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 900
802 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
803 $self->update; 902 $self->update;
804} 903}
805 904
841} 940}
842 941
843sub _render { 942sub _render {
844 my ($self) = @_; 943 my ($self) = @_;
845 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 949
848 $self->SUPER::_render; 950 $self->SUPER::_render;
849} 951}
850 952
853package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
854 956
855our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
856 958
857sub new { 959sub new {
858 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
859 963
860 my $self; 964 my $self;
861 965
862 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
863 vertical => 1, 967 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 969 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 970 $self->{vp}->set_offset (0, $_[1]);
867 }, 971 },
868 ; 972 ;
869 973
870 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 976 slider => $slider,
873 @_, 977 %arg,
874 ); 978 );
875 979
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
879 982
880 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
881} 990}
882 991
883sub update { 992sub update {
884 my ($self) = @_; 993 my ($self) = @_;
885 994
948 1057
949our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
950 1059
951use CFClient::OpenGL; 1060use CFClient::OpenGL;
952 1061
953my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
956 1069
957sub new { 1070sub new {
958 my $class = shift; 1071 my ($class, %arg) = @_;
959 1072
960 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
961 1074
962 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1078 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1079 can_events => 1,
968 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
969 ); 1083 );
970 1084
971 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
972 align => 0, 1086 align => 0,
973 valign => 1, 1087 valign => 1,
974 text => $self->{title}, 1088 text => $title,
975 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
976 1091
977 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
978} 1100}
979 1101
980sub border { 1102sub border {
981 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
982} 1104}
983 1105
984sub size_request { 1106sub size_request {
985 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
986 1111
987 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
988 1113
989 ( 1114 (
990 $w + $self->border * 2, 1115 $w + $self->border * 2,
993} 1118}
994 1119
995sub size_allocate { 1120sub size_allocate {
996 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
997 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
998 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
1000 1133
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
1005} 1135}
1006 1136
1007sub button_down { 1137sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1009 1139
1025 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
1026 1156
1027 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
1029 1159
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size;
1034 }; 1165 };
1035 1166
1036 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
1040 $self->{motion} = sub { 1171 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
1042 1173
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1175
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update;
1047 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
1048 } 1182 1
1049} 1183}
1050 1184
1051sub button_up { 1185sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1053 1187
1054 delete $self->{motion}; 1188 !!delete $self->{motion}
1055} 1189}
1056 1190
1057sub mouse_motion { 1191sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1059 1193
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1061} 1197}
1062 1198
1063sub _draw { 1199sub _draw {
1064 my ($self) = @_; 1200 my ($self) = @_;
1065 1201
1202 my $child = $self->{children}[0];
1203
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1206
1069 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1209
1072 my $border = $self->border; 1210 my $border = $self->border;
1073 1211
1074 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1217
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1082 1220
1083 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1224 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1226 }
1094 1227
1095 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1096 1229
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1100} 1236}
1101 1237
1102############################################################################# 1238#############################################################################
1103 1239
1104package CFClient::UI::Table; 1240package CFClient::UI::Table;
1126 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1127 1263
1128 $child->set_parent ($self); 1264 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1130 1266
1131 $self->check_size (1); 1267 $self->realloc;
1132} 1268}
1133 1269
1134# TODO: move to container class maybe? send children a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1271sub clear {
1136 my ($self) = @_; 1272 my ($self) = @_;
1141 for (@children) { 1277 for (@children) {
1142 delete $_->{parent}; 1278 delete $_->{parent};
1143 $_->hide; 1279 $_->hide;
1144 } 1280 }
1145 1281
1146 $self->check_size (1); 1282 $self->realloc;
1147 $self->update;
1148} 1283}
1149 1284
1150sub get_wh { 1285sub get_wh {
1151 my ($self) = @_; 1286 my ($self) = @_;
1152 1287
1248 } 1383 }
1249} 1384}
1250 1385
1251############################################################################# 1386#############################################################################
1252 1387
1253package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1389
1257our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1258 1391
1259sub size_request { 1392sub size_request {
1260 my ($self) = @_; 1393 my ($self) = @_;
1261 1394
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1263 1396 ? (
1264 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1399 )
1267 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1268} 1404}
1269 1405
1270sub size_allocate { 1406sub size_allocate {
1271 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1272 1408
1273 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1410 my $children = $self->{children};
1276 1411
1277 my @h = map $_->{req_w}, @$children; 1412 my @req;
1278 1413
1279 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1280 1415 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1430 }
1295 } 1431 }
1296 1432
1297 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1298 1434
1299 my $y = 0; 1435 my $pos = 0;
1300 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1439
1305 $y += $h; 1440 $pos += $alloc;
1306 } 1441 }
1307 1442
1308 1 1443 1
1309} 1444}
1310 1445
1311############################################################################# 1446#############################################################################
1312 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1313package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1314 1464
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1318 1466
1319sub size_request { 1467sub new {
1320 my ($self) = @_; 1468 my $class = shift;
1321 1469
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1323 1471 vertical => 1,
1324 ( 1472 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1473 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1474}
1368 1475
1369############################################################################# 1476#############################################################################
1370 1477
1371package CFClient::UI::Label; 1478package CFClient::UI::Label;
1388 ellipsise => 3, # end 1495 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1390 fontsize => 1, 1497 fontsize => 1,
1391 align => -1, 1498 align => -1,
1392 valign => -1, 1499 valign => -1,
1393 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1394 can_events => 0, 1502 can_events => 0,
1395 %arg 1503 %arg
1396 ); 1504 );
1397 1505
1398 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1434 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1435 1543
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1438 1546
1547 $self->realloc;
1439 $self->update; 1548 $self->update;
1440 $self->check_size;
1441} 1549}
1442 1550
1443sub set_markup { 1551sub set_markup {
1444 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1445 1553
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1558
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1453 1561
1562 $self->realloc;
1454 $self->update; 1563 $self->update;
1455 $self->check_size;
1456} 1564}
1457 1565
1458sub size_request { 1566sub size_request {
1459 my ($self) = @_; 1567 my ($self) = @_;
1460 1568
1474 1582
1475 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1477 } 1585 }
1478 1586
1479 ( 1587 ($w, $h)
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1588}
1484 1589
1485sub size_allocate { 1590sub size_allocate {
1486 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1487 1592
1593 delete $self->{ox};
1594
1488 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1597}
1490 1598
1491sub set_fontsize { 1599sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1493 1601
1494 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1603 delete $self->{texture};
1496 1604
1497 $self->update; 1605 $self->realloc;
1498 $self->check_size;
1499} 1606}
1500 1607
1501sub _draw { 1608sub _draw {
1502 my ($self) = @_; 1609 my ($self) = @_;
1503 1610
1509 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1620
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1515 1623
1624 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1519 1628
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1632 };
1526 1633
1527 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1529 1636
1583sub set_text { 1690sub set_text {
1584 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1585 1692
1586 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1694 $self->_set_text ($text);
1588 $self->update; 1695
1589 $self->check_size; 1696 $self->realloc;
1590} 1697}
1591 1698
1592sub get_text { 1699sub get_text {
1593 $_[0]{text} 1700 $_[0]{text}
1594} 1701}
1624 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1627 } elsif ($uni) { 1734 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1629 } 1738 }
1630 1739
1631 $self->_set_text ($text); 1740 $self->_set_text ($text);
1632 $self->update; 1741
1633 $self->check_size; 1742 $self->realloc;
1743
1744 1
1634} 1745}
1635 1746
1636sub focus_in { 1747sub focus_in {
1637 my ($self) = @_; 1748 my ($self) = @_;
1638 1749
1653 utf8::encode $text; 1764 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1655 1766
1656 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1657 $self->update; 1768 $self->update;
1769
1770 1
1658} 1771}
1659 1772
1660sub mouse_motion { 1773sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1662# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1663} 1778}
1664 1779
1665sub _draw { 1780sub _draw {
1666 my ($self) = @_; 1781 my ($self) = @_;
1667 1782
1744 } else { 1859 } else {
1745 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1746 } 1861 }
1747 1862
1748 } else { 1863 } else {
1749 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1750 } 1867 1
1751
1752} 1868}
1753 1869
1754############################################################################# 1870#############################################################################
1755 1871
1756package CFClient::UI::Button; 1872package CFClient::UI::Button;
1765 1881
1766sub new { 1882sub new {
1767 my $class = shift; 1883 my $class = shift;
1768 1884
1769 $class->SUPER::new ( 1885 $class->SUPER::new (
1770 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1771 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1773 can_hover => 1, 1890 can_hover => 1,
1774 align => 0, 1891 align => 0,
1775 valign => 0, 1892 valign => 0,
1784 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1785 1902
1786 $self->emit ("activate") 1903 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1789} 1908}
1790 1909
1791sub _draw { 1910sub _draw {
1792 my ($self) = @_; 1911 my ($self) = @_;
1793 1912
1822 1941
1823sub new { 1942sub new {
1824 my $class = shift; 1943 my $class = shift;
1825 1944
1826 $class->SUPER::new ( 1945 $class->SUPER::new (
1827 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1828 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 1952 state => 0,
1836} 1956}
1837 1957
1838sub size_request { 1958sub size_request {
1839 my ($self) = @_; 1959 my ($self) = @_;
1840 1960
1841 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1842} 1962}
1843 1963
1844sub button_down { 1964sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1846 1966
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1851 } 1975 1
1852} 1976}
1853 1977
1854sub _draw { 1978sub _draw {
1855 my ($self) = @_; 1979 my ($self) = @_;
1856 1980
1857 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1858 1982
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 1984
1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1862 1988
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 1990
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 1992
2131 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2261 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2138 vertical => 0, 2264 vertical => 0,
2139 can_hover => 1, 2265 can_hover => 1,
2140 inner_pad => 0.02, 2266 inner_pad => 0.02,
2141 @_ 2267 @_
2142 ); 2268 );
2145 $self->update; 2271 $self->update;
2146 2272
2147 $self 2273 $self
2148} 2274}
2149 2275
2276sub changed { }
2277
2150sub set_range { 2278sub set_range {
2151 my ($self, $range) = @_; 2279 my ($self, $range) = @_;
2152 2280
2153 ($range, $self->{range}) = ($self->{range}, $range); 2281 ($range, $self->{range}) = ($self->{range}, $range);
2154 2282
2180} 2308}
2181 2309
2182sub size_request { 2310sub size_request {
2183 my ($self) = @_; 2311 my ($self) = @_;
2184 2312
2185 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2314}
2190 2315
2191sub button_down { 2316sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2193 2318
2194 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2195 2320
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2322
2198 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2199} 2324}
2200 2325
2201sub mouse_motion { 2326sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2203 2328
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2333
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2335
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2212 } 2341 1
2213} 2342}
2214 2343
2215sub update { 2344sub update {
2216 my ($self) = @_; 2345 my ($self) = @_;
2217 2346
2544 2673
2545sub new { 2674sub new {
2546 my $class = shift; 2675 my $class = shift;
2547 2676
2548 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2549 state => 0, 2678 state => 0,
2550 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2551 @_ 2680 @_
2552 ); 2681 );
2553 2682
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2683 $self
2560} 2684}
2561 2685
2562sub toggle_flopper { 2686sub toggle_flopper {
2563 my ($self) = @_; 2687 my ($self) = @_;
2564 2688
2565 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2690}
2577 2691
2578############################################################################# 2692#############################################################################
2579 2693
2580package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
2593} 2707}
2594 2708
2595sub set_tooltip_from { 2709sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2597 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2598 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2724 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2726 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2615 2738
2616sub size_allocate { 2739sub size_allocate {
2617 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2618 2741
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2620} 2761}
2621 2762
2622sub _draw { 2763sub _draw {
2623 my ($self) = @_; 2764 my ($self) = @_;
2624 2765
2641 glVertex $w, $h; 2782 glVertex $w, $h;
2642 glVertex $w, 0; 2783 glVertex $w, 0;
2643 glEnd; 2784 glEnd;
2644 2785
2645 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2646 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2647} 2789}
2648 2790
2649############################################################################# 2791#############################################################################
2650 2792
2726 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2727} 2869}
2728 2870
2729############################################################################# 2871#############################################################################
2730 2872
2731package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2732 2874
2733our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2734 2876
2735sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2878
2776############################################################################# 2879#############################################################################
2777 2880
2778package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2779 2882
2820 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 2924 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2823 2926
2824 $self->show; 2927 $self->show;
2825 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2826} 2929}
2827 2930
2828sub mouse_motion { 2931sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2830 2933
2831 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2834} 2939}
2835 2940
2836sub button_up { 2941sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2838 2943
2840 undef $GRAB; 2945 undef $GRAB;
2841 $self->hide; 2946 $self->hide;
2842 2947
2843 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2845 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2846} 3063}
2847 3064
2848############################################################################# 3065#############################################################################
2849 3066
2850package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
2955 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
2956} 3173}
2957 3174
2958############################################################################# 3175#############################################################################
2959 3176
2960package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
2961 3178
2962our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3180
2966sub new { 3181sub new {
2967 my $class = shift; 3182 my $class = shift;
2968 3183
2969 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
2970 visible => 1, 3482 visible => 1,
2971 @_, 3483 @_,
2972 ) 3484 );
2973}
2974 3485
2975sub configure { 3486 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3487
2978 $self->{w} = $w; 3488 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3489}
2988 3490
2989sub size_request { 3491sub size_request {
2990 my ($self) = @_; 3492 my ($self) = @_;
2991 3493
2992 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
2993} 3509}
2994 3510
2995sub size_allocate { 3511sub size_allocate {
2996 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2997 3513
2998 for my $child ($self->children) { 3514 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3516
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3003 3519
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3521 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3522
3010 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
3011 } 3524 }
3012} 3525}
3013 3526
3024} 3537}
3025 3538
3026sub update { 3539sub update {
3027 my ($self) = @_; 3540 my ($self) = @_;
3028 3541
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
3031} 3543}
3032 3544
3033sub add { 3545sub add {
3034 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
3035 3547
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3548 $_->{is_toplevel} = 1
3044 3549 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3550
3050 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3051} 3552}
3052 3553
3053sub remove { 3554sub remove {
3054 my ($self, @children) = @_; 3555 my ($self, @children) = @_;
3055 3556
3056 $self->SUPER::remove (@children); 3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3057 3561
3058 while (@children) { 3562 while (@children) {
3059 my $w = pop @children; 3563 my $w = pop @children;
3060 push @children, $w->children; 3564 push @children, $w->children;
3061 $w->set_invisible; 3565 $w->set_invisible;
3080 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
3081 $_->() 3585 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
3083 } 3587 }
3084 3588
3085 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
3086 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
3087 3593
3088 for (;;) { 3594 outer:
3089 if ($self->{check_size}) { 3595 while () {
3090 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3093 } 3604 }
3094 3605
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
3096 3608
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3610 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
3107 3629
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
3109 3631
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3112 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3113 } 3642 }
3114 } 3643 }
3115 3644
3116 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 3653
3120 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3122 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3123 $widget->{w} = $w; 3664 $widget->{w} = $w;
3124 $widget->{h} = $h; 3665 $widget->{h} = $h;
3666
3125 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3126 } 3669 }
3127 } 3670 }
3128 3671
3129 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3130 $_->() 3673 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3132 } 3675 }
3676
3133 3677
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3137 3681
3139 glLoadIdentity; 3683 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3686 glLoadIdentity;
3143 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3144 $self->_draw; 3695 $self->_draw;
3145} 3696}
3146 3697
3147############################################################################# 3698#############################################################################
3148 3699

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines