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

Diff Legend

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