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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

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

Diff Legend

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