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

Diff Legend

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