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

Diff Legend

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