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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 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
… …
330 $self->{force_h} = $h; 360 $self->{force_h} = $h;
331 361
332 $self->realloc; 362 $self->realloc;
333} 363}
334 364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
373}
374
335sub size_request { 375sub size_request {
336 require Carp; 376 require Carp;
337 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
338} 378}
339 379
380sub baseline_shift {
381 0
382}
383
340sub configure { 384sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 385 my ($self, $x, $y, $w, $h) = @_;
342 386
343 if ($self->{aspect}) { 387 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 388 my ($ow, $oh) = ($w, $h);
345 389
346 $w = List::Util::min $w, int $h * $self->{aspect}; 390 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 391 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 392
349 # use alignment to adjust x, y 393 # use alignment to adjust x, y
350 394
351 $x += int 0.5 * ($ow - $w); 395 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 396 $y += int 0.5 * ($oh - $h);
… …
393 437
394 return if $self->{tooltip} eq $tooltip; 438 return if $self->{tooltip} eq $tooltip;
395 439
396 $self->{tooltip} = $tooltip; 440 $self->{tooltip} = $tooltip;
397 441
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 442 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 443 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 444 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 445 }
402} 446}
403 447
404# translate global coordinates to local coordinate system 448# translate global coordinates to local coordinate system
405sub coord2local { 449sub coord2local {
406 my ($self, $x, $y) = @_; 450 my ($self, $x, $y) = @_;
407 451
452 Carp::confess unless $self->{parent};#d#
453
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 454 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 455}
410 456
411# translate local coordinates to global coordinate system 457# translate local coordinates to global coordinate system
412sub coord2global { 458sub coord2global {
413 my ($self, $x, $y) = @_; 459 my ($self, $x, $y) = @_;
414 460
461 Carp::confess unless $self->{parent};#d#
462
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 463 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 464}
417 465
418sub invoke_focus_in { 466sub invoke_focus_in {
419 my ($self) = @_; 467 my ($self) = @_;
420 468
421 return if $FOCUS == $self; 469 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 470 return unless $self->{can_focus};
423 471
424 my $focus = $FOCUS; $FOCUS = $self; 472 $FOCUS = $self;
425 473
426 $focus->update if $focus; 474 $self->update;
427 $FOCUS->update;
428 475
429 0 476 0
430} 477}
431 478
432sub invoke_focus_out { 479sub invoke_focus_out {
433 my ($self) = @_; 480 my ($self) = @_;
434 481
435 return unless $FOCUS == $self; 482 return unless $FOCUS == $self;
436 483
437 my $focus = $FOCUS; undef $FOCUS; 484 undef $FOCUS;
438 485
439 $focus->update if $focus; #? 486 $self->update;
440 487
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 488 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 489 unless $FOCUS;
443 490
444 0 491 0
445} 492}
446 493
447sub grab_focus { 494sub grab_focus {
448 my ($self) = @_; 495 my ($self) = @_;
449 496
497 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 498 $self->emit ("focus_in");
451} 499}
452 500
453sub invoke_mouse_motion { 1 } 501sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 502sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 503sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 504sub invoke_key_up { 0 }
505sub invoke_mouse_wheel { 0 }
457 506
458sub invoke_button_down { 507sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 508 my ($self, $ev, $x, $y) = @_;
460 509
461 $self->grab_focus; 510 $self->grab_focus;
462 511
463 1 512 0
464} 513}
465 514
466sub connect { 515sub connect {
467 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
468 517
469 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
519
520 defined wantarray and CFPlus::guard {
521 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
522 @{ $self->{signal_cb}{$signal} };
523 }
470} 524}
525
526sub disconnect_all {
527 my ($self, $signal) = @_;
528
529 delete $self->{signal_cb}{$signal};
530}
531
532my %has_coords = (
533 button_down => 1,
534 button_up => 1,
535 mouse_motion => 1,
536 mouse_wheel => 1,
537);
471 538
472sub emit { 539sub emit {
473 my ($self, $signal, @args) = @_; 540 my ($self, $signal, @args) = @_;
474 541
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 542 # I do not really like this solution, but I do not like duplication
543 # and needlessly verbose code, either.
544 my @append
545 = $has_coords{$signal}
546 ? $args[0]->xy ($self)
547 : ();
548
549 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
550
551 for my $cb (
552 @{$self->{signal_cb}{$signal} || []}, # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 553 ($self->can ("invoke_$signal") || sub { 1 }), # closure
554 ) {
555 return $cb->($self, @args, @append) || next;
556 }
557
558 # parent
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 559 $self->{parent} && $self->{parent}->emit ($signal, @args)
478} 560}
479 561
480sub find_widget { 562#sub find_widget {
481 my ($self, $x, $y) = @_; 563# 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 564
492sub set_parent { 565sub set_parent {
493 my ($self, $parent) = @_; 566 my ($self, $parent) = @_;
494 567
495 Scalar::Util::weaken ($self->{parent} = $parent); 568 CFPlus::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible}; 569 $self->set_visible if $parent->{visible};
497} 570}
498 571
499sub realloc { 572sub realloc {
500 my ($self) = @_; 573 my ($self) = @_;
… …
526 599
527# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless. 601# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530 603
531sub draw { 604#sub draw {
532 my ($self) = @_; 605#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 606
580sub _draw { 607sub _draw {
581 my ($self) = @_; 608 my ($self) = @_;
582 609
583 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
584} 611}
585 612
586sub DESTROY { 613sub DESTROY {
587 my ($self) = @_; 614 my ($self) = @_;
588 615
589 delete $WIDGET{$self+0}; 616 return if CFPlus::in_destruct;
590 617
618 local $@;
591 eval { $self->destroy }; 619 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
621
622 delete $WIDGET{$self+0};
593} 623}
594 624
595############################################################################# 625#############################################################################
596 626
597package CFClient::UI::DrawBG; 627package CFPlus::UI::DrawBG;
598 628
599our @ISA = CFClient::UI::Base::; 629our @ISA = CFPlus::UI::Base::;
600 630
601use strict; 631use strict;
602use CFClient::OpenGL; 632use CFPlus::OpenGL;
603 633
604sub new { 634sub new {
605 my $class = shift; 635 my $class = shift;
606
607 # range [value, low, high, page]
608 636
609 $class->SUPER::new ( 637 $class->SUPER::new (
610 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
611 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
612 @_ 640 @_
… …
624 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
625 653
626 glEnable GL_BLEND; 654 glEnable GL_BLEND;
627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
628 glColor_premultiply @$color; 656 glColor_premultiply @$color;
629
630 glBegin GL_QUADS;
631 glVertex 0 , 0;
632 glVertex 0 , $h;
633 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
634 glVertex $w, 0;
635 glEnd;
636
637 glDisable GL_BLEND; 658 glDisable GL_BLEND;
638 } 659 }
639} 660}
640 661
641############################################################################# 662#############################################################################
642 663
643package CFClient::UI::Empty; 664package CFPlus::UI::Empty;
644 665
645our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
646 667
647sub new { 668sub new {
648 my ($class, %arg) = @_; 669 my ($class, %arg) = @_;
649 $class->SUPER::new (can_events => 0, %arg); 670 $class->SUPER::new (can_events => 0, %arg);
650} 671}
… …
657 678
658sub draw { } 679sub draw { }
659 680
660############################################################################# 681#############################################################################
661 682
662package CFClient::UI::Container; 683package CFPlus::UI::Container;
663 684
664our @ISA = CFClient::UI::Base::; 685our @ISA = CFPlus::UI::Base::;
665 686
666sub new { 687sub new {
667 my ($class, %arg) = @_; 688 my ($class, %arg) = @_;
668 689
669 my $children = delete $arg{children}; 690 my $children = delete $arg{children};
… …
673 can_events => 0, 694 can_events => 0,
674 %arg, 695 %arg,
675 ); 696 );
676 697
677 $self->add (@$children) 698 $self->add (@$children)
678 if $children; 699 if $children && @$children;
679 700
680 $self 701 $self
702}
703
704sub realloc {
705 my ($self) = @_;
706
707 $self->{force_realloc} = 1;
708 $self->{force_size_alloc} = 1;
709 $self->SUPER::realloc;
681} 710}
682 711
683sub add { 712sub add {
684 my ($self, @widgets) = @_; 713 my ($self, @widgets) = @_;
685 714
686 $_->set_parent ($self) 715 $_->set_parent ($self)
687 for @widgets; 716 for @widgets;
688 717
718 # TODO: only do this in widgets that need it, e.g. root, fixed
689 use sort 'stable'; 719 use sort 'stable';
690 720
691 $self->{children} = [ 721 $self->{children} = [
692 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
693 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
694 ]; 724 ];
695 725
696 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
697} 731}
698 732
699sub children { 733sub children {
700 @{ $_[0]{children} } 734 @{ $_[0]{children} }
701} 735}
702 736
703sub remove { 737sub remove {
704 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
705 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
706 delete $child->{parent}; 743 delete $child->{parent};
707 $child->hide; 744 $child->hide;
708
709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
710 747
711 $self->realloc; 748 $self->realloc;
712} 749}
713 750
714sub clear { 751sub clear {
715 my ($self) = @_; 752 my ($self) = @_;
716 753
717 my $children = delete $self->{children}; 754 my $children = $self->{children};
718 $self->{children} = []; 755 $self->{children} = [];
719 756
720 for (@$children) { 757 for (@$children) {
721 delete $_->{parent}; 758 delete $_->{parent};
722 $_->hide; 759 $_->hide;
… …
742} 779}
743 780
744sub _draw { 781sub _draw {
745 my ($self) = @_; 782 my ($self) = @_;
746 783
747 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
748} 785}
749 786
750############################################################################# 787#############################################################################
751 788
752package CFClient::UI::Bin; 789package CFPlus::UI::Bin;
753 790
754our @ISA = CFClient::UI::Container::; 791our @ISA = CFPlus::UI::Container::;
755 792
756sub new { 793sub new {
757 my ($class, %arg) = @_; 794 my ($class, %arg) = @_;
758 795
759 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 796 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760 797
761 $class->SUPER::new (children => [$child], %arg) 798 $class->SUPER::new (children => [$child], %arg)
762} 799}
763 800
764sub add { 801sub add {
765 my ($self, $child) = @_; 802 my ($self, $child) = @_;
766 803
767 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
768 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
769} 806}
770 807
771sub remove { 808sub remove {
772 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
773 810
774 $self->SUPER::remove ($widget); 811 $self->SUPER::remove ($widget);
775 812
776 $self->{children} = [new CFClient::UI::Empty] 813 $self->{children} = [new CFPlus::UI::Empty]
777 unless @{$self->{children}}; 814 unless @{$self->{children}};
778} 815}
779 816
780sub child { $_[0]->{children}[0] } 817sub child { $_[0]->{children}[0] }
781 818
… …
790 827
791 1 828 1
792} 829}
793 830
794############################################################################# 831#############################################################################
795
796# back-buffered drawing area 832# back-buffered drawing area
797 833
798package CFClient::UI::Window; 834package CFPlus::UI::Window;
799 835
800our @ISA = CFClient::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
801 837
802use CFClient::OpenGL; 838use CFPlus::OpenGL;
803 839
804sub new { 840sub new {
805 my ($class, %arg) = @_; 841 my ($class, %arg) = @_;
806 842
807 my $self = $class->SUPER::new (%arg); 843 my $self = $class->SUPER::new (%arg);
… …
829} 865}
830 866
831sub render_child { 867sub render_child {
832 my ($self) = @_; 868 my ($self) = @_;
833 869
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 870 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0; 871 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 872 glClear GL_COLOR_BUFFER_BIT;
837 873
838 { 874 {
839 package CFClient::UI::Base; 875 package CFPlus::UI::Base;
840 876
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 877 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 878 (0, 0, $self->{w}, $self->{h});
879
880 $self->_render;
843 } 881 }
844
845 $self->_render;
846 }; 882 };
847} 883}
848 884
849sub _draw { 885sub _draw {
850 my ($self) = @_; 886 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 887
854 my $tex = $self->{texture} 888 my $tex = $self->{texture}
855 or return; 889 or return;
856 890
857 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 0, 0, 0, 1; 893 glColor 0, 0, 0, 1;
860 894
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 895 $tex->draw_quad_alpha_premultiplied (0, 0);
862 896
863 glDisable GL_TEXTURE_2D; 897 glDisable GL_TEXTURE_2D;
864} 898}
865 899
866############################################################################# 900#############################################################################
867 901
868package CFClient::UI::ViewPort; 902package CFPlus::UI::ViewPort;
869 903
904use List::Util qw(min max);
905
870our @ISA = CFClient::UI::Window::; 906our @ISA = CFPlus::UI::Window::;
871 907
872sub new { 908sub new {
873 my $class = shift; 909 my $class = shift;
874 910
875 $class->SUPER::new ( 911 $class->SUPER::new (
… …
882sub size_request { 918sub size_request {
883 my ($self) = @_; 919 my ($self) = @_;
884 920
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886 922
887 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
889 925
890 ($w, $h) 926 ($w, $h)
891} 927}
892 928
893sub invoke_size_allocate { 929sub invoke_size_allocate {
… …
905} 941}
906 942
907sub set_offset { 943sub set_offset {
908 my ($self, $x, $y) = @_; 944 my ($self, $x, $y) = @_;
909 945
946 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
947 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
948
949 if ($x != $self->{view_x} or $y != $self->{view_y}) {
910 $self->{view_x} = int $x; 950 $self->{view_x} = $x;
911 $self->{view_y} = int $y; 951 $self->{view_y} = $y;
912 952
953 $self->emit (changed => $x, $y);
913 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
973 }
914} 974}
915 975
916# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
917sub coord2local { 977sub coord2local {
918 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
… …
933 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
934 994
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 997 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else { 999 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1001 }
942} 1002}
943 1003
944sub _render { 1004sub _render {
945 my ($self) = @_; 1005 my ($self) = @_;
946 1006
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 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}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949 1009
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1011
952 $self->SUPER::_render; 1012 $self->SUPER::_render;
953} 1013}
954 1014
955############################################################################# 1015#############################################################################
956 1016
957package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
958 1018
959our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::Table::;
960 1020
961sub new { 1021sub new {
962 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
963 1023
964 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
965 1025
966 my $self; 1026 my $self;
967 1027
968 my $slider = new CFClient::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1031 vertical => 0,
1032 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub {
1034 $self->{hpos} = $_[1];
1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 },
1037 ;
1038
1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
1041 c_row => 0,
969 vertical => 1, 1042 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1044 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vpos} = $_[1];
1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973 }, 1047 },
974 ; 1048 ;
975 1049
976 $self = $class->SUPER::new ( 1050 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1051 scroll_x => 0,
1052 scroll_y => 1,
1053 can_events => 1,
978 slider => $slider, 1054 hslider => $hslider,
1055 vslider => $vslider,
1056 col_expand => [1, 0],
1057 row_expand => [1, 0],
979 %arg, 1058 %arg,
980 ); 1059 );
981 1060
1061 $self->{vp} = new CFPlus::UI::ViewPort
1062 c_col => 0,
1063 c_row => 0,
1064 expand => 1,
1065 scroll_x => $self->{scroll_x},
1066 scroll_y => $self->{scroll_y},
1067 on_changed => sub {
1068 my ($vp, $x, $y) = @_;
1069
1070 $vp->{parent}{hslider}->set_value ($x);
1071 $vp->{parent}{vslider}->set_value ($y);
1072
1073 0
1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1080 ;
1081
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add ($self->{vp});
1083
983 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
984 1085
985 $self 1086 $self
986} 1087}
987 1088
… …
989 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
990 1091
991 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
992} 1093}
993 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
994sub update { 1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 if ($self->{scroll_x}) {
1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107
1108 my $visible = $w1 > $w2;
1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1111 $visible ? $self->SUPER::add ($self->{hslider})
1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1114 }
1115
1116 if ($self->{scroll_y}) {
1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1119
1120 my $visible = $h1 > $h2;
1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->SUPER::remove ($self->{vslider});
1125 }
1126 }
1127}
1128
1129sub start_dragging {
995 my ($self) = @_; 1130 my ($self, $ev) = @_;
996 1131
997 $self->SUPER::update; 1132 $self->grab_focus;
998 1133
999 # todo: overwrite size_allocate of child 1134 my $ox = $self->{vp}{view_x};
1000 my $child = $self->{vp}->child; 1135 my $oy = $self->{vp}{view_y};
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1136
1137 $self->{motion} = sub {
1138 my ($ev, $x, $y) = @_;
1139
1140 $ox -= $ev->{xrel};
1141 $oy -= $ev->{yrel};
1142
1143 $self->{vp}->set_offset ($ox, $oy);
1144 };
1145}
1146
1147sub invoke_mouse_wheel {
1148 my ($self, $ev) = @_;
1149
1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1152
1153 1
1154}
1155
1156sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_;
1158
1159 if ($ev->{button} == 2) {
1160 $self->start_dragging ($ev);
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1002} 1186}
1003 1187
1004sub invoke_size_allocate { 1188sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1006 1190
1007 my $child = $self->{vp}->child; 1191 $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) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1193}
1012 1194
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1195#############################################################################
1017 1196
1018package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1019 1198
1020our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1021 1200
1022use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1023 1202
1024sub new { 1203sub new {
1025 my $class = shift; 1204 my $class = shift;
1026 1205
1027 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1037 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1038 1217
1039 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1051 } 1223 }
1052 1224
1053 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1054} 1226}
1055 1227
1056############################################################################# 1228#############################################################################
1057 1229
1058package CFClient::UI::FancyFrame; 1230package CFPlus::UI::FancyFrame;
1059 1231
1060our @ISA = CFClient::UI::Bin::; 1232our @ISA = CFPlus::UI::Bin::;
1061 1233
1062use CFClient::OpenGL; 1234use CFPlus::OpenGL;
1235
1236sub new {
1237 my ($class, %arg) = @_;
1238
1239 if ((exists $arg{label}) && !ref $arg{label}) {
1240 $arg{label} = new CFPlus::UI::Label
1241 align => 1,
1242 valign => 0,
1243 text => $arg{label},
1244 fontsize => ($arg{border} || 0.8) * 0.75;
1245 }
1246
1247 my $self = $class->SUPER::new (
1248 # label => "",
1249 fg => [0.6, 0.3, 0.1],
1250 border => 0.8,
1251 style => 'single',
1252 %arg,
1253 );
1254
1255 $self
1256}
1257
1258sub add {
1259 my ($self, @widgets) = @_;
1260
1261 $self->SUPER::add (@widgets);
1262 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1263}
1264
1265sub border {
1266 int $_[0]{border} * $::FONTSIZE
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 ($self->{label_w}, undef) = $self->{label}->size_request
1273 if $self->{label};
1274
1275 my ($w, $h) = $self->SUPER::size_request;
1276
1277 (
1278 $w + $self->border * 2,
1279 $h + $self->border * 2,
1280 )
1281}
1282
1283sub invoke_size_allocate {
1284 my ($self, $w, $h) = @_;
1285
1286 my $border = $self->border;
1287
1288 $w -= List::Util::max 0, $border * 2;
1289 $h -= List::Util::max 0, $border * 2;
1290
1291 if (my $label = $self->{label}) {
1292 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1293 $label->{h} = List::Util::min $h, $border;
1294 $label->invoke_size_allocate ($label->{w}, $label->{h});
1295 }
1296
1297 $self->child->configure ($border, $border, $w, $h);
1298
1299 1
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 my $child = $self->{children}[0];
1306
1307 my $border = $self->border;
1308 my ($w, $h) = ($self->{w}, $self->{h});
1309
1310 $child->draw;
1311
1312 glColor @{$self->{fg}};
1313 glBegin GL_LINE_STRIP;
1314 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1315 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1317 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1319 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1320 glEnd;
1321
1322 if ($self->{label}) {
1323 glTranslate $border * 2, 0;
1324 $self->{label}->_draw;
1325 }
1326}
1327
1328#############################################################################
1329
1330package CFPlus::UI::Toplevel;
1331
1332our @ISA = CFPlus::UI::Bin::;
1333
1334use CFPlus::OpenGL;
1063 1335
1064my $bg = 1336my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1337 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1338 mipmap => 1, wrap => 1;
1067 1339
1068my @border = 1340my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1341 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); 1342 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1343
1344my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png);
1071 1347
1072sub new { 1348sub new {
1073 my ($class, %arg) = @_; 1349 my ($class, %arg) = @_;
1074 1350
1075 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1352 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1353 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1354 border => 0.6,
1079 can_events => 1, 1355 can_events => 1,
1080 min_w => 16, 1356 min_w => 64,
1081 min_h => 16, 1357 min_h => 32,
1082 %arg, 1358 %arg,
1083 ); 1359 );
1084 1360
1085 $self->{title_widget} = new CFClient::UI::Label 1361 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1362 align => 0,
1087 valign => 1, 1363 valign => 1,
1088 text => $self->{title}, 1364 text => $self->{title},
1089 fontsize => $self->{border}, 1365 fontsize => $self->{border},
1090 if exists $self->{title}; 1366 if exists $self->{title};
1091 1367
1092 if ($self->{has_close_button}) { 1368 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1369 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1370 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1371 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1372 on_activate => sub { $self->emit ("delete") };
1097 1373
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1374 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1375 }
1100 1376
1101 $self 1377 $self
1102} 1378}
1103 1379
1104sub add { 1380sub add {
1105 my ($self, @widgets) = @_; 1381 my ($self, @widgets) = @_;
1106 1382
1107 $self->SUPER::add (@widgets); 1383 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1384 $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}; 1385 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1386}
1111 1387
1112sub border { 1388sub border {
1113 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1390}
1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1114} 1399}
1115 1400
1116sub size_request { 1401sub size_request {
1117 my ($self) = @_; 1402 my ($self) = @_;
1118 1403
… …
1147 $self->child->configure ($border, $border, $w, $h); 1432 $self->child->configure ($border, $border, $w, $h);
1148 1433
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1434 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1435 if $self->{close_button};
1151 1436
1437 1
1438}
1439
1440sub invoke_delete {
1441 my ($self) = @_;
1442
1443 $self->hide;
1444
1152 1 1445 1
1153} 1446}
1154 1447
1155sub invoke_button_down { 1448sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1507 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1508
1216 ! ! $self->{motion} 1509 ! ! $self->{motion}
1217} 1510}
1218 1511
1512sub invoke_visibility_change {
1513 my ($self, $visible) = @_;
1514
1515 delete $self->{motion} unless $visible;
1516
1517 0
1518}
1519
1219sub _draw { 1520sub _draw {
1220 my ($self) = @_; 1521 my ($self) = @_;
1221 1522
1222 my $child = $self->{children}[0]; 1523 my $child = $self->{children}[0];
1223 1524
… …
1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229 1530
1230 my $border = $self->border; 1531 my $border = $self->border;
1231 1532
1232 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1233 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1537 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1538
1539 # move
1540 my $w2 = ($w - $border) * .5;
1541 my $h2 = ($h - $border) * .5;
1542 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1543 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1545
1546 # resize
1547 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1548 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1549 unless $self->{has_close_button};
1550 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1551 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237 1552
1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1240 1555
1241 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1260 if $self->{close_button}; 1575 if $self->{close_button};
1261} 1576}
1262 1577
1263############################################################################# 1578#############################################################################
1264 1579
1265package CFClient::UI::Table; 1580package CFPlus::UI::Table;
1266 1581
1267our @ISA = CFClient::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1268 1583
1269use List::Util qw(max sum); 1584use List::Util qw(max sum);
1270 1585
1271use CFClient::OpenGL; 1586use CFPlus::OpenGL;
1272 1587
1273sub new { 1588sub new {
1274 my $class = shift; 1589 my $class = shift;
1275 1590
1276 $class->SUPER::new ( 1591 $class->SUPER::new (
1277 col_expand => [], 1592 col_expand => [],
1593 row_expand => [],
1278 @_, 1594 @_,
1279 ) 1595 )
1280} 1596}
1281 1597
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284}
1285
1286sub add { 1598sub add {
1287 my ($self, $x, $y, $child) = @_; 1599 my ($self, @widgets) = @_;
1288 1600
1289 $child->set_parent ($self); 1601 for my $child (@widgets) {
1290 $self->{children}[$y][$x] = $child; 1602 $child->{c_rowspan} ||= 1;
1603 $child->{c_colspan} ||= 1;
1604 }
1291 1605
1292 $self->realloc; 1606 $self->SUPER::add (@widgets);
1293} 1607}
1294 1608
1295sub remove { 1609sub add_at {
1610 my $self = shift;
1611
1612 my @widgets;
1613
1614 while (@_) {
1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1616
1617 $child->{c_row} = $row;
1618 $child->{c_col} = $col;
1619
1620 push @widgets, $child;
1621 }
1622
1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1296 my ($self, $child) = @_; 1627 my ($self) = @_;
1297 1628
1298 # TODO: not yet implemented 1629 my (@w, @h);
1299}
1300
1301# TODO: move to container class maybe? send children a signal on removal?
1302sub clear {
1303 my ($self) = @_;
1304 1630
1305 my @children = $self->children; 1631 my @children = $self->children;
1306 delete $self->{children}; 1632
1633 # first pass, columns
1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636
1637 my $sw = sum @w[$c .. $c + $cs - 1];
1638
1639 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1641 }
1307 1642 }
1308 for (@children) {
1309 delete $_->{parent};
1310 $_->hide;
1311 }
1312 1643
1313 $self->realloc; 1644 # second pass, rows
1314} 1645 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)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1329 1647
1330 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1331 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332 } 1652 }
1333 } 1653 }
1334 1654
1335 (\@w, \@h) 1655 (\@w, \@h)
1336} 1656}
… …
1352 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1353 1673
1354 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1355 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1356 1676
1357 # TODO: nicer code && do row_expand 1677 # now linearly scale the rows/columns to the allocated size
1358 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1359 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1360 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1361 1681
1362 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1683
1366 CFClient::UI::harmonize $ws; 1684 CFPlus::UI::harmonize $ws;
1685
1686 my @row_expand = @{$self->{row_expand}};
1687 @row_expand = (1) x @$ws unless @row_expand;
1688 my $row_expand = (sum @row_expand) || 1;
1689
1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1691
1367 CFClient::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1368 1693
1369 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370 1696
1371 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1372 my $row = $self->{children}[$r] 1698 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 1699
1375 my $x = 0; 1700 $widget->configure (
1376 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377 1703 );
1378 for my $c (0 .. $#$row) { 1704 }
1379 my $col_w = $ws->[$c];
1380 1705
1381 if (my $widget = $row->[$c]) { 1706 1
1382 $widget->configure ($x, $y, $col_w, $row_h); 1707}
1383 }
1384 1708
1385 $x += $col_w; 1709#############################################################################
1710
1711package CFPlus::UI::Fixed;
1712
1713use List::Util qw(min max);
1714
1715our @ISA = CFPlus::UI::Container::;
1716
1717sub _scale($$$) {
1718 my ($rel, $val, $max) = @_;
1719
1720 $rel ? $val * $max : $val
1721}
1722
1723sub size_request {
1724 my ($self) = @_;
1725
1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1727
1728 # determine overall size by querying abs widgets
1729 for my $child ($self->visible_children) {
1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1386 } 1736 }
1737 }
1387 1738
1388 $y += $row_h; 1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 # now layout remaining widgets
1743 for my $child ($self->visible_children) {
1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1750 }
1751 }
1752
1753 my $W = $x2 - $x1;
1754 my $H = $y2 - $y1;
1755
1756 ($W, $H)
1757}
1758
1759sub invoke_size_allocate {
1760 my ($self, $W, $H) = @_;
1761
1762 for my $child ($self->visible_children) {
1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1765
1766 $x += $child->{c_halign} * $child->{req_w};
1767 $y += $child->{c_valign} * $child->{req_h};
1768
1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1389 } 1770 }
1390 1771
1391 1 1772 1
1392} 1773}
1393 1774
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############################################################################# 1775#############################################################################
1419 1776
1420package CFClient::UI::Box; 1777package CFPlus::UI::Box;
1421 1778
1422our @ISA = CFClient::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1423 1780
1424sub size_request { 1781sub size_request {
1425 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1426 1785
1427 $self->{vertical} 1786 $self->{vertical}
1428 ? ( 1787 ? (
1429 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1430 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1431 ) 1790 )
1432 : ( 1791 : (
1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1434 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1435 ) 1794 )
1436} 1795}
1437 1796
1438sub invoke_size_allocate { 1797sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
1440 1799
1441 my $space = $self->{vertical} ? $h : $w; 1800 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1801 my @children = $self->visible_children;
1443 1802
1444 my @req; 1803 my @req;
1445 1804
1446 if ($self->{homogeneous}) { 1805 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1806 @req = ($space / (@children || 1)) x @children;
1448 } else { 1807 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1808 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1809 my $req = List::Util::sum @req;
1451 1810
1452 if ($req > $space) { 1811 if ($req > $space) {
1453 # ah well, not enough space 1812 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1813 $_ *= $space / $req for @req;
1455 } else { 1814 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1815 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1816
1458 $space = ($space - $req) / $expand; # remaining space to give away 1817 $space = ($space - $req) / $expand; # remaining space to give away
1459 1818
1460 $req[$_] += $space * $children->[$_]{expand} 1819 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1820 for 0 .. $#children;
1462 } 1821 }
1463 } 1822 }
1464 1823
1465 CFClient::UI::harmonize \@req; 1824 CFPlus::UI::harmonize \@req;
1466 1825
1467 my $pos = 0; 1826 my $pos = 0;
1468 for (0 .. $#$children) { 1827 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1828 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1829 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1830
1472 $pos += $alloc; 1831 $pos += $alloc;
1473 } 1832 }
1474 1833
1475 1 1834 1
1476} 1835}
1477 1836
1478############################################################################# 1837#############################################################################
1479 1838
1480package CFClient::UI::HBox; 1839package CFPlus::UI::HBox;
1481 1840
1482our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1483 1842
1484sub new { 1843sub new {
1485 my $class = shift; 1844 my $class = shift;
1486 1845
1487 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1490 ) 1849 )
1491} 1850}
1492 1851
1493############################################################################# 1852#############################################################################
1494 1853
1495package CFClient::UI::VBox; 1854package CFPlus::UI::VBox;
1496 1855
1497our @ISA = CFClient::UI::Box::; 1856our @ISA = CFPlus::UI::Box::;
1498 1857
1499sub new { 1858sub new {
1500 my $class = shift; 1859 my $class = shift;
1501 1860
1502 $class->SUPER::new ( 1861 $class->SUPER::new (
… …
1505 ) 1864 )
1506} 1865}
1507 1866
1508############################################################################# 1867#############################################################################
1509 1868
1510package CFClient::UI::Label; 1869package CFPlus::UI::Label;
1511 1870
1512our @ISA = CFClient::UI::DrawBG::; 1871our @ISA = CFPlus::UI::DrawBG::;
1513 1872
1514use CFClient::OpenGL; 1873use CFPlus::OpenGL;
1515 1874
1516sub new { 1875sub new {
1517 my ($class, %arg) = @_; 1876 my ($class, %arg) = @_;
1518 1877
1519 my $self = $class->SUPER::new ( 1878 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1881 #active_bg => none
1523 #font => default_font 1882 #font => default_font
1524 #text => initial text 1883 #text => initial text
1525 #markup => initial narkup 1884 #markup => initial narkup
1526 #max_w => maximum pixel width 1885 #max_w => maximum pixel width
1886 #style => 0, # render flags
1527 ellipsise => 3, # end 1887 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1888 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1889 fontsize => 1,
1530 align => -1, 1890 align => -1,
1531 valign => -1, 1891 valign => -1,
1532 padding_x => 2, 1892 padding_x => 2,
1533 padding_y => 2, 1893 padding_y => 2,
1534 can_events => 0, 1894 can_events => 0,
1535 %arg 1895 %arg
1536 ); 1896 );
1537 1897
1538 if (exists $self->{template}) { 1898 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1899 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1900 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1901 $self->{template} = $layout;
1542 } 1902 }
1543 1903
1544 if (exists $self->{markup}) { 1904 if (exists $self->{markup}) {
… …
1548 } 1908 }
1549 1909
1550 $self 1910 $self
1551} 1911}
1552 1912
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1913sub update {
1564 my ($self) = @_; 1914 my ($self) = @_;
1565 1915
1566 delete $self->{texture}; 1916 delete $self->{texture};
1567 $self->SUPER::update; 1917 $self->SUPER::update;
… …
1572 1922
1573 delete $self->{ox}; 1923 delete $self->{ox};
1574 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1575} 1925}
1576 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1577sub set_text { 1933sub set_text {
1578 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1579 1935
1580 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
1582 1938
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1939 $self->{layout}->set_text ($text);
1585 1940
1586 delete $self->{size_req}; 1941 delete $self->{size_req};
1587 $self->realloc; 1942 $self->realloc;
1588 $self->update; 1943 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1949 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1950 $self->{text} = "M$markup";
1596 1951
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1952 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1953
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1954 $self->{layout}->set_markup ($markup);
1601 1955
1602 delete $self->{size_req}; 1956 delete $self->{size_req};
1603 $self->realloc; 1957 $self->realloc;
1604 $self->update; 1958 $self->update;
… …
1606 1960
1607sub size_request { 1961sub size_request {
1608 my ($self) = @_; 1962 my ($self) = @_;
1609 1963
1610 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1611 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1612 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1613 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1616 1972
1617 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
1618 1974
1619 if (exists $self->{template}) { 1975 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1976 $self->{template}->set_font ($self->{font}) if $self->{font};
1977 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1978 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1979
1623 my ($w2, $h2) = $self->{template}->size; 1980 my ($w2, $h2) = $self->{template}->size;
1624 1981
1625 $w = List::Util::max $w, $w2; 1982 $w = List::Util::max $w, $w2;
… …
1630 }; 1987 };
1631 1988
1632 @{ $self->{size_req} } 1989 @{ $self->{size_req} }
1633} 1990}
1634 1991
1992sub baseline_shift {
1993 $_[0]{layout}->descent
1994}
1995
1635sub invoke_size_allocate { 1996sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1997 my ($self, $w, $h) = @_;
1637 1998
1638 delete $self->{ox}; 1999 delete $self->{ox};
1639 2000
… …
1645 2006
1646sub set_fontsize { 2007sub set_fontsize {
1647 my ($self, $fontsize) = @_; 2008 my ($self, $fontsize) = @_;
1648 2009
1649 $self->{fontsize} = $fontsize; 2010 $self->{fontsize} = $fontsize;
2011 delete $self->{size_req};
1650 delete $self->{texture}; 2012 delete $self->{texture};
1651 2013
1652 $self->realloc; 2014 $self->realloc;
1653} 2015}
1654 2016
1655sub reconfigure { 2017sub reconfigure {
1656 my ($self) = @_; 2018 my ($self) = @_;
1657 2019
1658 delete $self->{size_req}; 2020 delete $self->{size_req};
2021 delete $self->{texture};
1659 2022
1660 $self->SUPER::reconfigure; 2023 $self->SUPER::reconfigure;
1661} 2024}
1662 2025
1663sub _draw { 2026sub _draw {
1664 my ($self) = @_; 2027 my ($self) = @_;
1665 2028
1666 $self->SUPER::_draw; # draw background, if applicable 2029 $self->SUPER::_draw; # draw background, if applicable
1667 2030
1668 my $tex = $self->{texture} ||= do { 2031 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 2032 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2033 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 2034 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2035 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2036 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2037 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 2038
1676 new_from_layout CFClient::Texture $self->{layout} 2039 [$self->{layout}->size]
1677 }; 2040 };
1678 2041
1679 unless (exists $self->{ox}) { 2042 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2043 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2044 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
1683 2046
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1687 }; 2052 };
1688 2053
1689 glEnable GL_TEXTURE_2D; 2054# unless ($self->{list}) {
1690 2055# $self->{list} = CFPlus::OpenGL::glGenList;
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2056# CFPlus::OpenGL::glNewList $self->{list};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1693 2058# 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 } 2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
1702 2062
1703 glDisable GL_TEXTURE_2D; 2063 $self->{layout}->draw;
1704} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
1705 2073
1706############################################################################# 2074#############################################################################
1707 2075
1708package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1709 2077
1710our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1711 2079
1712use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1713 2081
1714sub new { 2082sub new {
1715 my $class = shift; 2083 my $class = shift;
1716 2084
1717 $class->SUPER::new ( 2085 $class->SUPER::new (
1718 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
1719 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
1720 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
1721 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
1722 can_hover => 1, 2092 can_hover => 1,
1723 can_focus => 1, 2093 can_focus => 1,
1724 valign => 0, 2094 valign => 0,
1725 can_events => 1, 2095 can_events => 1,
2096 ellipsise => 0,
1726 #text => ... 2097 #text => ...
1727 #hidden => "*", 2098 #hidden => "*",
1728 @_ 2099 @_
1729 ) 2100 )
1730} 2101}
… …
1775 my $sym = $ev->{sym}; 2146 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 2147 my $uni = $ev->{unicode};
1777 2148
1778 my $text = $self->get_text; 2149 my $text = $self->get_text;
1779 2150
2151 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2152
1780 if ($uni == 8) { 2153 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2154 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 2155 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 2156 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 2157 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 2158 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 2159 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2160 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 2161 } elsif ($sym == CFPlus::SDLK_HOME) {
2162 # what a hack
2163 $self->{cursor} =
2164 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2165 ? length $1
2166 : 0;
2167 } elsif ($sym == CFPlus::SDLK_END) {
2168 # uh, again
2169 $self->{cursor} =
2170 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2171 ? $self->{cursor} + length $1
2172 : length $self->{text};
2173 } elsif ($uni == 21) { # ctrl-u
2174 $text = "";
1789 $self->{cursor} = 0; 2175 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2176 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2177 $self->emit ('escape');
1794 } elsif ($uni) { 2178 } elsif ($uni == 0x0d) {
2179 substr $text, $self->{cursor}++, 0, "\012";
2180 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2181 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2182 } else {
1797 return 0; 2183 return 0;
1798 } 2184 }
1799 2185
1800 $self->_set_text ($text); 2186 $self->_set_text ($text);
1801 2187
1802 $self->realloc; 2188 $self->realloc;
2189 $self->update;
1803 2190
1804 1 2191 1
1805} 2192}
1806 2193
1807sub invoke_focus_in { 2194sub invoke_focus_in {
… …
1819 2206
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2207 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2208
1822 # byte-index to char-index 2209 # byte-index to char-index
1823 my $text = $self->{text}; 2210 my $text = $self->{text};
1824 utf8::encode $text; 2211 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2212 $self->{cursor} = length $text;
1826 2213
1827 $self->_set_text ($self->{text}); 2214 $self->_set_text ($self->{text});
1828 $self->update; 2215 $self->update;
1829 2216
1830 1 2217 1
… …
1849 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
1850 } 2237 }
1851 2238
1852 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 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}; 2241 glRect 0, 0, $self->{w}, $self->{h};
1858 glVertex $self->{w}, 0;
1859 glEnd;
1860 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
1861 2243
1862 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
1863 2245
1864 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
1866 2248
1867 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
1868 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
1869 utf8::encode $text; 2251 utf8::encode $text;
1870 2252
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1872 } 2254 }
1873 2255
1874 glColor @{$self->{fg}}; 2256 glColor_premultiply @{$self->{active_fg}};
1875 glBegin GL_LINES; 2257 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 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}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2260 glEnd;
1879 }
1880}
1881 2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2274 glEnd;
2275 }
2276}
2277
2278#############################################################################
2279
1882package CFClient::UI::Entry; 2280package CFPlus::UI::Entry;
1883 2281
1884our @ISA = CFClient::UI::EntryBase::; 2282our @ISA = CFPlus::UI::EntryBase::;
1885 2283
1886use CFClient::OpenGL; 2284use CFPlus::OpenGL;
1887 2285
1888sub invoke_key_down { 2286sub invoke_key_down {
1889 my ($self, $ev) = @_; 2287 my ($self, $ev) = @_;
1890 2288
1891 my $sym = $ev->{sym}; 2289 my $sym = $ev->{sym};
1892 2290
1893 if ($sym == 13) { 2291 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2292 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2293 my $txt = $self->get_text;
1896 2294
1897 $self->{history_pointer} = -1; 2295 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2296 $self->{history_saveback} = '';
1899 $self->emit (activate => $txt); 2297 $self->emit (activate => $txt);
1900 $self->update; 2298 $self->update;
1901 2299
1902 } elsif ($sym == CFClient::SDLK_UP) { 2300 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2301 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2302 $self->{history_saveback} = $self->get_text;
1905 } 2303 }
1906 if (@{$self->{history} || []} > 0) { 2304 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2305 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2307 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2308 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2309 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2310 }
1913 2311
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2312 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2313 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2314 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2315
1918 if ($self->{history_pointer} >= 0) { 2316 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1928 1 2326 1
1929} 2327}
1930 2328
1931############################################################################# 2329#############################################################################
1932 2330
2331package CFPlus::UI::TextEdit;
2332
2333our @ISA = CFPlus::UI::EntryBase::;
2334
2335use CFPlus::OpenGL;
2336
2337sub move_cursor_ver {
2338 my ($self, $dy) = @_;
2339
2340 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2341
2342 $y += $dy;
2343
2344 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2345 $self->{cursor} = $index;
2346 delete $self->{cur_h};
2347 $self->update;
2348 return;
2349 }
2350}
2351
2352sub invoke_key_down {
2353 my ($self, $ev) = @_;
2354
2355 my $sym = $ev->{sym};
2356
2357 if ($sym == CFPlus::SDLK_UP) {
2358 $self->move_cursor_ver (-1);
2359 } elsif ($sym == CFPlus::SDLK_DOWN) {
2360 $self->move_cursor_ver (+1);
2361 } else {
2362 return $self->SUPER::invoke_key_down ($ev)
2363 }
2364
2365 1
2366}
2367
2368#############################################################################
2369
1933package CFClient::UI::Button; 2370package CFPlus::UI::ButtonBin;
1934 2371
1935our @ISA = CFClient::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
1936 2373
1937use CFClient::OpenGL; 2374use CFPlus::OpenGL;
1938 2375
1939my @tex = 2376my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
1942 2379
1943sub new { 2380sub new {
1944 my $class = shift; 2381 my $class = shift;
1945 2382
1946 $class->SUPER::new ( 2383 $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, 2384 can_hover => 1,
1952 align => 0, 2385 align => 0,
1953 valign => 0, 2386 valign => 0,
1954 can_events => 1, 2387 can_events => 1,
1955 @_ 2388 @_
… …
1967} 2400}
1968 2401
1969sub _draw { 2402sub _draw {
1970 my ($self) = @_; 2403 my ($self) = @_;
1971 2404
1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1973
1974 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1976 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
1977 2408
2409 my $tex = $tex[$GRAB == $self];
1978 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1979 2411
1980 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
1981 2413
1982 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
1983} 2415}
1984 2416
1985############################################################################# 2417#############################################################################
1986 2418
2419package CFPlus::UI::Button;
2420
2421our @ISA = CFPlus::UI::Label::;
2422
2423use CFPlus::OpenGL;
2424
2425my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2427 qw(b1_button_inactive.png b1_button_active.png);
2428
2429sub new {
2430 my $class = shift;
2431
2432 $class->SUPER::new (
2433 padding_x => 4,
2434 padding_y => 4,
2435 fg => [1.0, 1.0, 1.0],
2436 active_fg => [0.8, 0.8, 0.8],
2437 can_hover => 1,
2438 align => 0,
2439 valign => 0,
2440 can_events => 1,
2441 @_
2442 )
2443}
2444
2445sub invoke_button_up {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 $self->emit ("activate")
2449 if $x >= 0 && $x < $self->{w}
2450 && $y >= 0 && $y < $self->{h};
2451
2452 1
2453}
2454
2455sub _draw {
2456 my ($self) = @_;
2457
2458 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2459
2460 glEnable GL_TEXTURE_2D;
2461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2462 glColor 0, 0, 0, 1;
2463
2464 my $tex = $tex[$GRAB == $self];
2465 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2466
2467 glDisable GL_TEXTURE_2D;
2468
2469 $self->SUPER::_draw;
2470}
2471
2472#############################################################################
2473
2474package CFPlus::UI::CheckBox;
2475
2476our @ISA = CFPlus::UI::DrawBG::;
2477
2478my @tex =
2479 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2480 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2481
2482use CFPlus::OpenGL;
2483
2484sub new {
2485 my $class = shift;
2486
2487 $class->SUPER::new (
2488 padding_x => 2,
2489 padding_y => 2,
2490 fg => [1, 1, 1],
2491 active_fg => [1, 1, 0],
2492 bg => [0, 0, 0, 0.2],
2493 active_bg => [1, 1, 1, 0.5],
2494 state => 0,
2495 can_hover => 1,
2496 @_
2497 )
2498}
2499
2500sub size_request {
2501 my ($self) = @_;
2502
2503 (6) x 2
2504}
2505
2506sub toggle {
2507 my ($self) = @_;
2508
2509 $self->{state} = !$self->{state};
2510 $self->emit (changed => $self->{state});
2511 $self->update;
2512}
2513
2514sub invoke_button_down {
2515 my ($self, $ev, $x, $y) = @_;
2516
2517 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2518 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2519 $self->toggle;
2520 } else {
2521 return 0
2522 }
2523
2524 1
2525}
2526
2527sub _draw {
2528 my ($self) = @_;
2529
2530 $self->SUPER::_draw;
2531
2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2533
2534 my ($w, $h) = @$self{qw(w h)};
2535
2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2537
2538 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2539
2540 my $tex = $self->{state} ? $tex[1] : $tex[0];
2541
2542 glEnable GL_TEXTURE_2D;
2543 $tex->draw_quad_alpha (0, 0, $s, $s);
2544 glDisable GL_TEXTURE_2D;
2545}
2546
2547#############################################################################
2548
2549package CFPlus::UI::Image;
2550
2551our @ISA = CFPlus::UI::Base::;
2552
2553use CFPlus::OpenGL;
2554
2555our %texture_cache;
2556
2557sub new {
2558 my $class = shift;
2559
2560 my $self = $class->SUPER::new (
2561 can_events => 0,
2562 scale => 1,
2563 @_,
2564 );
2565
2566 $self->{path} || $self->{tex}
2567 or Carp::croak "'path' or 'tex' attributes required";
2568
2569 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2570 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2571
2572 CFPlus::weaken $texture_cache{$self->{path}};
2573
2574 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2575
2576 $self
2577}
2578
2579sub STORABLE_freeze {
2580 my ($self, $cloning) = @_;
2581
2582 $self->{path}
2583 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2584
2585 $self->{path}
2586}
2587
2588sub STORABLE_attach {
2589 my ($self, $cloning, $path) = @_;
2590
2591 $self->new (path => $path)
2592}
2593
2594sub size_request {
2595 my ($self) = @_;
2596
2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2598}
2599
2600sub _draw {
2601 my ($self) = @_;
2602
2603 my $tex = $self->{tex};
2604
2605 my ($w, $h) = ($self->{w}, $self->{h});
2606
2607 if ($self->{rot90}) {
2608 glRotate 90, 0, 0, 1;
2609 glTranslate 0, -$self->{w}, 0;
2610
2611 ($w, $h) = ($h, $w);
2612 }
2613
2614 glEnable GL_TEXTURE_2D;
2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2616
2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2618
2619 glDisable GL_TEXTURE_2D;
2620}
2621
2622#############################################################################
2623
1987package CFClient::UI::ImageButton; 2624package CFPlus::UI::ImageButton;
1988 2625
1989our @ISA = CFClient::UI::Image::; 2626our @ISA = CFPlus::UI::Image::;
1990 2627
1991use CFClient::OpenGL; 2628use CFPlus::OpenGL;
1992 2629
1993my %textures; 2630my %textures;
1994 2631
1995sub new { 2632sub new {
1996 my $class = shift; 2633 my $class = shift;
… …
2006 can_events => 1, 2643 can_events => 1,
2007 @_ 2644 @_
2008 ); 2645 );
2009} 2646}
2010 2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2652}
2653
2011sub invoke_button_up { 2654sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2013 2656
2014 $self->emit ("activate") 2657 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w} 2658 if $x >= 0 && $x < $self->{w}
… …
2018 1 2661 1
2019} 2662}
2020 2663
2021############################################################################# 2664#############################################################################
2022 2665
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; 2666package CFPlus::UI::VGauge;
2092 2667
2093our @ISA = CFClient::UI::Base::; 2668our @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 2669
2153use List::Util qw(min max); 2670use List::Util qw(min max);
2154 2671
2155use CFClient::OpenGL; 2672use CFPlus::OpenGL;
2156 2673
2157my %tex = ( 2674my %tex = (
2158 food => [ 2675 food => [
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2677 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161 ], 2678 ],
2162 grace => [ 2679 grace => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 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/ 2681 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165 ], 2682 ],
2166 hp => [ 2683 hp => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2685 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169 ], 2686 ],
2170 mana => [ 2687 mana => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 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/ 2689 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173 ], 2690 ],
2174); 2691);
2175 2692
2176# eg. VGauge->new (gauge => 'food'), default gauge: food 2693# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2753 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2754 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2755
2239 my $h1 = $self->{h} * (1 - $ycut1); 2756 my $h1 = $self->{h} * (1 - $ycut1);
2240 my $h2 = $self->{h} * (1 - $ycut2); 2757 my $h2 = $self->{h} * (1 - $ycut2);
2758 my $h3 = $self->{h};
2759
2760 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241 2761
2242 glEnable GL_BLEND; 2762 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2763 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2764 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2765 glEnable GL_TEXTURE_2D;
… …
2264 2784
2265 if ($t3) { 2785 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2786 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2787 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2788 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2789 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2790 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2791 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2792 glEnd;
2273 } 2793 }
2274 2794
2275 glDisable GL_BLEND; 2795 glDisable GL_BLEND;
2276 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2277} 2797}
2278 2798
2279############################################################################# 2799#############################################################################
2280 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2281package CFClient::UI::Gauge; 2939package CFPlus::UI::Gauge;
2282 2940
2283our @ISA = CFClient::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2284 2942
2285sub new { 2943sub new {
2286 my ($class, %arg) = @_; 2944 my ($class, %arg) = @_;
2287 2945
2288 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2290 can_hover => 1, 2948 can_hover => 1,
2291 can_events => 1, 2949 can_events => 1,
2292 %arg, 2950 %arg,
2293 ); 2951 );
2294 2952
2295 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2953 $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); 2954 $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"); 2955 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298 2956
2299 $self 2957 $self
2300} 2958}
2301 2959
2302sub set_fontsize { 2960sub set_fontsize {
… …
2323 $self->{value}->set_text ($val); 2981 $self->{value}->set_text ($val);
2324} 2982}
2325 2983
2326############################################################################# 2984#############################################################################
2327 2985
2328package CFClient::UI::Slider; 2986package CFPlus::UI::Slider;
2329 2987
2330use strict; 2988use strict;
2331 2989
2332use CFClient::OpenGL; 2990use CFPlus::OpenGL;
2333 2991
2334our @ISA = CFClient::UI::DrawBG::; 2992our @ISA = CFPlus::UI::DrawBG::;
2335 2993
2336my @tex = 2994my @tex =
2337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2995 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338 qw(s1_slider.png s1_slider_bg.png); 2996 qw(s1_slider.png s1_slider_bg.png);
2339 2997
2340sub new { 2998sub new {
2341 my $class = shift; 2999 my $class = shift;
2342 3000
… …
2410 3068
2411 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2412 3070
2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414 3072
2415 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2416} 3076}
2417 3077
2418sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2419 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2420 3080
… …
2427 3087
2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3088 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else { 3089 } else {
2430 return 0; 3090 return 0;
2431 } 3091 }
3092
3093 1
3094}
3095
3096sub invoke_mouse_wheel {
3097 my ($self, $ev) = @_;
3098
3099 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3100
3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3102
3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2432 3104
2433 1 3105 1
2434} 3106}
2435 3107
2436sub update { 3108sub update {
… …
2487 glDisable GL_TEXTURE_2D; 3159 glDisable GL_TEXTURE_2D;
2488} 3160}
2489 3161
2490############################################################################# 3162#############################################################################
2491 3163
2492package CFClient::UI::ValSlider; 3164package CFPlus::UI::ValSlider;
2493 3165
2494our @ISA = CFClient::UI::HBox::; 3166our @ISA = CFPlus::UI::HBox::;
2495 3167
2496sub new { 3168sub new {
2497 my ($class, %arg) = @_; 3169 my ($class, %arg) = @_;
2498 3170
2499 my $range = delete $arg{range}; 3171 my $range = delete $arg{range};
2500 3172
2501 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3174 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3175 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift }, 3176 to_value => sub { shift },
2505 from_value => sub { shift }, 3177 from_value => sub { shift },
2506 %arg, 3178 %arg,
2507 ); 3179 );
2508 3180
… …
2528sub set_range { shift->{slider}->set_range (@_) } 3200sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) } 3201sub set_value { shift->{slider}->set_value (@_) }
2530 3202
2531############################################################################# 3203#############################################################################
2532 3204
2533package CFClient::UI::TextScroller; 3205package CFPlus::UI::TextScroller;
2534 3206
2535our @ISA = CFClient::UI::HBox::; 3207our @ISA = CFPlus::UI::HBox::;
2536 3208
2537use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2538 3210
2539sub new { 3211sub new {
2540 my $class = shift; 3212 my $class = shift;
2541 3213
2542 my $self = $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
2543 fontsize => 1, 3215 fontsize => 1,
2544 can_events => 0, 3216 can_events => 1,
2545 indent => 0, 3217 indent => 0,
2546 #font => default_font 3218 #font => default_font
2547 @_, 3219 @_,
2548 3220
2549 layout => (new CFClient::Layout 1), 3221 layout => (new CFPlus::Layout),
2550 par => [], 3222 par => [],
3223 max_par => 0,
2551 height => 0, 3224 height => 0,
2552 children => [ 3225 children => [
2553 (new CFClient::UI::Empty expand => 1), 3226 (new CFPlus::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 3227 (new CFPlus::UI::Slider vertical => 1),
2555 ], 3228 ],
2556 ); 3229 );
2557 3230
2558 $self->{children}[1]->connect (changed => sub { $self->update }); 3231 $self->{children}[1]->connect (changed => sub { $self->update });
2559 3232
… …
2565 3238
2566 $self->{fontsize} = $fontsize; 3239 $self->{fontsize} = $fontsize;
2567 $self->reflow; 3240 $self->reflow;
2568} 3241}
2569 3242
3243sub size_request {
3244 my ($self) = @_;
3245
3246 my ($empty, $slider) = $self->visible_children;
3247
3248 local $self->{children} = [$empty, $slider];
3249 $self->SUPER::size_request
3250}
3251
2570sub invoke_size_allocate { 3252sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 3253 my ($self, $w, $h) = @_;
2572 3254
3255 my ($empty, $slider, @other) = @{ $self->{children} };
3256 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3257
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3258 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3259 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 3260 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3261 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 3262
2578 $self->reflow; 3263 $self->reflow;
2579 3264
3265 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 3266 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 3267}
2582 3268
2583sub text_size { 3269sub invoke_mouse_wheel {
2584 my ($self, $text, $indent) = @_; 3270 my ($self, $ev) = @_;
3271
3272 return 0 unless $ev->{dy}; # only vertical movements
3273
3274 $self->{children}[1]->emit (mouse_wheel => $ev);
3275
3276 1
3277}
3278
3279sub get_layout {
3280 my ($self, $para) = @_;
2585 3281
2586 my $layout = $self->{layout}; 3282 my $layout = $self->{layout};
2587 3283
3284 $layout->set_font ($self->{font}) if $self->{font};
3285 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3286 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 3287 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3288 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 3289 $layout->set_markup ($para->{markup});
3290
3291 $layout->set_shapes (
3292 map
3293 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3294 @{$para->{widget}}
2592 3295 );
3296
2593 $layout->size 3297 $layout
2594} 3298}
2595 3299
2596sub reflow { 3300sub reflow {
2597 my ($self) = @_; 3301 my ($self) = @_;
2598 3302
… …
2605 3309
2606 # todo: base offset on lines or so, not on pixels 3310 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset); 3311 $self->{children}[1]->set_value ($offset);
2608} 3312}
2609 3313
3314sub current_paragraph {
3315 my ($self) = @_;
3316
3317 $self->{top_paragraph} - 1
3318}
3319
3320sub scroll_to {
3321 my ($self, $para) = @_;
3322
3323 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3324
3325 $self->{scroll_to} = $para;
3326 $self->update;
3327}
3328
2610sub clear { 3329sub clear {
2611 my ($self) = @_; 3330 my ($self) = @_;
3331
3332 my (undef, undef, @other) = @{ $self->{children} };
3333 $self->remove ($_) for @other;
2612 3334
2613 $self->{par} = []; 3335 $self->{par} = [];
2614 $self->{height} = 0; 3336 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3337 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 3338}
2617 3339
2618sub add_paragraph { 3340sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 3341 my $self = shift;
2620 3342
2621 for my $line (split /\n/, $text) { 3343 for my $para (@_) {
2622 my ($w, $h) = $self->text_size ($line); 3344 $para = {
3345 fg => [1, 1, 1, 1],
3346 indent => 0,
3347 markup => "",
3348 widget => [],
3349 ref $para ? %$para : (markup => $para),
3350 w => 1e10,
3351 wrapped => 1,
3352 };
3353
3354 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3355 push @{$self->{par}}, $para;
3356 }
3357
3358 if (my $max = $self->{max_par}) {
3359 shift @{$self->{par}} while @{$self->{par}} > $max;
3360 }
3361
3362 $self->{need_reflow}++;
3363 $self->update;
3364}
3365
3366sub scroll_to_bottom {
3367 my ($self) = @_;
3368
3369 $self->{scroll_to} = $#{$self->{par}};
3370 $self->update;
3371}
3372
3373sub force_uptodate {
3374 my ($self) = @_;
3375
3376 if (delete $self->{need_reflow}) {
3377 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3378
3379 my $height = 0;
3380
3381 for my $para (@{$self->{par}}) {
3382 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3383 my $layout = $self->get_layout ($para);
3384 my ($w, $h) = $layout->size;
3385
3386 $para->{w} = $w + $para->{indent};
3387 $para->{h} = $h;
3388 $para->{wrapped} = $layout->has_wrapped;
3389 }
3390
3391 $para->{y} = $height;
3392 $height += $para->{h};
3393 }
3394
2623 $self->{height} += $h; 3395 $self->{height} = $height;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3396 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625 }
2626 3397
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3398 delete $self->{texture};
3399 }
3400
3401 if (my $paridx = delete $self->{scroll_to}) {
3402 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3403 }
2628} 3404}
2629 3405
2630sub update { 3406sub update {
2631 my ($self) = @_; 3407 my ($self) = @_;
2632 3408
… …
2635 return unless $self->{h} > 0; 3411 return unless $self->{h} > 0;
2636 3412
2637 delete $self->{texture}; 3413 delete $self->{texture};
2638 3414
2639 $ROOT->on_post_alloc ($self => sub { 3415 $ROOT->on_post_alloc ($self => sub {
3416 $self->force_uptodate;
3417
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3418 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 3419
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 { 3420 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 3421 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 3422 glClear GL_COLOR_BUFFER_BIT;
2672 3423
3424 package CFPlus::UI::Base;
3425 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3426 (0, 0, $self->{w}, $self->{h});
3427
3428 my $top = int $self->{children}[1]{range}[0];
3429
3430 my $paridx = 0;
3431 my $top_paragraph;
2673 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
2674 3433
2675 my $y0 = $top; 3434 my $y0 = $top;
2676 my $y1 = $top + $H; 3435 my $y1 = $top + $H;
2677 3436
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}}) { 3437 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 3438 my $h = $para->{h};
3439 my $y = $para->{y};
2690 3440
2691 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 3442 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 3443
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
2698 3446
2699 glRasterPos $par->[3], $y - $y0; 3447 if (my @w = @{ $para->{widget} }) {
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3448 my @s = $layout->get_shapes;
3449
3450 for (@w) {
3451 my ($dx, $dy) = splice @s, 0, 2, ();
3452
3453 $_->{x} = $dx + $para->{indent};
3454 $_->{y} = $dy + $y - $y0;
3455
3456 $_->draw;
3457 }
3458 }
2701 } 3459 }
2702 3460
2703 $y += $h; 3461 $paridx++;
3462 $top_paragraph ||= $paridx if $y >= $top;
2704 } 3463 }
2705 3464
2706 glDisable GL_BLEND; 3465 $self->{top_paragraph} = $top_paragraph;
2707 }; 3466 };
2708 }); 3467 });
3468}
3469
3470sub reconfigure {
3471 my ($self) = @_;
3472
3473 $self->SUPER::reconfigure;
3474
3475 $_->{w} = 1e10 for @{ $self->{par} };
3476 $self->reflow;
2709} 3477}
2710 3478
2711sub _draw { 3479sub _draw {
2712 my ($self) = @_; 3480 my ($self) = @_;
2713 3481
… …
2716 glColor 0, 0, 0, 1; 3484 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3485 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 3486 glDisable GL_TEXTURE_2D;
2719 3487
2720 $self->{children}[1]->draw; 3488 $self->{children}[1]->draw;
2721
2722} 3489}
2723 3490
2724############################################################################# 3491#############################################################################
2725 3492
2726package CFClient::UI::Animator; 3493package CFPlus::UI::Animator;
2727 3494
2728use CFClient::OpenGL; 3495use CFPlus::OpenGL;
2729 3496
2730our @ISA = CFClient::UI::Bin::; 3497our @ISA = CFPlus::UI::Bin::;
2731 3498
2732sub moveto { 3499sub moveto {
2733 my ($self, $x, $y) = @_; 3500 my ($self, $x, $y) = @_;
2734 3501
2735 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3502 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2763 glPopMatrix; 3530 glPopMatrix;
2764} 3531}
2765 3532
2766############################################################################# 3533#############################################################################
2767 3534
2768package CFClient::UI::Flopper; 3535package CFPlus::UI::Flopper;
2769 3536
2770our @ISA = CFClient::UI::Button::; 3537our @ISA = CFPlus::UI::Button::;
2771 3538
2772sub new { 3539sub new {
2773 my $class = shift; 3540 my $class = shift;
2774 3541
2775 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
2787 $self->{other}->toggle_visibility; 3554 $self->{other}->toggle_visibility;
2788} 3555}
2789 3556
2790############################################################################# 3557#############################################################################
2791 3558
2792package CFClient::UI::Tooltip; 3559package CFPlus::UI::Tooltip;
2793 3560
2794our @ISA = CFClient::UI::Bin::; 3561our @ISA = CFPlus::UI::Bin::;
2795 3562
2796use CFClient::OpenGL; 3563use CFPlus::OpenGL;
2797 3564
2798sub new { 3565sub new {
2799 my $class = shift; 3566 my $class = shift;
2800 3567
2801 $class->SUPER::new ( 3568 $class->SUPER::new (
… …
2805} 3572}
2806 3573
2807sub set_tooltip_from { 3574sub set_tooltip_from {
2808 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
2809 3576
2810 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
2811 3582
2812 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
2817 } 3588 }
2818 3589
2819 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
2821 3592
2822 $self->add (new CFClient::UI::Label 3593 $self->add (new CFPlus::UI::Label
2823 markup => $tooltip, 3594 markup => $tip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825 fontsize => 0.8, 3596 fontsize => 0.8,
2826 fg => [0, 0, 0, 1], 3597 style => 1, # FLAG_INVERSE
2827 ellipsise => 0, 3598 ellipsise => 0,
2828 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
2829 ); 3600 );
2830} 3601}
2831 3602
… …
2850 3621
2851 $self->{root}->on_post_alloc ("move_$self" => sub { 3622 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner} 3623 my $widget = $self->{owner}
2853 or return; 3624 or return;
2854 3625
3626 if ($widget->{visible}) {
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3627 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856 3628
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3629 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w}; 3630 if $x + $self->{w} > $self->{root}{w};
2859 3631
2860 $self->move_abs ($x, $y); 3632 $self->move_abs ($x, $y);
3633 } else {
3634 $self->hide;
3635 }
2861 }); 3636 });
2862} 3637}
2863 3638
2864sub _draw { 3639sub _draw {
2865 my ($self) = @_; 3640 my ($self) = @_;
2866 3641
2867 glTranslate 0.375, 0.375;
2868
2869 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
2870 3643
2871 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
2872 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
2873 glVertex 0 , 0;
2874 glVertex 0 , $h;
2875 glVertex $w, $h;
2876 glVertex $w, 0;
2877 glEnd;
2878 3646
2879 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
2880 glBegin GL_LINE_LOOP; 3648 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 3649
2887 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
2888 3651
2889 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
2890} 3653}
2891 3654
2892############################################################################# 3655#############################################################################
2893 3656
2894package CFClient::UI::Face; 3657package CFPlus::UI::Face;
2895 3658
2896our @ISA = CFClient::UI::Base::; 3659our @ISA = CFPlus::UI::DrawBG::;
2897 3660
2898use CFClient::OpenGL; 3661use CFPlus::OpenGL;
2899 3662
2900sub new { 3663sub new {
2901 my $class = shift; 3664 my $class = shift;
2902 3665
2903 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 size_w => 32,
3668 size_h => 8,
2904 aspect => 1, 3669 aspect => 1,
2905 can_events => 0, 3670 can_events => 0,
2906 @_, 3671 @_,
2907 ); 3672 );
2908 3673
2909 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
2910 Scalar::Util::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
2911 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2912 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
2913 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914 hard => 1, 3680 parked => 1,
2915 interval => $self->{animspeed},
2916 cb => sub { 3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
2917 ++$widget->{frame}; 3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
2918 $widget->update; 3691 $w->update;
3692 $w->update_timer;
2919 }, 3693 },
2920 ); 3694 );
3695
3696 $self->update_face;
3697 $self->update_timer;
2921 } 3698 }
2922 3699
2923 $self 3700 $self
2924} 3701}
2925 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->at (
3710 $self->{anim_start}
3711 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3713 );
3714 $self->{timer}->start;
3715 } else {
3716 $self->{timer}->stop;
3717 }
3718}
3719
3720sub update_face {
3721 my ($self) = @_;
3722
3723 if ($::CONN) {
3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3725 if ($anim && @$anim) {
3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3735 }
3736 }
3737}
3738
2926sub size_request { 3739sub size_request {
2927 (32, 8) 3740 my ($self) = @_;
3741
3742 if ($::CONN) {
3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3745 if ($tex->{name}) {
3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3747 } elsif (!$tex->{loading}) {
3748 $tex->upload (sub { $self->reconfigure });
3749 }
3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3753 }
3754 }
3755
3756 ($self->{size_w} || 8, $self->{size_h} || 8)
2928} 3757}
2929 3758
2930sub update { 3759sub update {
2931 my ($self) = @_; 3760 my ($self) = @_;
2932 3761
2933 return unless $self->{visible}; 3762 return unless $self->{visible};
2934 3763
2935 $self->SUPER::update; 3764 $self->SUPER::update;
2936} 3765}
2937 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
2938sub _draw { 3775sub _draw {
2939 my ($self) = @_; 3776 my ($self) = @_;
2940 3777
2941 return unless $::CONN; 3778 $self->SUPER::_draw;
2942 3779
2943 my $face; 3780 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; 3781 glEnable GL_TEXTURE_2D;
2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2959 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
2961} 3787}
2962 3788
2963sub destroy { 3789sub destroy {
2964 my ($self) = @_; 3790 my ($self) = @_;
2965 3791
2966 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
2967 if $self->{timer}; 3793 if $self->{timer};
2968 3794
2969 $self->SUPER::destroy; 3795 $self->SUPER::destroy;
2970} 3796}
2971 3797
2972############################################################################# 3798#############################################################################
2973 3799
2974package CFClient::UI::Buttonbar; 3800package CFPlus::UI::Buttonbar;
2975 3801
2976our @ISA = CFClient::UI::HBox::; 3802our @ISA = CFPlus::UI::HBox::;
2977 3803
2978# TODO: should actualyl wrap buttons and other goodies. 3804# TODO: should actually wrap buttons and other goodies.
2979 3805
2980############################################################################# 3806#############################################################################
2981 3807
2982package CFClient::UI::Menu; 3808package CFPlus::UI::Menu;
2983 3809
2984our @ISA = CFClient::UI::FancyFrame::; 3810our @ISA = CFPlus::UI::Toplevel::;
2985 3811
2986use CFClient::OpenGL; 3812use CFPlus::OpenGL;
2987 3813
2988sub new { 3814sub new {
2989 my $class = shift; 3815 my $class = shift;
2990 3816
2991 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
2992 items => [], 3818 items => [],
2993 z => 100, 3819 z => 100,
2994 @_, 3820 @_,
2995 ); 3821 );
2996 3822
2997 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3823 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998 3824
2999 for my $item (@{ $self->{items} }) { 3825 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3826 my ($widget, $cb, $tooltip) = @$item;
3001 3827
3002 # handle various types of items, only text for now 3828 # handle various types of items, only text for now
3003 if (!ref $widget) { 3829 if (!ref $widget) {
3830 if ($widget =~ /\t/) {
3831 my ($left, $right) = split /\t/, $widget, 2;
3832
3004 $widget = new CFClient::UI::Label 3833 $widget = new CFPlus::UI::HBox
3005 can_hover => 1, 3834 can_hover => 1,
3006 can_events => 1, 3835 can_events => 1,
3836 tooltip => $tooltip,
3837 children => [
3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3839 (new CFPlus::UI::Label markup => $right, align => +1),
3840 ],
3841 ;
3842
3843 } else {
3844 $widget = new CFPlus::UI::Label
3845 can_hover => 1,
3846 can_events => 1,
3007 markup => $widget, 3847 markup => $widget,
3008 tooltip => $tooltip 3848 tooltip => $tooltip;
3849 }
3009 } 3850 }
3010 3851
3011 $self->{item}{$widget} = $item; 3852 $self->{item}{$widget} = $item;
3012 3853
3013 $self->{vbox}->add ($widget); 3854 $self->{vbox}->add ($widget);
… …
3056 1 3897 1
3057} 3898}
3058 3899
3059############################################################################# 3900#############################################################################
3060 3901
3061package CFClient::UI::Multiplexer; 3902package CFPlus::UI::Multiplexer;
3062 3903
3063our @ISA = CFClient::UI::Container::; 3904our @ISA = CFPlus::UI::Container::;
3064 3905
3065sub new { 3906sub new {
3066 my $class = shift; 3907 my $class = shift;
3067 3908
3068 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
… …
3082 3923
3083 $self->{current} = $self->{children}[0] 3924 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3925 if @{ $self->{children} };
3085} 3926}
3086 3927
3928sub get_current_page {
3929 my ($self) = @_;
3930
3931 $self->{current}
3932}
3933
3087sub set_current_page { 3934sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3935 my ($self, $page_or_widget) = @_;
3089 3936
3090 my $widget = ref $page_or_widget 3937 my $widget = ref $page_or_widget
3091 ? $page_or_widget 3938 ? $page_or_widget
… …
3123 $self->{current}->draw; 3970 $self->{current}->draw;
3124} 3971}
3125 3972
3126############################################################################# 3973#############################################################################
3127 3974
3128package CFClient::UI::Notebook; 3975package CFPlus::UI::Notebook;
3129 3976
3977use CFPlus::OpenGL;
3978
3130our @ISA = CFClient::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3131 3980
3132sub new { 3981sub new {
3133 my $class = shift; 3982 my $class = shift;
3134 3983
3135 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3138 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3139 @_, 3989 @_,
3140 ); 3990 );
3141 3991
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3145 $self 4029 $self
3146} 4030}
3147 4031
3148sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3149 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3150 4051
3151 Scalar::Util::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3152 4054
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); 4055 $self->add ($widget);
4056}
4057
4058sub get_current_page {
4059 my ($self) = @_;
4060
4061 $self->{multiplexer}->get_current_page
3160} 4062}
3161 4063
3162sub set_current_page { 4064sub set_current_page {
3163 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3164 4066
3165 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
3167} 4069}
3168 4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
4089}
4090
3169############################################################################# 4091#############################################################################
3170 4092
3171package CFClient::UI::Combobox; 4093package CFPlus::UI::Selector;
3172 4094
3173use utf8; 4095use utf8;
3174 4096
3175our @ISA = CFClient::UI::Button::; 4097our @ISA = CFPlus::UI::Button::;
3176 4098
3177sub new { 4099sub new {
3178 my $class = shift; 4100 my $class = shift;
3179 4101
3180 my $self = $class->SUPER::new ( 4102 my $self = $class->SUPER::new (
… …
3197 my ($value, $title, $tooltip) = @$_; 4119 my ($value, $title, $tooltip) = @$_;
3198 4120
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4121 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 } 4122 }
3201 4123
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4124 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203} 4125}
3204 4126
3205sub _set_value { 4127sub _set_value {
3206 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3207 4129
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3209 or return; 4132 or return;
3210 4133
3211 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]); 4136# $self->set_tooltip ($item->[2]);
3214} 4137}
3215 4138
3216sub set_value { 4139sub set_value {
3217 my ($self, $value) = @_; 4140 my ($self, $value) = @_;
3218 4141
… …
3220 4143
3221 $self->_set_value ($value); 4144 $self->_set_value ($value);
3222 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
3223} 4146}
3224 4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
4153}
4154
3225############################################################################# 4155#############################################################################
3226 4156
3227package CFClient::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
3228 4158
3229our @ISA = CFClient::UI::VBox::; 4159our @ISA = CFPlus::UI::VBox::;
3230 4160
3231sub new { 4161sub new {
3232 my $class = shift; 4162 my $class = shift;
3233 4163
3234 my $self = $class->SUPER::new ( 4164 my $self = $class->SUPER::new (
3235 fontsize => 0.8, 4165 fontsize => 0.8,
3236 @_, 4166 @_,
3237 ); 4167 );
3238 4168
3239 Scalar::Util::weaken (my $this = $self); 4169 CFPlus::weaken (my $this = $self);
3240 4170
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4171 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242 4172
3243 $self 4173 $self
3244} 4174}
… …
3246sub reorder { 4176sub reorder {
3247 my ($self) = @_; 4177 my ($self) = @_;
3248 my $NOW = Time::HiRes::time; 4178 my $NOW = Time::HiRes::time;
3249 4179
3250 # freeze display when hovering over any label 4180 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner} 4181 return if $CFPlus::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4182 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} }; 4183 values %{ $self->{item} };
3254 4184
3255 while (my ($k, $v) = each %{ $self->{item} }) { 4185 while (my ($k, $v) = each %{ $self->{item} }) {
3256 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4186 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257 } 4187 }
… …
3278 for ($short) { 4208 for ($short) {
3279 s/^\s+//; 4209 s/^\s+//;
3280 s/\s+/ /g; 4210 s/\s+/ /g;
3281 } 4211 }
3282 4212
3283 new CFClient::UI::Label 4213 new CFPlus::UI::Label
3284 markup => $short, 4214 markup => $short,
3285 tooltip => $item->{tooltip}, 4215 tooltip => $item->{tooltip},
3286 tooltip_font => $::FONT_PROP, 4216 tooltip_font => $::FONT_PROP,
3287 tooltip_width => 0.67, 4217 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize}, 4218 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 count => 1, 4272 count => 1,
3343 %arg, 4273 %arg,
3344 }; 4274 };
3345 } 4275 }
3346 4276
4277 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 4278 $self->reorder;
4279 });
3348} 4280}
3349 4281
3350sub reconfigure { 4282sub reconfigure {
3351 my ($self) = @_; 4283 my ($self) = @_;
3352 4284
… …
3365 $self->SUPER::destroy; 4297 $self->SUPER::destroy;
3366} 4298}
3367 4299
3368############################################################################# 4300#############################################################################
3369 4301
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; 4302package CFPlus::UI::Root;
3733 4303
3734our @ISA = CFClient::UI::Container::; 4304our @ISA = CFPlus::UI::Container::;
3735 4305
3736use List::Util qw(min max); 4306use List::Util qw(min max);
3737 4307
3738use CFClient::OpenGL; 4308use CFPlus::OpenGL;
3739 4309
3740sub new { 4310sub new {
3741 my $class = shift; 4311 my $class = shift;
3742 4312
3743 my $self = $class->SUPER::new ( 4313 my $self = $class->SUPER::new (
3744 visible => 1, 4314 visible => 1,
3745 @_, 4315 @_,
3746 ); 4316 );
3747 4317
3748 Scalar::Util::weaken ($self->{root} = $self); 4318 CFPlus::weaken ($self->{root} = $self);
3749 4319
3750 $self 4320 $self
3751} 4321}
3752 4322
3753sub size_request { 4323sub size_request {
… …
3801} 4371}
3802 4372
3803sub update { 4373sub update {
3804 my ($self) = @_; 4374 my ($self) = @_;
3805 4375
3806 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
3807} 4377}
3808 4378
3809sub add { 4379sub add {
3810 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
3811 4381
… …
3848 while ($self->{refresh_hook}) { 4418 while ($self->{refresh_hook}) {
3849 $_->() 4419 $_->()
3850 for values %{delete $self->{refresh_hook}}; 4420 for values %{delete $self->{refresh_hook}};
3851 } 4421 }
3852 4422
3853 if ($self->{realloc}) { 4423 while ($self->{realloc}) {
3854 my %queue; 4424 my %queue;
3855 my @queue; 4425 my @queue;
3856 my $widget; 4426 my $widget;
3857 4427
3858 outer: 4428 outer:
… …
3905 } 4475 }
3906 } 4476 }
3907 4477
3908 delete $self->{realloc}{$widget+0}; 4478 delete $self->{realloc}{$widget+0};
3909 } 4479 }
3910 }
3911 4480
3912 while (my $size_alloc = delete $self->{size_alloc}) { 4481 while (my $size_alloc = delete $self->{size_alloc}) {
3913 my @queue = sort { $b->{visible} <=> $a->{visible} } 4482 my @queue = sort { $a->{visible} <=> $b->{visible} }
3914 values %$size_alloc; 4483 values %$size_alloc;
3915 4484
3916 while () { 4485 while () {
3917 my $widget = pop @queue || last; 4486 my $widget = pop @queue || last;
3918 4487
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4488 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 4489
3921 $w = 0 if $w < 0; 4490 $w = max $widget->{min_w}, $w;
3922 $h = 0 if $h < 0; 4491 $h = max $widget->{min_h}, $h;
3923 4492
4493# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4494# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4495
4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4498
3924 $w = int $w + 0.5; 4499 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 4500 $h = int $h + 0.5;
3926 4501
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4502 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w}; 4503 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h}; 4504 $widget->{old_h} = $widget->{h};
3930 4505
3931 $widget->{w} = $w; 4506 $widget->{w} = $w;
3932 $widget->{h} = $h; 4507 $widget->{h} = $h;
3933 4508
3934 $widget->emit (size_allocate => $w, $h); 4509 $widget->emit (size_allocate => $w, $h);
4510 }
3935 } 4511 }
3936 } 4512 }
3937 } 4513 }
3938 4514
3939 while ($self->{post_alloc_hook}) { 4515 while ($self->{post_alloc_hook}) {
3940 $_->() 4516 $_->()
3941 for values %{delete $self->{post_alloc_hook}}; 4517 for values %{delete $self->{post_alloc_hook}};
3942 } 4518 }
3943
3944 4519
3945 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4520 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4521 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3947 glClear GL_COLOR_BUFFER_BIT; 4522 glClear GL_COLOR_BUFFER_BIT;
3948 4523
… …
3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4526 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952 glMatrixMode GL_MODELVIEW; 4527 glMatrixMode GL_MODELVIEW;
3953 glLoadIdentity; 4528 glLoadIdentity;
3954 4529
3955 { 4530 {
3956 package CFClient::UI::Base; 4531 package CFPlus::UI::Base;
3957 4532
3958 ($draw_x, $draw_y, $draw_w, $draw_h) = 4533 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h}); 4534 (0, 0, $self->{w}, $self->{h});
3960 }
3961 4535
3962 $self->_draw; 4536 $self->_draw;
4537 }
3963} 4538}
3964 4539
3965############################################################################# 4540#############################################################################
3966 4541
3967package CFClient::UI; 4542package CFPlus::UI;
3968 4543
3969$ROOT = new CFClient::UI::Root; 4544$ROOT = new CFPlus::UI::Root;
3970$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4545$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971 4546
39721 45471
3973 4548

Diff Legend

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