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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $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->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_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};
223 } 234 }
224 235
225 $self 236 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 237}
237 238
238sub destroy { 239sub destroy {
239 my ($self) = @_; 240 my ($self) = @_;
240 241
242 %$self = (); 243 %$self = ();
243} 244}
244 245
245sub show { 246sub show {
246 my ($self) = @_; 247 my ($self) = @_;
248
247 return if $self->{parent}; 249 return if $self->{parent};
248 250
249 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
250} 252}
251 253
252sub show_centered { 254sub set_visible {
253 my ($self) = @_; 255 my ($self) = @_;
256
254 return if $self->{parent}; 257 return if $self->{visible};
255 258
256 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
257 261
258 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 263
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
261 }, 265
262 ); 266 $_->set_visible for $self->children;
263} 267}
264 268
265sub set_invisible { 269sub set_invisible {
266 my ($self) = @_; 270 my ($self) = @_;
267 271
268 return unless $self->{visible}; 272 return unless $self->{visible};
269 273
270 # broken show/hide model 274 $_->set_invisible for $self->children;
271 275
272 delete $self->{root}; 276 delete $self->{root};
273 delete $self->{visible}; 277 delete $self->{visible};
274 278
275 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
277 281
278 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
280 284
281 $self->focus_out; 285 $self->focus_out;
282 286
283 $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;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
318 339
319sub configure { 340sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
321 342
322 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
325 348
326 # use alignment to adjust x, y 349 # use alignment to adjust x, y
327 350
328 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 353 }
333 354
334 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 356 $self->{x} = $x;
336 $self->{y} = $y; 357 $self->{y} = $y;
337 $self->update; 358 $self->update;
338 } 359 }
339 360
340 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $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;
342 } 368 }
343} 369}
344 370
345sub size_allocate { 371sub size_allocate {
346 # nothing to be done 372 # nothing to be done
347} 373}
348 374
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
357} 381}
358 382
359sub set_max_size { 383sub set_max_size {
360 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
361 385
420 444
421 $::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
422 unless $FOCUS; 446 unless $FOCUS;
423} 447}
424 448
425sub mouse_motion { } 449sub mouse_motion { 0 }
426sub button_up { } 450sub button_up { 0 }
427sub key_down { } 451sub key_down { 0 }
428sub key_up { } 452sub key_up { 0 }
429 453
430sub button_down { 454sub button_down {
431 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
432 456
433 $self->focus_in; 457 $self->focus_in;
434}
435 458
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
440sub 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
441 535
442sub draw { 536sub draw {
443 my ($self) = @_; 537 my ($self) = @_;
444 538
445 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);
446 550
447 glPushMatrix; 551 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw; 553 $self->_draw;
450 glPopMatrix; 554 glPopMatrix;
462 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
463 glEnd; 567 glEnd;
464 glDisable GL_BLEND; 568 glDisable GL_BLEND;
465 } 569 }
466 570
467 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 572 glPushMatrix;
469 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 576 glVertex 0 , 0;
483 my ($self) = @_; 587 my ($self) = @_;
484 588
485 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
486} 590}
487 591
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 592sub DESTROY {
558 my ($self) = @_; 593 my ($self) = @_;
559 594
560 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
561 #$self->deactivate; 596 #$self->deactivate;
617 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
619} 654}
620 655
621sub size_request { 656sub size_request {
622 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
623} 660}
624 661
625sub draw { } 662sub draw { }
626 663
627############################################################################# 664#############################################################################
631our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
632 669
633sub new { 670sub new {
634 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
635 672
636 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
637 674
638 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
639 children => [], 676 children => [],
640 can_events => 0, 677 can_events => 0,
641 %arg, 678 %arg,
642 ); 679 );
680
643 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
644 683
645 $self 684 $self
646} 685}
647 686
648sub add { 687sub add {
656 $self->{children} = [ 695 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
659 ]; 698 ];
660 699
661 $self->check_size (1); 700 $self->realloc;
662 $self->update;
663} 701}
664 702
665sub children { 703sub children {
666 @{ $_[0]{children} } 704 @{ $_[0]{children} }
667} 705}
672 delete $child->{parent}; 710 delete $child->{parent};
673 $child->hide; 711 $child->hide;
674 712
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 714
677 $self->check_size (1); 715 $self->realloc;
678 $self->update;
679} 716}
680 717
681sub clear { 718sub clear {
682 my ($self) = @_; 719 my ($self) = @_;
683 720
687 for (@$children) { 724 for (@$children) {
688 delete $_->{parent}; 725 delete $_->{parent};
689 $_->hide; 726 $_->hide;
690 } 727 }
691 728
692 $self->check_size; 729 $self->realloc;
693 $self->update;
694} 730}
695 731
696sub find_widget { 732sub find_widget {
697 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
698 734
699 $x -= $self->{x}; 735 $x -= $self->{x};
700 $y -= $self->{y}; 736 $y -= $self->{y};
701 737
702 my $res; 738 my $res;
703 739
704 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
706 and return $res; 742 and return $res;
707 } 743 }
708 744
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
758 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
759} 795}
760 796
761############################################################################# 797#############################################################################
762 798
799# back-buffered drawing area
800
763package CFClient::UI::Window; 801package CFClient::UI::Window;
764 802
765our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
766 804
767use CFClient::OpenGL; 805use CFClient::OpenGL;
785 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 824 $self->update;
787} 825}
788 826
789sub _render { 827sub _render {
828 my ($self) = @_;
829
790 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
791} 831}
792 832
793sub render_child { 833sub render_child {
794 my ($self) = @_; 834 my ($self) = @_;
795 835
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
799 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
800 $self->_render; 847 $self->_render;
801 }; 848 };
802} 849}
803 850
804sub _draw { 851sub _draw {
805 my ($self) = @_; 852 my ($self) = @_;
806 853
807 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
808 855
809 my $tex = $self->{texture} 856 my $tex = $self->{texture}
810 or return; 857 or return;
811 858
812 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
835} 882}
836 883
837sub size_request { 884sub size_request {
838 my ($self) = @_; 885 my ($self) = @_;
839 886
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 888
842 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
843} 893}
844 894
845sub size_allocate { 895sub size_allocate {
846 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
847 897
898 my $child = $self->child;
899
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 902
851 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
852 $self->update; 904 $self->update;
853} 905}
854 906
890} 942}
891 943
892sub _render { 944sub _render {
893 my ($self) = @_; 945 my ($self) = @_;
894 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 951
897 $self->SUPER::_render; 952 $self->SUPER::_render;
898} 953}
899 954
902package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
903 958
904our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
905 960
906sub new { 961sub new {
907 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
908 965
909 my $self; 966 my $self;
910 967
911 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
912 vertical => 1, 969 vertical => 1,
917 ; 974 ;
918 975
919 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 978 slider => $slider,
922 @_, 979 %arg,
923 ); 980 );
924 981
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
928 984
929 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
930} 992}
931 993
932sub update { 994sub update {
933 my ($self) = @_; 995 my ($self) = @_;
934 996
997 1059
998our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
999 1061
1000use CFClient::OpenGL; 1062use CFClient::OpenGL;
1001 1063
1002my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1071
1006sub new { 1072sub new {
1007 my $class = shift; 1073 my ($class, %arg) = @_;
1008 1074
1009 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
1010 1076
1011 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1080 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1081 can_events => 1,
1017 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
1018 ); 1085 );
1019 1086
1020 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1088 align => 0,
1022 valign => 1, 1089 valign => 1,
1023 text => $self->{title}, 1090 text => $title,
1024 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1025 1093
1026 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1102}
1028 1103
1029sub border { 1104sub border {
1030 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1031} 1106}
1032 1107
1033sub size_request { 1108sub size_request {
1034 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1035 1113
1036 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1037 1115
1038 ( 1116 (
1039 $w + $self->border * 2, 1117 $w + $self->border * 2,
1042} 1120}
1043 1121
1044sub size_allocate { 1122sub size_allocate {
1045 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1046 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1047 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1049 1135
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1054} 1137}
1055 1138
1056sub button_down { 1139sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1058 1141
1074 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
1075 1158
1076 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1078 1161
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1164
1084 $self->check_size; 1165 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1167 };
1086 1168
1087 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
1091 $self->{motion} = sub { 1173 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1093 1175
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1177
1096 $self->{user_x} = $bx + $x - $ox; 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1101 } 1184 1
1102} 1185}
1103 1186
1104sub button_up { 1187sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1106 1189
1107 delete $self->{motion}; 1190 !!delete $self->{motion}
1108} 1191}
1109 1192
1110sub mouse_motion { 1193sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1112 1195
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1114} 1199}
1115 1200
1116sub _draw { 1201sub _draw {
1117 my ($self) = @_; 1202 my ($self) = @_;
1118 1203
1204 my $child = $self->{children}[0];
1205
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1208
1122 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1211
1125 my $border = $self->border; 1212 my $border = $self->border;
1126 1213
1127 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1219
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1135 1222
1136 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1228 }
1147 1229
1148 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1149 1231
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1153} 1238}
1154 1239
1155############################################################################# 1240#############################################################################
1156 1241
1157package CFClient::UI::Table; 1242package CFClient::UI::Table;
1179 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1180 1265
1181 $child->set_parent ($self); 1266 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1183 1268
1184 $self->check_size (1); 1269 $self->realloc;
1185} 1270}
1186 1271
1187# TODO: move to container class maybe? send children a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1273sub clear {
1189 my ($self) = @_; 1274 my ($self) = @_;
1194 for (@children) { 1279 for (@children) {
1195 delete $_->{parent}; 1280 delete $_->{parent};
1196 $_->hide; 1281 $_->hide;
1197 } 1282 }
1198 1283
1199 $self->check_size (1); 1284 $self->realloc;
1200 $self->update;
1201} 1285}
1202 1286
1203sub get_wh { 1287sub get_wh {
1204 my ($self) = @_; 1288 my ($self) = @_;
1205 1289
1301 } 1385 }
1302} 1386}
1303 1387
1304############################################################################# 1388#############################################################################
1305 1389
1306package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1391
1310our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1311 1393
1312sub size_request { 1394sub size_request {
1313 my ($self) = @_; 1395 my ($self) = @_;
1314 1396
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1316 1398 ? (
1317 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1401 )
1320 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1321} 1406}
1322 1407
1323sub size_allocate { 1408sub size_allocate {
1324 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1325 1410
1326 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1412 my $children = $self->{children};
1329 1413
1330 my @h = map $_->{req_w}, @$children; 1414 my @req;
1331 1415
1332 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1333 1417 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1432 }
1348 } 1433 }
1349 1434
1350 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1351 1436
1352 my $y = 0; 1437 my $pos = 0;
1353 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1441
1358 $y += $h; 1442 $pos += $alloc;
1359 } 1443 }
1360 1444
1361 1 1445 1
1362} 1446}
1363 1447
1364############################################################################# 1448#############################################################################
1365 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1366package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1367 1466
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1371 1468
1372sub size_request { 1469sub new {
1373 my ($self) = @_; 1470 my $class = shift;
1374 1471
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1376 1473 vertical => 1,
1377 ( 1474 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1475 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1476}
1421 1477
1422############################################################################# 1478#############################################################################
1423 1479
1424package CFClient::UI::Label; 1480package CFClient::UI::Label;
1441 ellipsise => 3, # end 1497 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1443 fontsize => 1, 1499 fontsize => 1,
1444 align => -1, 1500 align => -1,
1445 valign => -1, 1501 valign => -1,
1446 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1447 can_events => 0, 1504 can_events => 0,
1448 %arg 1505 %arg
1449 ); 1506 );
1450 1507
1451 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1487 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1488 1545
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1491 1548
1549 $self->realloc;
1492 $self->update; 1550 $self->update;
1493 $self->check_size;
1494} 1551}
1495 1552
1496sub set_markup { 1553sub set_markup {
1497 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1498 1555
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1560
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1506 1563
1564 $self->realloc;
1507 $self->update; 1565 $self->update;
1508 $self->check_size;
1509} 1566}
1510 1567
1511sub size_request { 1568sub size_request {
1512 my ($self) = @_; 1569 my ($self) = @_;
1513 1570
1527 1584
1528 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1530 } 1587 }
1531 1588
1532 ( 1589 ($w, $h)
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1590}
1537 1591
1538sub size_allocate { 1592sub size_allocate {
1539 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1540 1594
1595 delete $self->{ox};
1596
1541 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1599}
1543 1600
1544sub set_fontsize { 1601sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1546 1603
1547 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1605 delete $self->{texture};
1549 1606
1550 $self->update; 1607 $self->realloc;
1551 $self->check_size;
1552} 1608}
1553 1609
1554sub _draw { 1610sub _draw {
1555 my ($self) = @_; 1611 my ($self) = @_;
1556 1612
1562 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1622
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1568 1625
1626 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1572 1630
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1634 };
1579 1635
1580 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1638
1636sub set_text { 1692sub set_text {
1637 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1638 1694
1639 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1696 $self->_set_text ($text);
1641 $self->update; 1697
1642 $self->check_size; 1698 $self->realloc;
1643} 1699}
1644 1700
1645sub get_text { 1701sub get_text {
1646 $_[0]{text} 1702 $_[0]{text}
1647} 1703}
1677 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1680 } elsif ($uni) { 1736 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1682 } 1740 }
1683 1741
1684 $self->_set_text ($text); 1742 $self->_set_text ($text);
1685 $self->update; 1743
1686 $self->check_size; 1744 $self->realloc;
1745
1746 1
1687} 1747}
1688 1748
1689sub focus_in { 1749sub focus_in {
1690 my ($self) = @_; 1750 my ($self) = @_;
1691 1751
1706 utf8::encode $text; 1766 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1708 1768
1709 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1710 $self->update; 1770 $self->update;
1771
1772 1
1711} 1773}
1712 1774
1713sub mouse_motion { 1775sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1716} 1780}
1717 1781
1718sub _draw { 1782sub _draw {
1719 my ($self) = @_; 1783 my ($self) = @_;
1720 1784
1797 } else { 1861 } else {
1798 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1799 } 1863 }
1800 1864
1801 } else { 1865 } else {
1802 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1803 } 1869 1
1804
1805} 1870}
1806 1871
1807############################################################################# 1872#############################################################################
1808 1873
1809package CFClient::UI::Button; 1874package CFClient::UI::Button;
1818 1883
1819sub new { 1884sub new {
1820 my $class = shift; 1885 my $class = shift;
1821 1886
1822 $class->SUPER::new ( 1887 $class->SUPER::new (
1823 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1824 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1826 can_hover => 1, 1892 can_hover => 1,
1827 align => 0, 1893 align => 0,
1828 valign => 0, 1894 valign => 0,
1837 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1838 1904
1839 $self->emit ("activate") 1905 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1842} 1910}
1843 1911
1844sub _draw { 1912sub _draw {
1845 my ($self) = @_; 1913 my ($self) = @_;
1846 1914
1875 1943
1876sub new { 1944sub new {
1877 my $class = shift; 1945 my $class = shift;
1878 1946
1879 $class->SUPER::new ( 1947 $class->SUPER::new (
1880 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1881 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1954 state => 0,
1889} 1958}
1890 1959
1891sub size_request { 1960sub size_request {
1892 my ($self) = @_; 1961 my ($self) = @_;
1893 1962
1894 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1895} 1964}
1896 1965
1897sub button_down { 1966sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1899 1968
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1904 } 1977 1
1905} 1978}
1906 1979
1907sub _draw { 1980sub _draw {
1908 my ($self) = @_; 1981 my ($self) = @_;
1909 1982
1910 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1911 1984
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1986
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 1990
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 1992
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 1994
2184 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2263 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2191 vertical => 0, 2266 vertical => 0,
2192 can_hover => 1, 2267 can_hover => 1,
2193 inner_pad => 0.02, 2268 inner_pad => 0.02,
2194 @_ 2269 @_
2195 ); 2270 );
2198 $self->update; 2273 $self->update;
2199 2274
2200 $self 2275 $self
2201} 2276}
2202 2277
2278sub changed { }
2279
2203sub set_range { 2280sub set_range {
2204 my ($self, $range) = @_; 2281 my ($self, $range) = @_;
2205 2282
2206 ($range, $self->{range}) = ($self->{range}, $range); 2283 ($range, $self->{range}) = ($self->{range}, $range);
2207 2284
2233} 2310}
2234 2311
2235sub size_request { 2312sub size_request {
2236 my ($self) = @_; 2313 my ($self) = @_;
2237 2314
2238 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2316}
2243 2317
2244sub button_down { 2318sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2246 2320
2247 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2248 2322
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2324
2251 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2252} 2326}
2253 2327
2254sub mouse_motion { 2328sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2256 2330
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2335
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2337
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2265 } 2343 1
2266} 2344}
2267 2345
2268sub update { 2346sub update {
2269 my ($self) = @_; 2347 my ($self) = @_;
2270 2348
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2273 2358
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2276 2361
2282 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2284 2369
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2287 }); 2372 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2373
2295 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2296 2375
2297 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2298 2377
2631} 2710}
2632 2711
2633sub set_tooltip_from { 2712sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2713 my ($self, $widget) = @_;
2635 2714
2715 my $tooltip = $widget->{tooltip};
2716
2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2636 $self->add (new CFClient::UI::Label 2724 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2725 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2727 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2728 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2729 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
2653 2741
2654sub size_allocate { 2742sub size_allocate {
2655 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2656 2744
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2746}
2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2658} 2764}
2659 2765
2660sub _draw { 2766sub _draw {
2661 my ($self) = @_; 2767 my ($self) = @_;
2662 2768
2679 glVertex $w, $h; 2785 glVertex $w, $h;
2680 glVertex $w, 0; 2786 glVertex $w, 0;
2681 glEnd; 2787 glEnd;
2682 2788
2683 glTranslate 2 - 0.375, 2 - 0.375; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2790
2684 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2685} 2792}
2686 2793
2687############################################################################# 2794#############################################################################
2688 2795
2764 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2765} 2872}
2766 2873
2767############################################################################# 2874#############################################################################
2768 2875
2769package CFClient::UI::Inventory; 2876package CFClient::UI::Buttonbar;
2770 2877
2771our @ISA = CFClient::UI::ScrolledWindow::; 2878our @ISA = CFClient::UI::HBox::;
2772 2879
2773sub new { 2880# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2881
2814############################################################################# 2882#############################################################################
2815 2883
2816package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2817 2885
2858 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2927 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2861 2929
2862 $self->show; 2930 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2932}
2865 2933
2866sub mouse_motion { 2934sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2868 2936
2869 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2872} 2942}
2873 2943
2874sub button_up { 2944sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2876 2946
2878 undef $GRAB; 2948 undef $GRAB;
2879 $self->hide; 2949 $self->hide;
2880 2950
2881 $self->_emit ("popdown"); 2951 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2883 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2884} 3066}
2885 3067
2886############################################################################# 3068#############################################################################
2887 3069
2888package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
2993 $self->SUPER::reconfigure; 3175 $self->SUPER::reconfigure;
2994} 3176}
2995 3177
2996############################################################################# 3178#############################################################################
2997 3179
2998package CFClient::UI::Root; 3180package CFClient::UI::Inventory;
2999 3181
3000our @ISA = CFClient::UI::Container::; 3182our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3183
3004sub new { 3184sub new {
3005 my $class = shift; 3185 my $class = shift;
3006 3186
3007 $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3429 @_,
3430 )
3431}
3432
3433# XXX: Do sorting? Argl...
3434sub add_spell {
3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3437
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root;
3476
3477our @ISA = CFClient::UI::Container::;
3478
3479use CFClient::OpenGL;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3008 visible => 1, 3485 visible => 1,
3009 @_, 3486 @_,
3010 ) 3487 );
3011}
3012 3488
3013sub configure { 3489 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3490
3016 $self->{w} = $w; 3491 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3492}
3026 3493
3027sub size_request { 3494sub size_request {
3028 my ($self) = @_; 3495 my ($self) = @_;
3029 3496
3030 ($self->{w}, $self->{h}) 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
3031} 3512}
3032 3513
3033sub size_allocate { 3514sub size_allocate {
3034 my ($self, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
3035 3516
3036 for my $child ($self->children) { 3517 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3519
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3520 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3041 3522
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3523 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3524 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3525
3051 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
3052 } 3527 }
3053} 3528}
3054 3529
3065} 3540}
3066 3541
3067sub update { 3542sub update {
3068 my ($self) = @_; 3543 my ($self) = @_;
3069 3544
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3545 $::WANT_REFRESH++;
3072} 3546}
3073 3547
3074sub add { 3548sub add {
3075 my ($self, @children) = @_; 3549 my ($self, @children) = @_;
3076 3550
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3551 $_->{is_toplevel} = 1
3085 3552 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3553
3091 $self->SUPER::add (@children); 3554 $self->SUPER::add (@children);
3092} 3555}
3093 3556
3094sub remove { 3557sub remove {
3095 my ($self, @children) = @_; 3558 my ($self, @children) = @_;
3096 3559
3097 $self->SUPER::remove (@children); 3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3098 3564
3099 while (@children) { 3565 while (@children) {
3100 my $w = pop @children; 3566 my $w = pop @children;
3101 push @children, $w->children; 3567 push @children, $w->children;
3102 $w->set_invisible; 3568 $w->set_invisible;
3121 while ($self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
3122 $_->() 3588 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3589 for values %{delete $self->{refresh_hook}};
3124 } 3590 }
3125 3591
3126 if ($self->{check_size}) { 3592 if ($self->{realloc}) {
3593 my %queue;
3127 my @queue; 3594 my @queue;
3595 my $widget;
3128 3596
3129 for (;;) { 3597 outer:
3130 if ($self->{check_size}) { 3598 while () {
3131 #TODO use array-of-depth approach 3599 if (my $realloc = delete $self->{realloc}) {
3600 for $widget (values %$realloc) {
3601 $widget->{visible} or next; # do not resize invisible widgets
3132 3602
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3603 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3135 } 3607 }
3136 3608
3609 while () {
3610 @queue or last outer;
3611
3137 my $widget = pop @queue || last; 3612 $widget = pop @{ $queue[-1] || [] }
3138 3613 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3630 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3631 $widget->{req_h} = $h;
3151 3632
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3633 $self->{size_alloc}{$widget+0} = $widget;
3153 3634
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3156 } 3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3157 } 3645 }
3158 } 3646 }
3159 3647
3160 while ($self->{size_alloc}) { 3648 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3650 values %$size_alloc;
3651
3652 while () {
3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3656
3164 $w = 0 if $w < 0; 3657 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3658 $h = 0 if $h < 0;
3166 3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3167 $widget->{w} = $w; 3667 $widget->{w} = $w;
3168 $widget->{h} = $h; 3668 $widget->{h} = $h;
3669
3169 $widget->emit (size_allocate => $w, $h); 3670 $widget->emit (size_allocate => $w, $h);
3671 }
3170 } 3672 }
3171 } 3673 }
3172 3674
3173 while ($self->{post_alloc_hook}) { 3675 while ($self->{post_alloc_hook}) {
3174 $_->() 3676 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3677 for values %{delete $self->{post_alloc_hook}};
3176 } 3678 }
3679
3177 3680
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
3181 3684
3183 glLoadIdentity; 3686 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3689 glLoadIdentity;
3187 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
3188 $self->_draw; 3698 $self->_draw;
3189} 3699}
3190 3700
3191############################################################################# 3701#############################################################################
3192 3702

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines