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.309 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
393 431
394 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
395 433
396 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
397 435
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 439 }
402} 440}
403 441
404# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
405sub coord2local { 443sub coord2local {
406 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
407 445
446 Carp::confess unless $self->{parent};#d#
447
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 449}
410 450
411# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
412sub coord2global { 452sub coord2global {
413 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
414 454
455 Carp::confess unless $self->{parent};#d#
456
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 458}
417 459
418sub invoke_focus_in { 460sub invoke_focus_in {
419 my ($self) = @_; 461 my ($self) = @_;
420 462
421 return if $FOCUS == $self; 463 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
423 465
424 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
425 467
426 $focus->update if $focus; 468 $self->update;
427 $FOCUS->update;
428 469
429 0 470 0
430} 471}
431 472
432sub invoke_focus_out { 473sub invoke_focus_out {
433 my ($self) = @_; 474 my ($self) = @_;
434 475
435 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
436 477
437 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
438 479
439 $focus->update if $focus; #? 480 $self->update;
440 481
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 483 unless $FOCUS;
443 484
444 0 485 0
445} 486}
446 487
447sub grab_focus { 488sub grab_focus {
448 my ($self) = @_; 489 my ($self) = @_;
449 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
451} 493}
452 494
453sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
457 500
458sub invoke_button_down { 501sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
460 503
461 $self->grab_focus; 504 $self->grab_focus;
462 505
463 1 506 0
464} 507}
465 508
466sub connect { 509sub connect {
467 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
468 511
469 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
470} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
471 532
472sub emit { 533sub emit {
473 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
474 535
475 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 554}
480 555
481sub find_widget { 556#sub find_widget {
482 my ($self, $x, $y) = @_; 557# in .xs
483
484 return () unless $self->{can_events};
485
486 return $self
487 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490 ()
491}
492 558
493sub set_parent { 559sub set_parent {
494 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
495 561
496 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
498} 564}
499 565
500sub realloc { 566sub realloc {
501 my ($self) = @_; 567 my ($self) = @_;
… …
527 593
528# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless. 595# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531 597
532sub draw { 598#sub draw {
533 my ($self) = @_; 599#CFPlus.xs
534
535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546
547 glPushMatrix;
548 glTranslate $self->{x}, $self->{y}, 0;
549
550 if ($self == $HOVER && $self->{can_hover}) {
551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
552 glEnable GL_BLEND;
553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
554 glBegin GL_QUADS;
555 glVertex 0 , 0;
556 glVertex $self->{w}, 0;
557 glVertex $self->{w}, $self->{h};
558 glVertex 0 , $self->{h};
559 glEnd;
560 glDisable GL_BLEND;
561 }
562
563 if ($ENV{CFPLUS_DEBUG} & 1) {
564 glPushMatrix;
565 glColor 1, 1, 0, 1;
566 glTranslate 0.375, 0.375;
567 glBegin GL_LINE_LOOP;
568 glVertex 0 , 0;
569 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1;
572 glEnd;
573 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 }
576
577 $self->_draw;
578 glPopMatrix;
579}
580 600
581sub _draw { 601sub _draw {
582 my ($self) = @_; 602 my ($self) = @_;
583 603
584 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
585} 605}
586 606
587sub DESTROY { 607sub DESTROY {
588 my ($self) = @_; 608 my ($self) = @_;
589 609
590 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
591 611
592 eval { $self->destroy }; 612 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
594} 616}
595 617
596############################################################################# 618#############################################################################
597 619
598package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
599 621
600our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
601 623
602use strict; 624use strict;
603use CFClient::OpenGL; 625use CFPlus::OpenGL;
604 626
605sub new { 627sub new {
606 my $class = shift; 628 my $class = shift;
607 629
608 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
639 } 661 }
640} 662}
641 663
642############################################################################# 664#############################################################################
643 665
644package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
645 667
646our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
647 669
648sub new { 670sub new {
649 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
651} 673}
… …
658 680
659sub draw { } 681sub draw { }
660 682
661############################################################################# 683#############################################################################
662 684
663package CFClient::UI::Container; 685package CFPlus::UI::Container;
664 686
665our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
666 688
667sub new { 689sub new {
668 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
669 691
670 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
674 can_events => 0, 696 can_events => 0,
675 %arg, 697 %arg,
676 ); 698 );
677 699
678 $self->add (@$children) 700 $self->add (@$children)
679 if $children; 701 if $children && @$children;
680 702
681 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
682} 712}
683 713
684sub add { 714sub add {
685 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
686 716
687 $_->set_parent ($self) 717 $_->set_parent ($self)
688 for @widgets; 718 for @widgets;
689 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
690 use sort 'stable'; 721 use sort 'stable';
691 722
692 $self->{children} = [ 723 $self->{children} = [
693 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
694 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
695 ]; 726 ];
696 727
697 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
698} 731}
699 732
700sub children { 733sub children {
701 @{ $_[0]{children} } 734 @{ $_[0]{children} }
702} 735}
… …
713} 746}
714 747
715sub clear { 748sub clear {
716 my ($self) = @_; 749 my ($self) = @_;
717 750
718 my $children = delete $self->{children}; 751 my $children = $self->{children};
719 $self->{children} = []; 752 $self->{children} = [];
720 753
721 for (@$children) { 754 for (@$children) {
722 delete $_->{parent}; 755 delete $_->{parent};
723 $_->hide; 756 $_->hide;
… …
748 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
749} 782}
750 783
751############################################################################# 784#############################################################################
752 785
753package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
754 787
755our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
756 789
757sub new { 790sub new {
758 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
759 792
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 794
762 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
763} 796}
764 797
765sub add { 798sub add {
… …
772sub remove { 805sub remove {
773 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
774 807
775 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
776 809
777 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 811 unless @{$self->{children}};
779} 812}
780 813
781sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
782 815
… …
794 827
795############################################################################# 828#############################################################################
796 829
797# back-buffered drawing area 830# back-buffered drawing area
798 831
799package CFClient::UI::Window; 832package CFPlus::UI::Window;
800 833
801our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
802 835
803use CFClient::OpenGL; 836use CFPlus::OpenGL;
804 837
805sub new { 838sub new {
806 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
807 840
808 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
830} 863}
831 864
832sub render_child { 865sub render_child {
833 my ($self) = @_; 866 my ($self) = @_;
834 867
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
838 871
839 { 872 {
840 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
841 874
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
844 } 879 }
845
846 $self->_render;
847 }; 880 };
848} 881}
849 882
850sub _draw { 883sub _draw {
851 my ($self) = @_; 884 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 885
855 my $tex = $self->{texture} 886 my $tex = $self->{texture}
856 or return; 887 or return;
857 888
858 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
861 892
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
863 894
864 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
865} 896}
866 897
867############################################################################# 898#############################################################################
868 899
869package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
870 901
902use List::Util qw(min max);
903
871our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
872 905
873sub new { 906sub new {
874 my $class = shift; 907 my $class = shift;
875 908
876 $class->SUPER::new ( 909 $class->SUPER::new (
… …
883sub size_request { 916sub size_request {
884 my ($self) = @_; 917 my ($self) = @_;
885 918
886 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887 920
888 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
890 923
891 ($w, $h) 924 ($w, $h)
892} 925}
893 926
894sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
906} 939}
907 940
908sub set_offset { 941sub set_offset {
909 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
910 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
911 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
912 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
913 950
951 $self->emit (changed => $x, $y);
914 $self->update; 952 $self->update;
953 }
915} 954}
916 955
917# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 957sub coord2local {
919 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
934 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
935 974
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 977 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 979 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 981 }
943} 982}
944 983
945sub _render { 984sub _render {
946 my ($self) = @_; 985 my ($self) = @_;
947 986
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 989
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 991
953 $self->SUPER::_render; 992 $self->SUPER::_render;
954} 993}
955 994
956############################################################################# 995#############################################################################
957 996
958package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
959 998
960our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
961 1000
962sub new { 1001sub new {
963 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
964 1003
965 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
966 1005
967 my $self; 1006 my $self;
968 1007
969 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
970 vertical => 1, 1022 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1024 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1027 },
975 ; 1028 ;
976 1029
977 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
979 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
980 %arg, 1038 %arg,
981 ); 1039 );
982 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
984 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
985 1065
986 $self 1066 $self
987} 1067}
988 1068
… …
990 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
991 1071
992 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
993} 1073}
994 1074
995sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
996 my ($self) = @_; 1106 my ($self, $ev) = @_;
997 1107
998 $self->SUPER::update; 1108 $self->grab_focus;
999 1109
1000 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1001 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1003} 1162}
1004 1163
1005sub invoke_size_allocate { 1164sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1007 1166
1008 my $child = $self->{vp}->child; 1167 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1169}
1013 1170
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1171#############################################################################
1018 1172
1019package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1020 1174
1021our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1022 1176
1023use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1024 1178
1025sub new { 1179sub new {
1026 my $class = shift; 1180 my $class = shift;
1027 1181
1028 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1055} 1209}
1056 1210
1057############################################################################# 1211#############################################################################
1058 1212
1059package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1060 1214
1061our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1062 1216
1063use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1064 1318
1065my $bg = 1319my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1068 1322
1069my @border = 1323my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1072 1330
1073sub new { 1331sub new {
1074 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1075 1333
1076 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1337 border => 0.6,
1080 can_events => 1, 1338 can_events => 1,
1081 min_w => 16, 1339 min_w => 64,
1082 min_h => 16, 1340 min_h => 32,
1083 %arg, 1341 %arg,
1084 ); 1342 );
1085 1343
1086 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1345 align => 0,
1088 valign => 1, 1346 valign => 1,
1089 text => $self->{title}, 1347 text => $self->{title},
1090 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1091 if exists $self->{title}; 1349 if exists $self->{title};
1092 1350
1093 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1352 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1354 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1098 1356
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1358 }
1101 1359
1102 $self 1360 $self
1103} 1361}
1104 1362
1105sub add { 1363sub add {
1106 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1107 1365
1108 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1369}
1112 1370
1113sub border { 1371sub border {
1114 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1115} 1373}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1149 1407
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1409 if $self->{close_button};
1152 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1153 1 1419 1
1154} 1420}
1155 1421
1156sub invoke_button_down { 1422sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1482
1217 ! ! $self->{motion} 1483 ! ! $self->{motion}
1218} 1484}
1219 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1220sub _draw { 1494sub _draw {
1221 my ($self) = @_; 1495 my ($self) = @_;
1222 1496
1223 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1224 1498
… …
1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230 1504
1231 my $border = $self->border; 1505 my $border = $self->border;
1232 1506
1233 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1234 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238 1526
1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1241 1529
1242 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1261 if $self->{close_button}; 1549 if $self->{close_button};
1262} 1550}
1263 1551
1264############################################################################# 1552#############################################################################
1265 1553
1266package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1267 1555
1268our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1269 1557
1270use List::Util qw(max sum); 1558use List::Util qw(max sum);
1271 1559
1272use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1273 1561
1274sub new { 1562sub new {
1275 my $class = shift; 1563 my $class = shift;
1276 1564
1277 $class->SUPER::new ( 1565 $class->SUPER::new (
1278 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1279 @_, 1568 @_,
1280 ) 1569 )
1281} 1570}
1282 1571
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285}
1286
1287sub add { 1572sub add {
1288 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1289 1574
1290 $child->set_parent ($self); 1575 for my $child (@widgets) {
1291 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1292 1579
1293 $self->realloc; 1580 $self->SUPER::add (@widgets);
1294} 1581}
1295 1582
1296sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1297 my ($self, $child) = @_; 1601 my ($self) = @_;
1298 1602
1299 # TODO: not yet implemented 1603 my (@w, @h);
1300}
1301
1302# TODO: move to container class maybe? send children a signal on removal?
1303sub clear {
1304 my ($self) = @_;
1305 1604
1306 my @children = $self->children; 1605 my @children = $self->children;
1307 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1308 1616 }
1309 for (@children) {
1310 delete $_->{parent};
1311 $_->hide;
1312 }
1313 1617
1314 $self->realloc; 1618 # second pass, rows
1315} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1316
1317sub get_wh {
1318 my ($self) = @_;
1319
1320 my (@w, @h);
1321
1322 for my $y (0 .. $#{$self->{children}}) {
1323 my $row = $self->{children}[$y]
1324 or next;
1325
1326 for my $x (0 .. $#$row) {
1327 my $widget = $row->[$x]
1328 or next;
1329 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1330 1621
1331 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1332 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333 } 1626 }
1334 } 1627 }
1335 1628
1336 (\@w, \@h) 1629 (\@w, \@h)
1337} 1630}
… …
1353 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1354 1647
1355 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1357 1650
1358 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1359 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1362 1655
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1657
1367 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1368 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1369 1667
1370 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371 1670
1372 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1373 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374 or next;
1375 1673
1376 my $x = 0; 1674 $widget->configure (
1377 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378 1677 );
1379 for my $c (0 .. $#$row) { 1678 }
1380 my $col_w = $ws->[$c];
1381 1679
1382 if (my $widget = $row->[$c]) { 1680 1
1383 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1384 }
1385 1682
1386 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1387 } 1710 }
1711 }
1388 1712
1389 $y += $row_h; 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1715
1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1734 my ($self, $W, $H) = @_;
1735
1736 for my $child ($self->visible_children) {
1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739
1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1742
1743 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1390 } 1744 }
1391 1745
1392 1 1746 1
1393} 1747}
1394 1748
1395sub find_widget {
1396 my ($self, $x, $y) = @_;
1397
1398 $x -= $self->{x};
1399 $y -= $self->{y};
1400
1401 my $res;
1402
1403 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1404 $res = $_->find_widget ($x, $y)
1405 and return $res;
1406 }
1407
1408 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1409}
1410
1411sub _draw {
1412 my ($self) = @_;
1413
1414 for (grep $_, @{$self->{children}}) {
1415 $_->draw for grep $_, @$_;
1416 }
1417}
1418
1419############################################################################# 1749#############################################################################
1420 1750
1421package CFClient::UI::Box; 1751package CFPlus::UI::Box;
1422 1752
1423our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1424 1754
1425sub size_request { 1755sub size_request {
1426 my ($self) = @_; 1756 my ($self) = @_;
1427 1757
1428 $self->{vertical} 1758 $self->{vertical}
… …
1438 1768
1439sub invoke_size_allocate { 1769sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1770 my ($self, $w, $h) = @_;
1441 1771
1442 my $space = $self->{vertical} ? $h : $w; 1772 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1773 my @children = $self->visible_children;
1444 1774
1445 my @req; 1775 my @req;
1446 1776
1447 if ($self->{homogeneous}) { 1777 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1778 @req = ($space / (@children || 1)) x @children;
1449 } else { 1779 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1780 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1781 my $req = List::Util::sum @req;
1452 1782
1453 if ($req > $space) { 1783 if ($req > $space) {
1454 # ah well, not enough space 1784 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1785 $_ *= $space / $req for @req;
1456 } else { 1786 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1787 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1788
1459 $space = ($space - $req) / $expand; # remaining space to give away 1789 $space = ($space - $req) / $expand; # remaining space to give away
1460 1790
1461 $req[$_] += $space * $children->[$_]{expand} 1791 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1792 for 0 .. $#children;
1463 } 1793 }
1464 } 1794 }
1465 1795
1466 CFClient::UI::harmonize \@req; 1796 CFPlus::UI::harmonize \@req;
1467 1797
1468 my $pos = 0; 1798 my $pos = 0;
1469 for (0 .. $#$children) { 1799 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1800 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1802
1473 $pos += $alloc; 1803 $pos += $alloc;
1474 } 1804 }
1475 1805
1476 1 1806 1
1477} 1807}
1478 1808
1479############################################################################# 1809#############################################################################
1480 1810
1481package CFClient::UI::HBox; 1811package CFPlus::UI::HBox;
1482 1812
1483our @ISA = CFClient::UI::Box::; 1813our @ISA = CFPlus::UI::Box::;
1484 1814
1485sub new { 1815sub new {
1486 my $class = shift; 1816 my $class = shift;
1487 1817
1488 $class->SUPER::new ( 1818 $class->SUPER::new (
… …
1491 ) 1821 )
1492} 1822}
1493 1823
1494############################################################################# 1824#############################################################################
1495 1825
1496package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1497 1827
1498our @ISA = CFClient::UI::Box::; 1828our @ISA = CFPlus::UI::Box::;
1499 1829
1500sub new { 1830sub new {
1501 my $class = shift; 1831 my $class = shift;
1502 1832
1503 $class->SUPER::new ( 1833 $class->SUPER::new (
… …
1506 ) 1836 )
1507} 1837}
1508 1838
1509############################################################################# 1839#############################################################################
1510 1840
1511package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1512 1842
1513our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1514 1844
1515use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1516 1846
1517sub new { 1847sub new {
1518 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1519 1849
1520 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1853 #active_bg => none
1524 #font => default_font 1854 #font => default_font
1525 #text => initial text 1855 #text => initial text
1526 #markup => initial narkup 1856 #markup => initial narkup
1527 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1528 ellipsise => 3, # end 1859 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1861 fontsize => 1,
1531 align => -1, 1862 align => -1,
1532 valign => -1, 1863 valign => -1,
1533 padding_x => 2, 1864 padding_x => 2,
1534 padding_y => 2, 1865 padding_y => 2,
1535 can_events => 0, 1866 can_events => 0,
1536 %arg 1867 %arg
1537 ); 1868 );
1538 1869
1539 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1873 $self->{template} = $layout;
1543 } 1874 }
1544 1875
1545 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1549 } 1880 }
1550 1881
1551 $self 1882 $self
1552} 1883}
1553 1884
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1885sub update {
1565 my ($self) = @_; 1886 my ($self) = @_;
1566 1887
1567 delete $self->{texture}; 1888 delete $self->{texture};
1568 $self->SUPER::update; 1889 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1900 my ($self, $text) = @_;
1580 1901
1581 return if $self->{text} eq "T$text"; 1902 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1903 $self->{text} = "T$text";
1583 1904
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1905 $self->{layout}->set_text ($text);
1586 1906
1587 delete $self->{size_req}; 1907 delete $self->{size_req};
1588 $self->realloc; 1908 $self->realloc;
1589 $self->update; 1909 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1915 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1916 $self->{text} = "M$markup";
1597 1917
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1918 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1919
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1920 $self->{layout}->set_markup ($markup);
1602 1921
1603 delete $self->{size_req}; 1922 delete $self->{size_req};
1604 $self->realloc; 1923 $self->realloc;
1605 $self->update; 1924 $self->update;
… …
1617 1936
1618 my ($w, $h) = $self->{layout}->size; 1937 my ($w, $h) = $self->{layout}->size;
1619 1938
1620 if (exists $self->{template}) { 1939 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1940 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1943
1624 my ($w2, $h2) = $self->{template}->size; 1944 my ($w2, $h2) = $self->{template}->size;
1625 1945
1626 $w = List::Util::max $w, $w2; 1946 $w = List::Util::max $w, $w2;
… …
1631 }; 1951 };
1632 1952
1633 @{ $self->{size_req} } 1953 @{ $self->{size_req} }
1634} 1954}
1635 1955
1956sub baseline_shift {
1957 $_[0]{layout}->descent
1958}
1959
1636sub invoke_size_allocate { 1960sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1961 my ($self, $w, $h) = @_;
1638 1962
1639 delete $self->{ox}; 1963 delete $self->{ox};
1640 1964
… …
1646 1970
1647sub set_fontsize { 1971sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1972 my ($self, $fontsize) = @_;
1649 1973
1650 $self->{fontsize} = $fontsize; 1974 $self->{fontsize} = $fontsize;
1975 delete $self->{size_req};
1651 delete $self->{texture}; 1976 delete $self->{texture};
1652 1977
1653 $self->realloc; 1978 $self->realloc;
1654} 1979}
1655 1980
1656sub reconfigure { 1981sub reconfigure {
1657 my ($self) = @_; 1982 my ($self) = @_;
1658 1983
1659 delete $self->{size_req}; 1984 delete $self->{size_req};
1985 delete $self->{texture};
1660 1986
1661 $self->SUPER::reconfigure; 1987 $self->SUPER::reconfigure;
1662} 1988}
1663 1989
1664sub _draw { 1990sub _draw {
1665 my ($self) = @_; 1991 my ($self) = @_;
1666 1992
1667 $self->SUPER::_draw; # draw background, if applicable 1993 $self->SUPER::_draw; # draw background, if applicable
1668 1994
1669 my $tex = $self->{texture} ||= do { 1995 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1996 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1998 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2002
1677 new_from_layout CFClient::Texture $self->{layout} 2003 [$self->{layout}->size]
1678 }; 2004 };
1679 2005
1680 unless (exists $self->{ox}) { 2006 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2009 : ($self->{w} - $size->[0]) * 0.5);
1684 2010
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2014 };
1689 2015
1690 glEnable GL_TEXTURE_2D; 2016# unless ($self->{list}) {
1691 2017# $self->{list} = CFPlus::OpenGL::glGenList;
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2018# CFPlus::OpenGL::glNewList $self->{list};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694 2020# CFPlus::OpenGL::glEndList;
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 } 2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1703 2024
1704 glDisable GL_TEXTURE_2D; 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1706 2035
1707############################################################################# 2036#############################################################################
1708 2037
1709package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1710 2039
1711our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1712 2041
1713use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1714 2043
1715sub new { 2044sub new {
1716 my $class = shift; 2045 my $class = shift;
1717 2046
1718 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1723 can_hover => 1, 2052 can_hover => 1,
1724 can_focus => 1, 2053 can_focus => 1,
1725 valign => 0, 2054 valign => 0,
1726 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1727 #text => ... 2057 #text => ...
1728 #hidden => "*", 2058 #hidden => "*",
1729 @_ 2059 @_
1730 ) 2060 )
1731} 2061}
… …
1776 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1778 2108
1779 my $text = $self->get_text; 2109 my $text = $self->get_text;
1780 2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112
1781 if ($uni == 8) { 2113 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1790 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2137 $self->emit ('escape');
1795 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2142 } else {
1798 return 0; 2143 return 0;
1799 } 2144 }
1800 2145
1801 $self->_set_text ($text); 2146 $self->_set_text ($text);
1802 2147
1803 $self->realloc; 2148 $self->realloc;
2149 $self->update;
1804 2150
1805 1 2151 1
1806} 2152}
1807 2153
1808sub invoke_focus_in { 2154sub invoke_focus_in {
… …
1820 2166
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2167 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2168
1823 # byte-index to char-index 2169 # byte-index to char-index
1824 my $text = $self->{text}; 2170 my $text = $self->{text};
1825 utf8::encode $text; 2171 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2172 $self->{cursor} = length $text;
1827 2173
1828 $self->_set_text ($self->{text}); 2174 $self->_set_text ($self->{text});
1829 $self->update; 2175 $self->update;
1830 2176
1831 1 2177 1
… …
1870 utf8::encode $text; 2216 utf8::encode $text;
1871 2217
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2219 }
1874 2220
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2221 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2224 glEnd;
1880 } 2225 }
1881} 2226}
1882 2227
2228#############################################################################
2229
1883package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1884 2231
1885our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1886 2233
1887use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1888 2235
1889sub invoke_key_down { 2236sub invoke_key_down {
1890 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1891 2238
1892 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1893 2240
1894 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
1897 2244
1898 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2247 $self->emit (activate => $txt);
1901 $self->update; 2248 $self->update;
1902 2249
1903 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1906 } 2253 }
1907 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2258 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2260 }
1914 2261
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2265
1919 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2276 1
1930} 2277}
1931 2278
1932############################################################################# 2279#############################################################################
1933 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
1934package CFClient::UI::Button; 2320package CFPlus::UI::Button;
1935 2321
1936our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
1937 2323
1938use CFClient::OpenGL; 2324use CFPlus::OpenGL;
1939 2325
1940my @tex = 2326my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
1943 2329
1944sub new { 2330sub new {
1945 my $class = shift; 2331 my $class = shift;
1946 2332
1947 $class->SUPER::new ( 2333 $class->SUPER::new (
1948 padding_x => 4, 2334 padding_x => 4,
1949 padding_y => 4, 2335 padding_y => 4,
1950 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
1951 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
1952 can_hover => 1, 2338 can_hover => 1,
1953 align => 0, 2339 align => 0,
1954 valign => 0, 2340 valign => 0,
1955 can_events => 1, 2341 can_events => 1,
1956 @_ 2342 @_
… …
1974 2360
1975 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
1978 2364
2365 my $tex = $tex[$GRAB == $self];
1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980 2367
1981 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
1982 2369
1983 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
1984} 2371}
1985 2372
1986############################################################################# 2373#############################################################################
1987 2374
2375package CFPlus::UI::CheckBox;
2376
2377our @ISA = CFPlus::UI::DrawBG::;
2378
2379my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382
2383use CFPlus::OpenGL;
2384
2385sub new {
2386 my $class = shift;
2387
2388 $class->SUPER::new (
2389 padding_x => 2,
2390 padding_y => 2,
2391 fg => [1, 1, 1],
2392 active_fg => [1, 1, 0],
2393 bg => [0, 0, 0, 0.2],
2394 active_bg => [1, 1, 1, 0.5],
2395 state => 0,
2396 can_hover => 1,
2397 @_
2398 )
2399}
2400
2401sub size_request {
2402 my ($self) = @_;
2403
2404 (6) x 2
2405}
2406
2407sub toggle {
2408 my ($self) = @_;
2409
2410 $self->{state} = !$self->{state};
2411 $self->emit (changed => $self->{state});
2412 $self->update;
2413}
2414
2415sub invoke_button_down {
2416 my ($self, $ev, $x, $y) = @_;
2417
2418 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2419 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2420 $self->toggle;
2421 } else {
2422 return 0
2423 }
2424
2425 1
2426}
2427
2428sub _draw {
2429 my ($self) = @_;
2430
2431 $self->SUPER::_draw;
2432
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2434
2435 my ($w, $h) = @$self{qw(w h)};
2436
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438
2439 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2440
2441 my $tex = $self->{state} ? $tex[1] : $tex[0];
2442
2443 glEnable GL_TEXTURE_2D;
2444 $tex->draw_quad_alpha (0, 0, $s, $s);
2445 glDisable GL_TEXTURE_2D;
2446}
2447
2448#############################################################################
2449
2450package CFPlus::UI::Image;
2451
2452our @ISA = CFPlus::UI::Base::;
2453
2454use CFPlus::OpenGL;
2455
2456our %texture_cache;
2457
2458sub new {
2459 my $class = shift;
2460
2461 my $self = $class->SUPER::new (
2462 can_events => 0,
2463 @_,
2464 );
2465
2466 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required";
2468
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2471
2472 CFPlus::weaken $texture_cache{$self->{path}};
2473
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475
2476 $self
2477}
2478
2479sub STORABLE_freeze {
2480 my ($self, $cloning) = @_;
2481
2482 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2484
2485 $self->{path}
2486}
2487
2488sub STORABLE_attach {
2489 my ($self, $cloning, $path) = @_;
2490
2491 $self->new (path => $path)
2492}
2493
2494sub size_request {
2495 my ($self) = @_;
2496
2497 ($self->{tex}{w}, $self->{tex}{h})
2498}
2499
2500sub _draw {
2501 my ($self) = @_;
2502
2503 my $tex = $self->{tex};
2504
2505 my ($w, $h) = ($self->{w}, $self->{h});
2506
2507 if ($self->{rot90}) {
2508 glRotate 90, 0, 0, 1;
2509 glTranslate 0, -$self->{w}, 0;
2510
2511 ($w, $h) = ($h, $w);
2512 }
2513
2514 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516
2517 $tex->draw_quad (0, 0, $w, $h);
2518
2519 glDisable GL_TEXTURE_2D;
2520}
2521
2522#############################################################################
2523
1988package CFClient::UI::ImageButton; 2524package CFPlus::UI::ImageButton;
1989 2525
1990our @ISA = CFClient::UI::Image::; 2526our @ISA = CFPlus::UI::Image::;
1991 2527
1992use CFClient::OpenGL; 2528use CFPlus::OpenGL;
1993 2529
1994my %textures; 2530my %textures;
1995 2531
1996sub new { 2532sub new {
1997 my $class = shift; 2533 my $class = shift;
… …
2019 1 2555 1
2020} 2556}
2021 2557
2022############################################################################# 2558#############################################################################
2023 2559
2024package CFClient::UI::CheckBox;
2025
2026our @ISA = CFClient::UI::DrawBG::;
2027
2028my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032use CFClient::OpenGL;
2033
2034sub new {
2035 my $class = shift;
2036
2037 $class->SUPER::new (
2038 padding_x => 2,
2039 padding_y => 2,
2040 fg => [1, 1, 1],
2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
2044 state => 0,
2045 can_hover => 1,
2046 @_
2047 )
2048}
2049
2050sub size_request {
2051 my ($self) = @_;
2052
2053 (6) x 2
2054}
2055
2056sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_;
2058
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state};
2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
2067 1
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072
2073 $self->SUPER::_draw;
2074
2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085 glEnable GL_TEXTURE_2D;
2086 $tex->draw_quad_alpha (0, 0, $s, $s);
2087 glDisable GL_TEXTURE_2D;
2088}
2089
2090#############################################################################
2091
2092package CFClient::UI::Image; 2560package CFPlus::UI::VGauge;
2093 2561
2094our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097use Carp qw/confess/;
2098
2099our %loaded_images;
2100
2101sub new {
2102 my $class = shift;
2103
2104 my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108 $loaded_images{$self->{image}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113 Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116
2117 $self
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 ($self->{tex}->{w}, $self->{tex}->{h})
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 my $tex = $self->{tex};
2130
2131 my ($w, $h) = ($self->{w}, $self->{h});
2132
2133 if ($self->{rot90}) {
2134 glRotate 90, 0, 0, 1;
2135 glTranslate 0, -$self->{w}, 0;
2136
2137 ($w, $h) = ($h, $w);
2138 }
2139
2140 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143 $tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145 glDisable GL_TEXTURE_2D;
2146}
2147
2148#############################################################################
2149
2150package CFClient::UI::VGauge;
2151
2152our @ISA = CFClient::UI::Base::;
2153 2563
2154use List::Util qw(min max); 2564use List::Util qw(min max);
2155 2565
2156use CFClient::OpenGL; 2566use CFPlus::OpenGL;
2157 2567
2158my %tex = ( 2568my %tex = (
2159 food => [ 2569 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2572 ],
2163 grace => [ 2573 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2576 ],
2167 hp => [ 2577 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2580 ],
2171 mana => [ 2581 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2584 ],
2175); 2585);
2176 2586
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2647 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2648 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2649
2240 my $h1 = $self->{h} * (1 - $ycut1); 2650 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2651 my $h2 = $self->{h} * (1 - $ycut2);
2652 my $h3 = $self->{h};
2653
2654 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2655
2243 glEnable GL_BLEND; 2656 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2657 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2658 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
… …
2265 2678
2266 if ($t3) { 2679 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2680 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2681 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2682 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2683 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2684 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2685 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2686 glEnd;
2274 } 2687 }
2275 2688
2276 glDisable GL_BLEND; 2689 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
2278} 2691}
2279 2692
2280############################################################################# 2693#############################################################################
2281 2694
2282package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2283 2696
2284our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2285 2698
2286sub new { 2699sub new {
2287 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2288 2701
2289 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2704 can_hover => 1,
2292 can_events => 1, 2705 can_events => 1,
2293 %arg, 2706 %arg,
2294 ); 2707 );
2295 2708
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2712
2300 $self 2713 $self
2301} 2714}
2302 2715
2303sub set_fontsize { 2716sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2325} 2738}
2326 2739
2327############################################################################# 2740#############################################################################
2328 2741
2329package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2330 2743
2331use strict; 2744use strict;
2332 2745
2333use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2334 2747
2335our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2336 2749
2337my @tex = 2750my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2340 2753
2341sub new { 2754sub new {
2342 my $class = shift; 2755 my $class = shift;
2343 2756
… …
2411 2824
2412 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2413 2826
2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2415 2828
2416 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2417} 2832}
2418 2833
2419sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2420 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2421 2836
… …
2428 2843
2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else { 2845 } else {
2431 return 0; 2846 return 0;
2432 } 2847 }
2848
2849 1
2850}
2851
2852sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_;
2854
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2433 2860
2434 1 2861 1
2435} 2862}
2436 2863
2437sub update { 2864sub update {
… …
2488 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2489} 2916}
2490 2917
2491############################################################################# 2918#############################################################################
2492 2919
2493package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2494 2921
2495our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2496 2923
2497sub new { 2924sub new {
2498 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2499 2926
2500 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2501 2928
2502 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2932 to_value => sub { shift },
2506 from_value => sub { shift }, 2933 from_value => sub { shift },
2507 %arg, 2934 %arg,
2508 ); 2935 );
2509 2936
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2531 2958
2532############################################################################# 2959#############################################################################
2533 2960
2534package CFClient::UI::TextScroller; 2961package CFPlus::UI::TextScroller;
2535 2962
2536our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2537 2964
2538use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2539 2966
2540sub new { 2967sub new {
2541 my $class = shift; 2968 my $class = shift;
2542 2969
2543 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2544 fontsize => 1, 2971 fontsize => 1,
2545 can_events => 0, 2972 can_events => 1,
2546 indent => 0, 2973 indent => 0,
2547 #font => default_font 2974 #font => default_font
2548 @_, 2975 @_,
2549 2976
2550 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2551 par => [], 2978 par => [],
2979 max_par => 0,
2552 height => 0, 2980 height => 0,
2553 children => [ 2981 children => [
2554 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2556 ], 2984 ],
2557 ); 2985 );
2558 2986
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2560 2988
… …
2566 2994
2567 $self->{fontsize} = $fontsize; 2995 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2996 $self->reflow;
2569} 2997}
2570 2998
2999sub size_request {
3000 my ($self) = @_;
3001
3002 my ($empty, $slider) = @{ $self->{children} };
3003
3004 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request
3006}
3007
2571sub invoke_size_allocate { 3008sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2573 3010
3011 my ($empty, $slider, @other) = @{ $self->{children} };
3012 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3013
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3014 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3015 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 3016 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3017 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 3018
2579 $self->reflow; 3019 $self->reflow;
2580 3020
3021 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 3022 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 3023}
2583 3024
2584sub text_size { 3025sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 3026 my ($self, $ev) = @_;
3027
3028 return 0 unless $ev->{dy}; # only vertical movements
3029
3030 $self->{children}[1]->emit (mouse_wheel => $ev);
3031
3032 1
3033}
3034
3035sub get_layout {
3036 my ($self, $para) = @_;
2586 3037
2587 my $layout = $self->{layout}; 3038 my $layout = $self->{layout};
2588 3039
3040 $layout->set_font ($self->{font}) if $self->{font};
3041 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 3043 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 3045 $layout->set_markup ($para->{markup});
3046
3047 $layout->set_shapes (
3048 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}}
2593 3051 );
3052
2594 $layout->size 3053 $layout
2595} 3054}
2596 3055
2597sub reflow { 3056sub reflow {
2598 my ($self) = @_; 3057 my ($self) = @_;
2599 3058
… …
2606 3065
2607 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
2609} 3068}
2610 3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
3083}
3084
2611sub clear { 3085sub clear {
2612 my ($self) = @_; 3086 my ($self) = @_;
3087
3088 my (undef, undef, @other) = @{ $self->{children} };
3089 $self->remove ($_) for @other;
2613 3090
2614 $self->{par} = []; 3091 $self->{par} = [];
2615 $self->{height} = 0; 3092 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 3094}
2618 3095
2619sub add_paragraph { 3096sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 3097 my $self = shift;
2621 3098
2622 for my $line (split /\n/, $text) { 3099 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
3106 w => 1e10,
3107 wrapped => 1,
3108 };
3109
3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
3118 $self->{need_reflow}++;
3119 $self->update;
3120}
3121
3122sub scroll_to_bottom {
3123 my ($self) = @_;
3124
3125 $self->{scroll_to} = $#{$self->{par}};
3126 $self->update;
3127}
3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
2624 $self->{height} += $h; 3151 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 3153
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3154 delete $self->{texture};
3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
2629} 3160}
2630 3161
2631sub update { 3162sub update {
2632 my ($self) = @_; 3163 my ($self) = @_;
2633 3164
… …
2636 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2637 3168
2638 delete $self->{texture}; 3169 delete $self->{texture};
2639 3170
2640 $ROOT->on_post_alloc ($self => sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 3175
2643 if (delete $self->{need_reflow}) {
2644 my $height = 0;
2645
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2662
2663 $self->{height} = $height;
2664
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667 delete $self->{texture};
2668 }
2669
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2673 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2675 3189
2676 my $y0 = $top; 3190 my $y0 = $top;
2677 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2678 3192
2679 my $y = 0;
2680
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 3193 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2691 3196
2692 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 3198 my $layout = $self->get_layout ($para);
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 3199
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3200 $layout->render ($para->{indent}, $y - $y0);
2699 3201
2700 glRasterPos $par->[3], $y - $y0; 3202 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3203 my @s = $layout->get_shapes;
3204
3205 for (@w) {
3206 my ($dx, $dy) = splice @s, 0, 2, ();
3207
3208 $_->{x} = $dx + $para->{indent};
3209 $_->{y} = $dy + $y - $y0;
3210
3211 $_->draw;
3212 }
3213 }
2702 } 3214 }
2703 3215
2704 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3218 }
2706 3219
2707 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2708 }; 3221 };
2709 }); 3222 });
3223}
3224
3225sub reconfigure {
3226 my ($self) = @_;
3227
3228 $self->SUPER::reconfigure;
3229
3230 $_->{w} = 1e10 for @{ $self->{par} };
3231 $self->reflow;
2710} 3232}
2711 3233
2712sub _draw { 3234sub _draw {
2713 my ($self) = @_; 3235 my ($self) = @_;
2714 3236
… …
2717 glColor 0, 0, 0, 1; 3239 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3240 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 3241 glDisable GL_TEXTURE_2D;
2720 3242
2721 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2722
2723} 3244}
2724 3245
2725############################################################################# 3246#############################################################################
2726 3247
2727package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2728 3249
2729use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2730 3251
2731our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2732 3253
2733sub moveto { 3254sub moveto {
2734 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2735 3256
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3285 glPopMatrix;
2765} 3286}
2766 3287
2767############################################################################# 3288#############################################################################
2768 3289
2769package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2770 3291
2771our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2772 3293
2773sub new { 3294sub new {
2774 my $class = shift; 3295 my $class = shift;
2775 3296
2776 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2789} 3310}
2790 3311
2791############################################################################# 3312#############################################################################
2792 3313
2793package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2794 3315
2795our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2796 3317
2797use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2798 3319
2799sub new { 3320sub new {
2800 my $class = shift; 3321 my $class = shift;
2801 3322
2802 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2805 ) 3326 )
2806} 3327}
2807 3328
2808sub set_tooltip_from { 3329sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3334
2811 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2812 3336
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3342 }
2819 3343
2820 $tooltip =~ s/^\n+//; 3344 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3345 $tooltip =~ s/\n+$//;
2822 3346
2823 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3348 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3350 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3352 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3354 );
2831} 3355}
2832 3356
… …
2851 3375
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3376 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3377 my $widget = $self->{owner}
2854 or return; 3378 or return;
2855 3379
3380 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3382
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3384 if $x + $self->{w} > $self->{root}{w};
2860 3385
2861 $self->move_abs ($x, $y); 3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
2862 }); 3390 });
2863} 3391}
2864 3392
2865sub _draw { 3393sub _draw {
2866 my ($self) = @_; 3394 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2891} 3419}
2892 3420
2893############################################################################# 3421#############################################################################
2894 3422
2895package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2896 3424
2897our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2898 3426
2899use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2900 3428
2901sub new { 3429sub new {
2902 my $class = shift; 3430 my $class = shift;
2903 3431
2904 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2905 aspect => 1, 3435 aspect => 1,
2906 can_events => 0, 3436 can_events => 0,
2907 @_, 3437 @_,
2908 ); 3438 );
2909 3439
2910 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2912 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2913 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 3446 parked => 1,
2916 interval => $self->{animspeed},
2917 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2918 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2919 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2920 }, 3455 },
2921 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2922 } 3460 }
2923 3461
2924 $self 3462 $self
2925} 3463}
2926 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
2927sub size_request { 3496sub size_request {
2928 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
2929} 3513}
2930 3514
2931sub update { 3515sub update {
2932 my ($self) = @_; 3516 my ($self) = @_;
2933 3517
2934 return unless $self->{visible}; 3518 return unless $self->{visible};
2935 3519
2936 $self->SUPER::update; 3520 $self->SUPER::update;
2937} 3521}
2938 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
2939sub _draw { 3531sub _draw {
2940 my ($self) = @_; 3532 my ($self) = @_;
2941 3533
2942 return unless $::CONN; 3534 $self->SUPER::_draw;
2943 3535
2944 my $face; 3536 if (my $tex = $self->{tex}) {
2945
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}];
2948
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2954
2955 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2960 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
2962} 3543}
2963 3544
2964sub destroy { 3545sub destroy {
2965 my ($self) = @_; 3546 my ($self) = @_;
2966 3547
2967 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
2968 if $self->{timer}; 3549 if $self->{timer};
2969 3550
2970 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
2971} 3552}
2972 3553
2973############################################################################# 3554#############################################################################
2974 3555
2975package CFClient::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
2976 3557
2977our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
2978 3559
2979# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
2980 3561
2981############################################################################# 3562#############################################################################
2982 3563
2983package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
2984 3565
2985our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
2986 3567
2987use CFClient::OpenGL; 3568use CFPlus::OpenGL;
2988 3569
2989sub new { 3570sub new {
2990 my $class = shift; 3571 my $class = shift;
2991 3572
2992 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
2993 items => [], 3574 items => [],
2994 z => 100, 3575 z => 100,
2995 @_, 3576 @_,
2996 ); 3577 );
2997 3578
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3580
3000 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
3002 3583
3003 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
3004 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
3005 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3590 can_hover => 1,
3007 can_events => 1, 3591 can_events => 1,
3592 tooltip => $tooltip,
3593 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ],
3597 ;
3598
3599 } else {
3600 $widget = new CFPlus::UI::Label
3601 can_hover => 1,
3602 can_events => 1,
3008 markup => $widget, 3603 markup => $widget,
3009 tooltip => $tooltip 3604 tooltip => $tooltip;
3605 }
3010 } 3606 }
3011 3607
3012 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
3013 3609
3014 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
3057 1 3653 1
3058} 3654}
3059 3655
3060############################################################################# 3656#############################################################################
3061 3657
3062package CFClient::UI::Multiplexer; 3658package CFPlus::UI::Multiplexer;
3063 3659
3064our @ISA = CFClient::UI::Container::; 3660our @ISA = CFPlus::UI::Container::;
3065 3661
3066sub new { 3662sub new {
3067 my $class = shift; 3663 my $class = shift;
3068 3664
3069 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
… …
3083 3679
3084 $self->{current} = $self->{children}[0] 3680 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3681 if @{ $self->{children} };
3086} 3682}
3087 3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3088sub set_current_page { 3690sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3691 my ($self, $page_or_widget) = @_;
3090 3692
3091 my $widget = ref $page_or_widget 3693 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3694 ? $page_or_widget
… …
3124 $self->{current}->draw; 3726 $self->{current}->draw;
3125} 3727}
3126 3728
3127############################################################################# 3729#############################################################################
3128 3730
3129package CFClient::UI::Notebook; 3731package CFPlus::UI::Notebook;
3130 3732
3131our @ISA = CFClient::UI::VBox::; 3733our @ISA = CFPlus::UI::VBox::;
3132 3734
3133sub new { 3735sub new {
3134 my $class = shift; 3736 my $class = shift;
3135 3737
3136 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3739 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3741 # filter => # will be put between multiplexer and $self
3140 @_, 3742 @_,
3141 ); 3743 );
3142 3744
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 3749}
3148 3750
3149sub add { 3751sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3151 3753
3152 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3153 3755
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3155 markup => $title, 3758 markup => $title,
3156 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3157 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3158 ); 3764 $self->{buttonbar}->add ($title);
3159 3765
3160 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3767}
3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{multiplexer}->get_current_page
3161} 3773}
3162 3774
3163sub set_current_page { 3775sub set_current_page {
3164 my ($self, $page) = @_; 3776 my ($self, $page) = @_;
3165 3777
… …
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3779 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3780}
3169 3781
3170############################################################################# 3782#############################################################################
3171 3783
3172package CFClient::UI::Combobox; 3784package CFPlus::UI::Selector;
3173 3785
3174use utf8; 3786use utf8;
3175 3787
3176our @ISA = CFClient::UI::Button::; 3788our @ISA = CFPlus::UI::Button::;
3177 3789
3178sub new { 3790sub new {
3179 my $class = shift; 3791 my $class = shift;
3180 3792
3181 my $self = $class->SUPER::new ( 3793 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3810 my ($value, $title, $tooltip) = @$_;
3199 3811
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3813 }
3202 3814
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3816}
3205 3817
3206sub _set_value { 3818sub _set_value {
3207 my ($self, $value) = @_; 3819 my ($self, $value) = @_;
3208 3820
… …
3223 $self->emit (changed => $value); 3835 $self->emit (changed => $value);
3224} 3836}
3225 3837
3226############################################################################# 3838#############################################################################
3227 3839
3228package CFClient::UI::Statusbox; 3840package CFPlus::UI::Statusbox;
3229 3841
3230our @ISA = CFClient::UI::VBox::; 3842our @ISA = CFPlus::UI::VBox::;
3231 3843
3232sub new { 3844sub new {
3233 my $class = shift; 3845 my $class = shift;
3234 3846
3235 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 3848 fontsize => 0.8,
3237 @_, 3849 @_,
3238 ); 3850 );
3239 3851
3240 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3241 3853
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243 3855
3244 $self 3856 $self
3245} 3857}
… …
3247sub reorder { 3859sub reorder {
3248 my ($self) = @_; 3860 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3861 my $NOW = Time::HiRes::time;
3250 3862
3251 # freeze display when hovering over any label 3863 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3864 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3866 values %{ $self->{item} };
3255 3867
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3870 }
… …
3279 for ($short) { 3891 for ($short) {
3280 s/^\s+//; 3892 s/^\s+//;
3281 s/\s+/ /g; 3893 s/\s+/ /g;
3282 } 3894 }
3283 3895
3284 new CFClient::UI::Label 3896 new CFPlus::UI::Label
3285 markup => $short, 3897 markup => $short,
3286 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3955 count => 1,
3344 %arg, 3956 %arg,
3345 }; 3957 };
3346 } 3958 }
3347 3959
3960 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3961 $self->reorder;
3962 });
3349} 3963}
3350 3964
3351sub reconfigure { 3965sub reconfigure {
3352 my ($self) = @_; 3966 my ($self) = @_;
3353 3967
… …
3366 $self->SUPER::destroy; 3980 $self->SUPER::destroy;
3367} 3981}
3368 3982
3369############################################################################# 3983#############################################################################
3370 3984
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub cfg_bind {
3478 my ($self, $mod, $sym, $cmds) = @_;
3479 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3480 ::update_bindings ();
3481}
3482
3483sub cfg_unbind {
3484 my ($self, $mod, $sym, $cmds) = @_;
3485 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3486 ::update_bindings ();
3487}
3488
3489sub commit {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 if ($sym != 0 && @$cmds > 0) {
3493 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3494 ."'. Don't forget 'Save Config'!");
3495 $self->{binding_change}->($mod, $sym, $cmds)
3496 if $self->{binding_change};
3497 } else {
3498 $::STATUSBOX->add ("No action bound, no key or action specified!");
3499 $self->{binding_cancel}->()
3500 if $self->{binding_cancel};
3501 }
3502}
3503
3504sub start {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("stop recording");
3508 $self->{recording} = 1;
3509 $self->clear_command_list;
3510 $::CONN->start_record if $::CONN;
3511}
3512
3513sub stop {
3514 my ($self) = @_;
3515
3516 $self->{rec_btn}->set_text ("start recording");
3517 $self->{recording} = 0;
3518
3519 my $rec;
3520 $rec = $::CONN->stop_record if $::CONN;
3521 return unless ref $rec eq 'ARRAY';
3522 $self->set_command_list ($rec);
3523}
3524
3525
3526sub ask_for_bind_and_commit {
3527 my ($self) = @_;
3528 $self->ask_for_bind (1);
3529}
3530
3531sub ask_for_bind {
3532 my ($self, $commit, $end_cb) = @_;
3533
3534 CFClient::Binder::open_binding_dialog (sub {
3535 my ($mod, $sym) = @_;
3536 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3537 $self->update_binding_widgets;
3538 $self->commit if $commit;
3539 $end_cb->() if $end_cb;
3540 });
3541}
3542
3543# $mod and $sym are the modifiers and key symbol
3544# $cmds is a array ref of strings (the commands)
3545# $cb is the callback that is executed on OK
3546# $ccb is the callback that is executed on CANCEL and
3547# when the binding was unsuccessful on OK
3548sub set_binding {
3549 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3550
3551 $self->clear_command_list;
3552 $self->{recording} = 0;
3553 $self->{rec_btn}->set_text ("start recording");
3554
3555 $self->{binding} = [$mod, $sym];
3556 $self->{commands} = $cmds;
3557
3558 $self->{binding_change} = $cb;
3559 $self->{binding_cancel} = $ccb;
3560
3561 $self->update_binding_widgets;
3562}
3563
3564# this is a shortcut method that asks for a binding
3565# and then just binds it.
3566sub do_quick_binding {
3567 my ($self, $cmds, $end_cb) = @_;
3568 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3569 $self->ask_for_bind (1, $end_cb);
3570}
3571
3572sub update_binding_widgets {
3573 my ($self) = @_;
3574 my ($mod, $sym, $cmds) = $self->get_binding;
3575 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3576 $self->set_command_list ($cmds);
3577}
3578
3579sub get_binding {
3580 my ($self) = @_;
3581 return (
3582 $self->{binding}->[0],
3583 $self->{binding}->[1],
3584 [ grep { defined $_ } @{$self->{commands}} ]
3585 );
3586}
3587
3588sub clear_command_list {
3589 my ($self) = @_;
3590 $self->{cmdbox}->clear ();
3591}
3592
3593sub set_command_list {
3594 my ($self, $cmds) = @_;
3595
3596 $self->{cmdbox}->clear ();
3597 $self->{commands} = $cmds;
3598
3599 my $idx = 0;
3600
3601 for (@$cmds) {
3602 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3603
3604 my $i = $idx;
3605 $hb->add (new CFClient::UI::Label text => $_);
3606 $hb->add (new CFClient::UI::Button
3607 text => "delete",
3608 tooltip => "Deletes the action from the record",
3609 on_activate => sub {
3610 $self->{cmdbox}->remove ($hb);
3611 $cmds->[$i] = undef;
3612 });
3613
3614
3615 $idx++
3616 }
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::SpellList;
3622
3623our @ISA = CFClient::UI::Table::;
3624
3625sub new {
3626 my $class = shift;
3627
3628 my $self = $class->SUPER::new (
3629 binding => [],
3630 commands => [],
3631 @_,
3632 )
3633}
3634
3635my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3636
3637my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3639my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3641my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3645my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3647
3648sub rebuild_spell_list {
3649 my ($self) = @_;
3650
3651 $CFClient::UI::ROOT->on_refresh ($self => sub {
3652 $self->clear;
3653
3654 return unless $::CONN;
3655
3656 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3657 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3658 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3659 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3660 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3661
3662 my $row = 0;
3663
3664 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3665 my $spell = $self->{spell}{$_};
3666
3667 $row++;
3668
3669 my $spell_cb = sub {
3670 my ($widget, $ev) = @_;
3671
3672 if ($ev->{button} == 1) {
3673 $::CONN->user_send ("cast $spell->{name}");
3674 } elsif ($ev->{button} == 2) {
3675 $::CONN->user_send ("invoke $spell->{name}");
3676 } elsif ($ev->{button} == 3) {
3677 (new CFClient::UI::Menu
3678 items => [
3679 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3680 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3681 ],
3682 )->popup ($ev);
3683 } else {
3684 return 0;
3685 }
3686
3687 1
3688 };
3689
3690 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3691
3692 #TODO: add path info to tooltip
3693 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3694
3695 $self->add (0, $row, new CFClient::UI::Face
3696 face => $spell->{face},
3697 can_hover => 1,
3698 can_events => 1,
3699 tooltip => $tooltip,
3700 on_button_down => $spell_cb,
3701 );
3702
3703 $self->add (1, $row, new CFClient::UI::Label
3704 expand => 1,
3705 text => $spell->{name},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3713 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3714 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3715 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3716 }
3717 });
3718}
3719
3720sub add_spell {
3721 my ($self, $spell) = @_;
3722
3723 $self->{spell}->{$spell->{name}} = $spell;
3724 $self->rebuild_spell_list;
3725}
3726
3727sub remove_spell {
3728 my ($self, $spell) = @_;
3729
3730 delete $self->{spell}->{$spell->{name}};
3731 $self->rebuild_spell_list;
3732}
3733
3734sub clear_spells {
3735 my ($self) = @_;
3736
3737 $self->{spell} = {};
3738 $self->rebuild_spell_list;
3739}
3740
3741#############################################################################
3742
3743package CFClient::UI::Root; 3985package CFPlus::UI::Root;
3744 3986
3745our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3746 3988
3747use List::Util qw(min max); 3989use List::Util qw(min max);
3748 3990
3749use CFClient::OpenGL; 3991use CFPlus::OpenGL;
3750 3992
3751sub new { 3993sub new {
3752 my $class = shift; 3994 my $class = shift;
3753 3995
3754 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3755 visible => 1, 3997 visible => 1,
3756 @_, 3998 @_,
3757 ); 3999 );
3758 4000
3759 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3760 4002
3761 $self 4003 $self
3762} 4004}
3763 4005
3764sub size_request { 4006sub size_request {
… …
3859 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3860 $_->() 4102 $_->()
3861 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3862 } 4104 }
3863 4105
3864 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3865 my %queue; 4107 my %queue;
3866 my @queue; 4108 my @queue;
3867 my $widget; 4109 my $widget;
3868 4110
3869 outer: 4111 outer:
… …
3916 } 4158 }
3917 } 4159 }
3918 4160
3919 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3920 } 4162 }
3921 }
3922 4163
3923 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3924 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3925 values %$size_alloc; 4166 values %$size_alloc;
3926 4167
3927 while () { 4168 while () {
3928 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3929 4170
3930 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3931 4172
3932 $w = 0 if $w < 0; 4173 $w = max $widget->{min_w}, $w;
3933 $h = 0 if $h < 0; 4174 $h = max $widget->{min_h}, $h;
3934 4175
4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4178
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181
3935 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3936 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3937 4184
3938 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3939 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3940 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
3941 4188
3942 $widget->{w} = $w; 4189 $widget->{w} = $w;
3943 $widget->{h} = $h; 4190 $widget->{h} = $h;
3944 4191
3945 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3946 } 4194 }
3947 } 4195 }
3948 } 4196 }
3949 4197
3950 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3951 $_->() 4199 $_->()
3952 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3953 } 4201 }
3954
3955 4202
3956 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3957 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3958 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3959 4206
… …
3962 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3963 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3964 glLoadIdentity; 4211 glLoadIdentity;
3965 4212
3966 { 4213 {
3967 package CFClient::UI::Base; 4214 package CFPlus::UI::Base;
3968 4215
3969 ($draw_x, $draw_y, $draw_w, $draw_h) = 4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3970 (0, 0, $self->{w}, $self->{h}); 4217 (0, 0, $self->{w}, $self->{h});
3971 }
3972 4218
3973 $self->_draw; 4219 $self->_draw;
4220 }
3974} 4221}
3975 4222
3976############################################################################# 4223#############################################################################
3977 4224
3978package CFClient::UI; 4225package CFPlus::UI;
3979 4226
3980$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
3981$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3982 4229
39831 42301
3984 4231

Diff Legend

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