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

Diff Legend

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