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

Diff Legend

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