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.269 by root, Fri Jun 2 06:22:55 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;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1238
1054sub new { 1239sub new {
1055 my ($class, %arg) = @_; 1240 my ($class, %arg) = @_;
1056 1241
1057 my $title = delete $arg{title}; 1242 if ((exists $arg{label}) && !ref $arg{label}) {
1243 $arg{label} = new CFPlus::UI::Label
1244 align => 1,
1245 valign => 0,
1246 text => $arg{label},
1247 fontsize => ($arg{border} || 0.8) * 0.75;
1248 }
1249
1250 my $self = $class->SUPER::new (
1251 # label => "",
1252 fg => [0.6, 0.3, 0.1],
1253 border => 0.8,
1254 style => 'single',
1255 %arg,
1256 );
1257
1258 $self
1259}
1260
1261sub add {
1262 my ($self, @widgets) = @_;
1263
1264 $self->SUPER::add (@widgets);
1265 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1266}
1267
1268sub border {
1269 int $_[0]{border} * $::FONTSIZE
1270}
1271
1272sub size_request {
1273 my ($self) = @_;
1274
1275 ($self->{label_w}, undef) = $self->{label}->size_request
1276 if $self->{label};
1277
1278 my ($w, $h) = $self->SUPER::size_request;
1279
1280 (
1281 $w + $self->border * 2,
1282 $h + $self->border * 2,
1283 )
1284}
1285
1286sub invoke_size_allocate {
1287 my ($self, $w, $h) = @_;
1288
1289 my $border = $self->border;
1290
1291 $w -= List::Util::max 0, $border * 2;
1292 $h -= List::Util::max 0, $border * 2;
1293
1294 if (my $label = $self->{label}) {
1295 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1296 $label->{h} = List::Util::min $h, $border;
1297 $label->invoke_size_allocate ($label->{w}, $label->{h});
1298 }
1299
1300 $self->child->configure ($border, $border, $w, $h);
1301
1302 1
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 my $child = $self->{children}[0];
1309
1310 my $border = $self->border;
1311 my ($w, $h) = ($self->{w}, $self->{h});
1312
1313 $child->draw;
1314
1315 glColor @{$self->{fg}};
1316 glBegin GL_LINE_STRIP;
1317 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1318 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1320 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1322 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1323 glEnd;
1324
1325 if ($self->{label}) {
1326 glTranslate $border * 2, 0;
1327 $self->{label}->_draw;
1328 }
1329}
1330
1331#############################################################################
1332
1333package CFPlus::UI::Toplevel;
1334
1335our @ISA = CFPlus::UI::Bin::;
1336
1337use CFPlus::OpenGL;
1338
1339my $bg =
1340 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1341 mipmap => 1, wrap => 1;
1342
1343my @border =
1344 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1345 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1346
1347my @icon =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1349 qw(x1_move.png x1_resize.png);
1350
1351sub new {
1352 my ($class, %arg) = @_;
1058 1353
1059 my $self = $class->SUPER::new ( 1354 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1355 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1356 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1357 border => 0.6,
1063 can_events => 1, 1358 can_events => 1,
1064 min_w => 16, 1359 min_w => 64,
1065 min_h => 16, 1360 min_h => 32,
1066 %arg, 1361 %arg,
1067 ); 1362 );
1068 1363
1069 $self->{title} = new CFClient::UI::Label 1364 $self->{title_widget} = new CFPlus::UI::Label
1070 align => 0, 1365 align => 0,
1071 valign => 1, 1366 valign => 1,
1072 text => $title, 1367 text => $self->{title},
1073 fontsize => $self->{border} 1368 fontsize => $self->{border},
1074 if defined $title; 1369 if exists $self->{title};
1370
1371 if ($self->{has_close_button}) {
1372 $self->{close_button} =
1373 new CFPlus::UI::ImageButton
1374 path => 'x1_close.png',
1375 on_activate => sub { $self->emit ("delete") };
1376
1377 $self->CFPlus::UI::Container::add ($self->{close_button});
1378 }
1075 1379
1076 $self 1380 $self
1077} 1381}
1078 1382
1079sub add { 1383sub add {
1080 my ($self, @widgets) = @_; 1384 my ($self, @widgets) = @_;
1081 1385
1082 $self->SUPER::add (@widgets); 1386 $self->SUPER::add (@widgets);
1387 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1388 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1389}
1085 1390
1086sub border { 1391sub border {
1087 int $_[0]{border} * $::FONTSIZE 1392 int $_[0]{border} * $::FONTSIZE
1088} 1393}
1089 1394
1090sub size_request { 1395sub size_request {
1091 my ($self) = @_; 1396 my ($self) = @_;
1092 1397
1093 $self->{title}->size_request 1398 $self->{title_widget}->size_request
1094 if $self->{title}; 1399 if $self->{title_widget};
1400
1401 $self->{close_button}->size_request
1402 if $self->{close_button};
1095 1403
1096 my ($w, $h) = $self->SUPER::size_request; 1404 my ($w, $h) = $self->SUPER::size_request;
1097 1405
1098 ( 1406 (
1099 $w + $self->border * 2, 1407 $w + $self->border * 2,
1100 $h + $self->border * 2, 1408 $h + $self->border * 2,
1101 ) 1409 )
1102} 1410}
1103 1411
1104sub size_allocate { 1412sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1106 1414
1107 if ($self->{title}) { 1415 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1416 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1417 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1418 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1419 }
1112 1420
1113 my $border = $self->border; 1421 my $border = $self->border;
1114 1422
1115 $h -= List::Util::max 0, $border * 2; 1423 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1424 $w -= List::Util::max 0, $border * 2;
1425
1426 $self->child->configure ($border, $border, $w, $h);
1427
1428 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1429 if $self->{close_button};
1430
1431 1
1432}
1433
1434sub invoke_delete {
1435 my ($self) = @_;
1436
1437 $self->hide;
1117 1438
1118 $self->child->configure ($border, $border, $w, $h); 1439 1
1119} 1440}
1120 1441
1121sub button_down { 1442sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1123 1444
1124 my ($w, $h) = @$self{qw(w h)}; 1445 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1446 my $border = $self->border;
1126 1447
… …
1142 my $dy = $ev->{y} - $oy; 1463 my $dy = $ev->{y} - $oy;
1143 1464
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1465 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1466 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1467
1468 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1469 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1470 };
1150 1471
1151 } elsif ($lr ^ $td) { 1472 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1473 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1474 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1477 my ($ev, $x, $y) = @_;
1157 1478
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1479 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1480
1160 $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});
1161 }; 1484 };
1485 } else {
1486 return 0;
1487 }
1488
1162 } 1489 1
1163} 1490}
1164 1491
1165sub button_up { 1492sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
1167 1494
1168 delete $self->{motion}; 1495 ! ! delete $self->{motion}
1169} 1496}
1170 1497
1171sub mouse_motion { 1498sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
1173 1500
1174 $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
1175} 1512}
1176 1513
1177sub _draw { 1514sub _draw {
1178 my ($self) = @_; 1515 my ($self) = @_;
1179 1516
… …
1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1187 1524
1188 my $border = $self->border; 1525 my $border = $self->border;
1189 1526
1190 glColor @{ $self->{border_bg} }; 1527 glColor @{ $self->{border_bg} };
1191 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1528 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1529 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1530 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1194 $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);
1195 1546
1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1547 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1197 glColor @{ $self->{bg} }; 1548 glColor @{ $self->{bg} };
1198 1549
1199 # TODO: repeat texture not scale 1550 # TODO: repeat texture not scale
… …
1205 1556
1206 glDisable GL_TEXTURE_2D; 1557 glDisable GL_TEXTURE_2D;
1207 1558
1208 $child->draw; 1559 $child->draw;
1209 1560
1210 if ($self->{title}) { 1561 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1562 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1563 $self->{title_widget}->_draw;
1564
1565 glTranslate 0, - ($border - $self->{h});
1213 } 1566 }
1567
1568 $self->{close_button}->draw
1569 if $self->{close_button};
1214} 1570}
1215 1571
1216############################################################################# 1572#############################################################################
1217 1573
1218package CFClient::UI::Table; 1574package CFPlus::UI::Table;
1219 1575
1220our @ISA = CFClient::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
1221 1577
1222use List::Util qw(max sum); 1578use List::Util qw(max sum);
1223 1579
1224use CFClient::OpenGL; 1580use CFPlus::OpenGL;
1225 1581
1226sub new { 1582sub new {
1227 my $class = shift; 1583 my $class = shift;
1228 1584
1229 $class->SUPER::new ( 1585 $class->SUPER::new (
1230 col_expand => [], 1586 col_expand => [],
1587 row_expand => [],
1231 @_, 1588 @_,
1232 ) 1589 )
1233} 1590}
1234 1591
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237}
1238
1239sub add { 1592sub add {
1240 my ($self, $x, $y, $child) = @_;
1241
1242 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child;
1244
1245 $self->realloc;
1246}
1247
1248# TODO: move to container class maybe? send children a signal on removal?
1249sub clear {
1250 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);
1251 1624
1252 my @children = $self->children; 1625 my @children = $self->children;
1253 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 }
1254 1636 }
1255 for (@children) {
1256 delete $_->{parent};
1257 $_->hide;
1258 }
1259 1637
1260 $self->realloc; 1638 # second pass, rows
1261} 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1262
1263sub get_wh {
1264 my ($self) = @_;
1265
1266 my (@w, @h);
1267
1268 for my $y (0 .. $#{$self->{children}}) {
1269 my $row = $self->{children}[$y]
1270 or next;
1271
1272 for my $x (0 .. $#$row) {
1273 my $widget = $row->[$x]
1274 or next;
1275 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1276 1641
1277 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1278 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1279 } 1646 }
1280 } 1647 }
1281 1648
1282 (\@w, \@h) 1649 (\@w, \@h)
1283} 1650}
… …
1291 (sum @$ws), 1658 (sum @$ws),
1292 (sum @$hs), 1659 (sum @$hs),
1293 ) 1660 )
1294} 1661}
1295 1662
1296sub size_allocate { 1663sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1298 1665
1299 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1300 1667
1301 my $req_w = (sum @$ws) || 1; 1668 my $req_w = (sum @$ws) || 1;
1302 my $req_h = (sum @$hs) || 1; 1669 my $req_h = (sum @$hs) || 1;
1303 1670
1304 # TODO: nicer code && do row_expand 1671 # now linearly scale the rows/columns to the allocated size
1305 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1306 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1307 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1308 1675
1309 # linearly scale sizes
1310 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312 1677
1313 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
1314 CFClient::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1315 1687
1316 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1317 1690
1318 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1319 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)};
1320 or next;
1321 1693
1322 my $x = 0; 1694 $widget->configure (
1323 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1324 1697 );
1325 for my $c (0 .. $#$row) { 1698 }
1326 my $col_w = $ws->[$c];
1327 1699
1328 if (my $widget = $row->[$c]) { 1700 1
1329 $widget->configure ($x, $y, $col_w, $row_h); 1701}
1330 }
1331 1702
1332 $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};
1333 } 1730 }
1334
1335 $y += $row_h;
1336 } 1731 }
1337 1732
1338} 1733 my $W = $x2 - $x1;
1734 my $H = $y2 - $y1;
1339 1735
1340sub 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 {
1341 my ($self, $x, $y) = @_; 1754 my ($self, $W, $H) = @_;
1342 1755
1343 $x -= $self->{x}; 1756 for my $child ($self->visible_children) {
1344 $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;
1345 1759
1346 my $res; 1760 $x += $child->{c_halign} * $child->{req_w};
1761 $y += $child->{c_valign} * $child->{req_h};
1347 1762
1348 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1349 $res = $_->find_widget ($x, $y) 1764 }
1350 and return $res; 1765
1351 } 1766 1
1352
1353 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1354}
1355
1356sub _draw {
1357 my ($self) = @_;
1358
1359 for (grep $_, @{$self->{children}}) {
1360 $_->draw for grep $_, @$_;
1361 }
1362} 1767}
1363 1768
1364############################################################################# 1769#############################################################################
1365 1770
1366package CFClient::UI::Box; 1771package CFPlus::UI::Box;
1367 1772
1368our @ISA = CFClient::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1369 1774
1370sub size_request { 1775sub size_request {
1371 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1372 1779
1373 $self->{vertical} 1780 $self->{vertical}
1374 ? ( 1781 ? (
1375 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1377 ) 1784 )
1378 : ( 1785 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1381 ) 1788 )
1382} 1789}
1383 1790
1384sub size_allocate { 1791sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
1386 1793
1387 my $space = $self->{vertical} ? $h : $w; 1794 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1795 my @children = $self->visible_children;
1389 1796
1390 my @req; 1797 my @req;
1391 1798
1392 if ($self->{homogeneous}) { 1799 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1800 @req = ($space / (@children || 1)) x @children;
1394 } else { 1801 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1802 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1803 my $req = List::Util::sum @req;
1397 1804
1398 if ($req > $space) { 1805 if ($req > $space) {
1399 # ah well, not enough space 1806 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1807 $_ *= $space / $req for @req;
1401 } else { 1808 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1809 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1810
1404 $space = ($space - $req) / $expand; # remaining space to give away 1811 $space = ($space - $req) / $expand; # remaining space to give away
1405 1812
1406 $req[$_] += $space * $children->[$_]{expand} 1813 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1814 for 0 .. $#children;
1408 } 1815 }
1409 } 1816 }
1410 1817
1411 CFClient::UI::harmonize \@req; 1818 CFPlus::UI::harmonize \@req;
1412 1819
1413 my $pos = 0; 1820 my $pos = 0;
1414 for (0 .. $#$children) { 1821 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1822 my $alloc = $req[$_];
1416 $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));
1417 1824
1418 $pos += $alloc; 1825 $pos += $alloc;
1419 } 1826 }
1420 1827
1421 1 1828 1
1422} 1829}
1423 1830
1424############################################################################# 1831#############################################################################
1425 1832
1426package CFClient::UI::HBox; 1833package CFPlus::UI::HBox;
1427 1834
1428our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1429 1836
1430sub new { 1837sub new {
1431 my $class = shift; 1838 my $class = shift;
1432 1839
1433 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1436 ) 1843 )
1437} 1844}
1438 1845
1439############################################################################# 1846#############################################################################
1440 1847
1441package CFClient::UI::VBox; 1848package CFPlus::UI::VBox;
1442 1849
1443our @ISA = CFClient::UI::Box::; 1850our @ISA = CFPlus::UI::Box::;
1444 1851
1445sub new { 1852sub new {
1446 my $class = shift; 1853 my $class = shift;
1447 1854
1448 $class->SUPER::new ( 1855 $class->SUPER::new (
… …
1451 ) 1858 )
1452} 1859}
1453 1860
1454############################################################################# 1861#############################################################################
1455 1862
1456package CFClient::UI::Label; 1863package CFPlus::UI::Label;
1457 1864
1458our @ISA = CFClient::UI::DrawBG::; 1865our @ISA = CFPlus::UI::DrawBG::;
1459 1866
1460use CFClient::OpenGL; 1867use CFPlus::OpenGL;
1461 1868
1462sub new { 1869sub new {
1463 my ($class, %arg) = @_; 1870 my ($class, %arg) = @_;
1464 1871
1465 my $self = $class->SUPER::new ( 1872 my $self = $class->SUPER::new (
… …
1468 #active_bg => none 1875 #active_bg => none
1469 #font => default_font 1876 #font => default_font
1470 #text => initial text 1877 #text => initial text
1471 #markup => initial narkup 1878 #markup => initial narkup
1472 #max_w => maximum pixel width 1879 #max_w => maximum pixel width
1880 #style => 0, # render flags
1473 ellipsise => 3, # end 1881 ellipsise => 3, # end
1474 layout => (new CFClient::Layout), 1882 layout => (new CFPlus::Layout),
1475 fontsize => 1, 1883 fontsize => 1,
1476 align => -1, 1884 align => -1,
1477 valign => -1, 1885 valign => -1,
1478 padding_x => 2, 1886 padding_x => 2,
1479 padding_y => 2, 1887 padding_y => 2,
1480 can_events => 0, 1888 can_events => 0,
1481 %arg 1889 %arg
1482 ); 1890 );
1483 1891
1484 if (exists $self->{template}) { 1892 if (exists $self->{template}) {
1485 my $layout = new CFClient::Layout; 1893 my $layout = new CFPlus::Layout;
1486 $layout->set_text (delete $self->{template}); 1894 $layout->set_text (delete $self->{template});
1487 $self->{template} = $layout; 1895 $self->{template} = $layout;
1488 } 1896 }
1489 1897
1490 if (exists $self->{markup}) { 1898 if (exists $self->{markup}) {
… …
1494 } 1902 }
1495 1903
1496 $self 1904 $self
1497} 1905}
1498 1906
1499sub escape($) {
1500 local $_ = $_[0];
1501
1502 s/&/&amp;/g;
1503 s/>/&gt;/g;
1504 s/</&lt;/g;
1505
1506 $_
1507}
1508
1509sub update { 1907sub update {
1510 my ($self) = @_; 1908 my ($self) = @_;
1511 1909
1512 delete $self->{texture}; 1910 delete $self->{texture};
1513 $self->SUPER::update; 1911 $self->SUPER::update;
1514} 1912}
1515 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
1516sub set_text { 1927sub set_text {
1517 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1518 1929
1519 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
1521 1932
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1933 $self->{layout}->set_text ($text);
1524 1934
1935 delete $self->{size_req};
1525 $self->realloc; 1936 $self->realloc;
1526 $self->update; 1937 $self->update;
1527} 1938}
1528 1939
1529sub set_markup { 1940sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1943 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1944 $self->{text} = "M$markup";
1534 1945
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1946 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1947
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1948 $self->{layout}->set_markup ($markup);
1539 1949
1950 delete $self->{size_req};
1540 $self->realloc; 1951 $self->realloc;
1541 $self->update; 1952 $self->update;
1542} 1953}
1543 1954
1544sub size_request { 1955sub size_request {
1545 my ($self) = @_; 1956 my ($self) = @_;
1546 1957
1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1966
1553 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
1554 1968
1555 if (exists $self->{template}) { 1969 if (exists $self->{template}) {
1556 $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);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1973
1559 my ($w2, $h2) = $self->{template}->size; 1974 my ($w2, $h2) = $self->{template}->size;
1560 1975
1561 $w = List::Util::max $w, $w2; 1976 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1977 $h = List::Util::max $h, $h2;
1978 }
1979
1980 [$w, $h]
1563 } 1981 };
1564 1982
1565 ($w, $h) 1983 @{ $self->{size_req} }
1566} 1984}
1567 1985
1986sub baseline_shift {
1987 $_[0]{layout}->descent
1988}
1989
1568sub size_allocate { 1990sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1991 my ($self, $w, $h) = @_;
1570 1992
1571 delete $self->{ox}; 1993 delete $self->{ox};
1572 1994
1573 delete $self->{texture} 1995 delete $self->{texture}
1574 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
1575} 1999}
1576 2000
1577sub set_fontsize { 2001sub set_fontsize {
1578 my ($self, $fontsize) = @_; 2002 my ($self, $fontsize) = @_;
1579 2003
1580 $self->{fontsize} = $fontsize; 2004 $self->{fontsize} = $fontsize;
2005 delete $self->{size_req};
1581 delete $self->{texture}; 2006 delete $self->{texture};
1582 2007
1583 $self->realloc; 2008 $self->realloc;
1584} 2009}
1585 2010
2011sub reconfigure {
2012 my ($self) = @_;
2013
2014 delete $self->{size_req};
2015 delete $self->{texture};
2016
2017 $self->SUPER::reconfigure;
2018}
2019
1586sub _draw { 2020sub _draw {
1587 my ($self) = @_; 2021 my ($self) = @_;
1588 2022
1589 $self->SUPER::_draw; # draw background, if applicable 2023 $self->SUPER::_draw; # draw background, if applicable
1590 2024
1591 my $tex = $self->{texture} ||= do { 2025 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 2026 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 2028 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2032
1599 new_from_layout CFClient::Texture $self->{layout} 2033 [$self->{layout}->size]
1600 }; 2034 };
1601 2035
1602 unless (exists $self->{ox}) { 2036 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2037 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2038 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
1606 2040
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1610 }; 2046 };
1611 2047
1612 glEnable GL_TEXTURE_2D; 2048# unless ($self->{list}) {
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
1614 2050# CFPlus::OpenGL::glNewList $self->{list};
1615 if ($tex->{format} == GL_ALPHA) { 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1616 glColor @{$self->{fg}}; 2052# CFPlus::OpenGL::glEndList;
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 } 2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
1621 2056
1622 glDisable GL_TEXTURE_2D; 2057 $self->{layout}->draw;
1623} 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#}
1624 2067
1625############################################################################# 2068#############################################################################
1626 2069
1627package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1628 2071
1629our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1630 2073
1631use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1632 2075
1633sub new { 2076sub new {
1634 my $class = shift; 2077 my $class = shift;
1635 2078
1636 $class->SUPER::new ( 2079 $class->SUPER::new (
1637 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1638 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
1639 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
1640 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
1641 can_hover => 1, 2086 can_hover => 1,
1642 can_focus => 1, 2087 can_focus => 1,
1643 valign => 0, 2088 valign => 0,
1644 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1645 #text => ... 2091 #text => ...
2092 #hidden => "*",
1646 @_ 2093 @_
1647 ) 2094 )
1648} 2095}
1649 2096
1650sub _set_text { 2097sub _set_text {
… …
1652 2099
1653 delete $self->{cur_h}; 2100 delete $self->{cur_h};
1654 2101
1655 return if $self->{text} eq $text; 2102 return if $self->{text} eq $text;
1656 2103
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 2104 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 2105 $self->{text} = $text;
1661 2106
1662 $text =~ s/./*/g if $self->{hidden}; 2107 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 2108 $self->{layout}->set_text ("$text ");
2109 delete $self->{size_req};
1664 2110
1665 $self->_emit (changed => $self->{text}); 2111 $self->emit (changed => $self->{text});
2112
2113 $self->realloc;
2114 $self->update;
1666} 2115}
1667 2116
1668sub set_text { 2117sub set_text {
1669 my ($self, $text) = @_; 2118 my ($self, $text) = @_;
1670 2119
1671 $self->{cursor} = length $text; 2120 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 2121 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 2122}
1676 2123
1677sub get_text { 2124sub get_text {
1678 $_[0]{text} 2125 $_[0]{text}
1679} 2126}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 2131 my ($w, $h) = $self->SUPER::size_request;
1685 2132
1686 ($w + 1, $h) # add 1 for cursor 2133 ($w + 1, $h) # add 1 for cursor
1687} 2134}
1688 2135
1689sub key_down { 2136sub invoke_key_down {
1690 my ($self, $ev) = @_; 2137 my ($self, $ev) = @_;
1691 2138
1692 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1695 2142
1696 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;
1697 2146
1698 if ($uni == 8) { 2147 if ($uni == 8) {
1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1701 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1702 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1703 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1704 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1705 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1706 } 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 = "";
1707 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 2171 $self->emit ('escape');
1712 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
2176 } else {
2177 return 0;
1714 } 2178 }
1715 2179
1716 $self->_set_text ($text); 2180 $self->_set_text ($text);
1717 2181
1718 $self->realloc; 2182 $self->realloc;
1719} 2183 $self->update;
1720 2184
2185 1
2186}
2187
1721sub focus_in { 2188sub invoke_focus_in {
1722 my ($self) = @_; 2189 my ($self) = @_;
1723 2190
1724 $self->{last_activity} = $::NOW; 2191 $self->{last_activity} = $::NOW;
1725 2192
1726 $self->SUPER::focus_in; 2193 $self->SUPER::invoke_focus_in
1727} 2194}
1728 2195
1729sub button_down { 2196sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1731 2198
1732 $self->SUPER::button_down ($ev, $x, $y); 2199 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 2200
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 2201 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 2202
1736 # byte-index to char-index 2203 # byte-index to char-index
1737 my $text = $self->{text}; 2204 my $text = $self->{text};
1738 utf8::encode $text; 2205 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 2206 $self->{cursor} = length $text;
1740 2207
1741 $self->_set_text ($self->{text}); 2208 $self->_set_text ($self->{text});
1742 $self->update; 2209 $self->update;
2210
2211 1
1743} 2212}
1744 2213
1745sub mouse_motion { 2214sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1747# 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
1748} 2219}
1749 2220
1750sub _draw { 2221sub _draw {
1751 my ($self) = @_; 2222 my ($self) = @_;
1752 2223
1753 local $self->{fg} = $self->{fg}; 2224 local $self->{fg} = $self->{fg};
1754 2225
1755 if ($FOCUS == $self) { 2226 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 2227 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 2228 $self->{fg} = $self->{active_fg};
1758 } else { 2229 } else {
1759 glColor @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
1760 } 2231 }
1761 2232
1762 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS;
1765 glVertex 0 , 0;
1766 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0;
1769 glEnd;
1770 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
1771 2237
1772 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
1773 2239
1774 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
1776 2242
1777 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
1778 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
1779 utf8::encode $text; 2245 utf8::encode $text;
1780 2246
1781 @$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);
1782 } 2248 }
1783 2249
1784 glColor @{$self->{fg}}; 2250 glColor_premultiply @{$self->{active_fg}};
1785 glBegin GL_LINES; 2251 glBegin GL_LINES;
1786 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1787 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};
1788 glEnd; 2254 glEnd;
1789 }
1790}
1791 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
1792package CFClient::UI::Entry; 2274package CFPlus::UI::Entry;
1793 2275
1794our @ISA = CFClient::UI::EntryBase::; 2276our @ISA = CFPlus::UI::EntryBase::;
1795 2277
1796use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1797 2279
1798sub key_down { 2280sub invoke_key_down {
1799 my ($self, $ev) = @_; 2281 my ($self, $ev) = @_;
1800 2282
1801 my $sym = $ev->{sym}; 2283 my $sym = $ev->{sym};
1802 2284
1803 if ($sym == 13) { 2285 if ($ev->{uni} == 0x0d || $sym == 13) {
1804 unshift @{$self->{history}}, 2286 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 2287 my $txt = $self->get_text;
2288
1806 $self->{history_pointer} = -1; 2289 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 2290 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 2291 $self->emit (activate => $txt);
1809 $self->update; 2292 $self->update;
1810 2293
1811 } elsif ($sym == CFClient::SDLK_UP) { 2294 } elsif ($sym == CFPlus::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 2295 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 2296 $self->{history_saveback} = $self->get_text;
1814 } 2297 }
1815 if (@{$self->{history} || []} > 0) { 2298 if (@{$self->{history} || []} > 0) {
1816 $self->{history_pointer}++; 2299 $self->{history_pointer}++;
… …
1818 $self->{history_pointer} = @{$self->{history} || []} - 1; 2301 $self->{history_pointer} = @{$self->{history} || []} - 1;
1819 } 2302 }
1820 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1821 } 2304 }
1822 2305
1823 } elsif ($sym == CFClient::SDLK_DOWN) { 2306 } elsif ($sym == CFPlus::SDLK_DOWN) {
1824 $self->{history_pointer}--; 2307 $self->{history_pointer}--;
1825 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2308 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826 2309
1827 if ($self->{history_pointer} >= 0) { 2310 if ($self->{history_pointer} >= 0) {
1828 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1829 } else { 2312 } else {
1830 $self->set_text ($self->{history_saveback}); 2313 $self->set_text ($self->{history_saveback});
1831 } 2314 }
1832 2315
1833 } else { 2316 } else {
1834 $self->SUPER::key_down ($ev); 2317 return $self->SUPER::invoke_key_down ($ev)
2318 }
2319
1835 } 2320 1
1836
1837} 2321}
1838 2322
1839############################################################################# 2323#############################################################################
1840 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
1841package CFClient::UI::Button; 2364package CFPlus::UI::ButtonBin;
1842 2365
1843our @ISA = CFClient::UI::Label::; 2366our @ISA = CFPlus::UI::Bin::;
1844 2367
1845use CFClient::OpenGL; 2368use CFPlus::OpenGL;
1846 2369
1847my @tex = 2370my @tex =
1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849 qw(b1_button_active.png); 2372 qw(b1_button_inactive.png b1_button_active.png);
1850 2373
1851sub new { 2374sub new {
1852 my $class = shift; 2375 my $class = shift;
1853 2376
1854 $class->SUPER::new ( 2377 $class->SUPER::new (
1855 padding_x => 4,
1856 padding_y => 4,
1857 fg => [1, 1, 1],
1858 active_fg => [0, 0, 1],
1859 can_hover => 1, 2378 can_hover => 1,
1860 align => 0, 2379 align => 0,
1861 valign => 0, 2380 valign => 0,
1862 can_events => 1, 2381 can_events => 1,
1863 @_ 2382 @_
1864 ) 2383 )
1865} 2384}
1866 2385
1867sub activate { }
1868
1869sub button_up { 2386sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2387 my ($self, $ev, $x, $y) = @_;
1871 2388
1872 $self->emit ("activate") 2389 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2390 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
1875} 2394}
1876 2395
1877sub _draw { 2396sub _draw {
1878 my ($self) = @_; 2397 my ($self) = @_;
1879
1880 local $self->{fg} = $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2398
1886 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1889 2402
2403 my $tex = $tex[$GRAB == $self];
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 2405
1892 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1893 2407
1894 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1895} 2409}
1896 2410
1897############################################################################# 2411#############################################################################
1898 2412
1899package CFClient::UI::CheckBox; 2413package CFPlus::UI::Button;
1900 2414
1901our @ISA = CFClient::UI::DrawBG::; 2415our @ISA = CFPlus::UI::Label::;
2416
2417use CFPlus::OpenGL;
1902 2418
1903my @tex = 2419my @tex =
1904 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 }
1905 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906 2475
1907use CFClient::OpenGL; 2476use CFPlus::OpenGL;
1908 2477
1909sub new { 2478sub new {
1910 my $class = shift; 2479 my $class = shift;
1911 2480
1912 $class->SUPER::new ( 2481 $class->SUPER::new (
… …
1926 my ($self) = @_; 2495 my ($self) = @_;
1927 2496
1928 (6) x 2 2497 (6) x 2
1929} 2498}
1930 2499
2500sub toggle {
2501 my ($self) = @_;
2502
2503 $self->{state} = !$self->{state};
2504 $self->emit (changed => $self->{state});
2505 $self->update;
2506}
2507
1931sub button_down { 2508sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
1933 2510
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2511 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2512 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2513 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2514 } else {
2515 return 0
2516 }
2517
1938 } 2518 1
1939} 2519}
1940 2520
1941sub _draw { 2521sub _draw {
1942 my ($self) = @_; 2522 my ($self) = @_;
1943 2523
1944 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
1945 2525
1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1947 2527
1948 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
1949 2529
1950 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;
1951 2531
… …
1958 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
1959} 2539}
1960 2540
1961############################################################################# 2541#############################################################################
1962 2542
1963package CFClient::UI::Image; 2543package CFPlus::UI::Image;
1964 2544
1965our @ISA = CFClient::UI::Base::; 2545our @ISA = CFPlus::UI::Base::;
1966 2546
1967use CFClient::OpenGL; 2547use CFPlus::OpenGL;
1968use Carp qw/confess/;
1969 2548
1970our %loaded_images; 2549our %texture_cache;
1971 2550
1972sub new { 2551sub new {
1973 my $class = shift; 2552 my $class = shift;
1974 2553
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2554 my $self = $class->SUPER::new (
2555 can_events => 0,
2556 scale => 1,
2557 @_,
2558 );
1976 2559
1977 $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";
1978 2562
1979 $loaded_images{$self->{image}} ||= 2563 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 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;
1981 2565
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2566 CFPlus::weaken $texture_cache{$self->{path}};
1983 2567
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2568 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2569
1988 $self 2570 $self
1989} 2571}
1990 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
1991sub size_request { 2588sub size_request {
1992 my ($self) = @_; 2589 my ($self) = @_;
1993 2590
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1995} 2592}
1996 2593
1997sub _draw { 2594sub _draw {
1998 my ($self) = @_; 2595 my ($self) = @_;
1999 2596
… …
2016 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2017} 2614}
2018 2615
2019############################################################################# 2616#############################################################################
2020 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
2021package CFClient::UI::VGauge; 2660package CFPlus::UI::VGauge;
2022 2661
2023our @ISA = CFClient::UI::Base::; 2662our @ISA = CFPlus::UI::Base::;
2024 2663
2025use List::Util qw(min max); 2664use List::Util qw(min max);
2026 2665
2027use CFClient::OpenGL; 2666use CFPlus::OpenGL;
2028 2667
2029my %tex = ( 2668my %tex = (
2030 food => [ 2669 food => [
2031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2671 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033 ], 2672 ],
2034 grace => [ 2673 grace => [
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2036 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/
2037 ], 2676 ],
2038 hp => [ 2677 hp => [
2039 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2678 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2679 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041 ], 2680 ],
2042 mana => [ 2681 mana => [
2043 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2682 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2044 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/
2045 ], 2684 ],
2046); 2685);
2047 2686
2048# eg. VGauge->new (gauge => 'food'), default gauge: food 2687# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2747 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2748 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2749
2111 my $h1 = $self->{h} * (1 - $ycut1); 2750 my $h1 = $self->{h} * (1 - $ycut1);
2112 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);
2113 2755
2114 glEnable GL_BLEND; 2756 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2761
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2762 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2763 glBegin GL_QUADS;
… …
2135 2778
2136 if ($t3) { 2779 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2780 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2781 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2782 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2783 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2784 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2785 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2786 glEnd;
2144 } 2787 }
2145 2788
2146 glDisable GL_BLEND; 2789 glDisable GL_BLEND;
2147 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2148} 2791}
2149 2792
2150############################################################################# 2793#############################################################################
2151 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
2152package CFClient::UI::Gauge; 2933package CFPlus::UI::Gauge;
2153 2934
2154our @ISA = CFClient::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2155 2936
2156sub new { 2937sub new {
2157 my ($class, %arg) = @_; 2938 my ($class, %arg) = @_;
2158 2939
2159 my $self = $class->SUPER::new ( 2940 my $self = $class->SUPER::new (
… …
2161 can_hover => 1, 2942 can_hover => 1,
2162 can_events => 1, 2943 can_events => 1,
2163 %arg, 2944 %arg,
2164 ); 2945 );
2165 2946
2166 $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");
2167 $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);
2168 $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");
2169 2950
2170 $self 2951 $self
2171} 2952}
2172 2953
2173sub set_fontsize { 2954sub set_fontsize {
… …
2194 $self->{value}->set_text ($val); 2975 $self->{value}->set_text ($val);
2195} 2976}
2196 2977
2197############################################################################# 2978#############################################################################
2198 2979
2199package CFClient::UI::Slider; 2980package CFPlus::UI::Slider;
2200 2981
2201use strict; 2982use strict;
2202 2983
2203use CFClient::OpenGL; 2984use CFPlus::OpenGL;
2204 2985
2205our @ISA = CFClient::UI::DrawBG::; 2986our @ISA = CFPlus::UI::DrawBG::;
2206 2987
2207my @tex = 2988my @tex =
2208 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2989 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209 qw(s1_slider.png s1_slider_bg.png); 2990 qw(s1_slider.png s1_slider_bg.png);
2210 2991
2211sub new { 2992sub new {
2212 my $class = shift; 2993 my $class = shift;
2213 2994
… …
2234 $self->update; 3015 $self->update;
2235 3016
2236 $self 3017 $self
2237} 3018}
2238 3019
2239sub changed { }
2240
2241sub set_range { 3020sub set_range {
2242 my ($self, $range) = @_; 3021 my ($self, $range) = @_;
2243 3022
2244 ($range, $self->{range}) = ($self->{range}, $range); 3023 ($range, $self->{range}) = ($self->{range}, $range);
2245 3024
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 3025 if ("@$range" ne "@{$self->{range}}") {
3026 $self->update;
3027 $self->set_value ($self->{range}[0]);
3028 }
2248} 3029}
2249 3030
2250sub set_value { 3031sub set_value {
2251 my ($self, $value) = @_; 3032 my ($self, $value) = @_;
2252 3033
… …
2263 if $unit; 3044 if $unit;
2264 3045
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3046 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 3047
2267 if ($value != $old_value) { 3048 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 3049 $self->emit (changed => $value);
2269 $self->update; 3050 $self->update;
2270 } 3051 }
2271} 3052}
2272 3053
2273sub size_request { 3054sub size_request {
2274 my ($self) = @_; 3055 my ($self) = @_;
2275 3056
2276 ($self->{req_w}, $self->{req_h}) 3057 ($self->{req_w}, $self->{req_h})
2277} 3058}
2278 3059
2279sub button_down { 3060sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 3061 my ($self, $ev, $x, $y) = @_;
2281 3062
2282 $self->SUPER::button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 3064
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 3066
2286 $self->mouse_motion ($ev, $x, $y); 3067 $self->invoke_mouse_motion ($ev, $x, $y);
2287}
2288 3068
3069 1
3070}
3071
2289sub mouse_motion { 3072sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2291 3074
2292 if ($GRAB == $self) { 3075 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3076 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 3077
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3078 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 3079
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3080 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 3081
2299 $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
2300 } 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
2301} 3100}
2302 3101
2303sub update { 3102sub update {
2304 my ($self) = @_; 3103 my ($self) = @_;
2305 3104
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 3113 $self->set_value ($self->{range}[0]);
2308 3114
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3115 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 3116 my $range = ($hi - $page - $lo) || 1e-100;
2311 3117
… …
2317 $value = ($value - $lo) / $range; 3123 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 3124 $value = $value * $self->{scale} + $self->{offset};
2319 3125
2320 $self->{knob_x} = $value - $knob_w * 0.5; 3126 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 3127 $self->{knob_w} = $knob_w;
2322 }); 3128 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 3129
2330 $self->SUPER::_draw (); 3130 $self->SUPER::_draw ();
2331 3131
2332 glScale $self->{w}, $self->{h}; 3132 glScale $self->{w}, $self->{h};
2333 3133
… …
2353 glDisable GL_TEXTURE_2D; 3153 glDisable GL_TEXTURE_2D;
2354} 3154}
2355 3155
2356############################################################################# 3156#############################################################################
2357 3157
2358package CFClient::UI::ValSlider; 3158package CFPlus::UI::ValSlider;
2359 3159
2360our @ISA = CFClient::UI::HBox::; 3160our @ISA = CFPlus::UI::HBox::;
2361 3161
2362sub new { 3162sub new {
2363 my ($class, %arg) = @_; 3163 my ($class, %arg) = @_;
2364 3164
2365 my $range = delete $arg{range}; 3165 my $range = delete $arg{range};
2366 3166
2367 my $self = $class->SUPER::new ( 3167 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3168 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3169 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift }, 3170 to_value => sub { shift },
2371 from_value => sub { shift }, 3171 from_value => sub { shift },
2372 %arg, 3172 %arg,
2373 ); 3173 );
2374 3174
… …
2394sub set_range { shift->{slider}->set_range (@_) } 3194sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 3195sub set_value { shift->{slider}->set_value (@_) }
2396 3196
2397############################################################################# 3197#############################################################################
2398 3198
2399package CFClient::UI::TextView; 3199package CFPlus::UI::TextScroller;
2400 3200
2401our @ISA = CFClient::UI::HBox::; 3201our @ISA = CFPlus::UI::HBox::;
2402 3202
2403use CFClient::OpenGL; 3203use CFPlus::OpenGL;
2404 3204
2405sub new { 3205sub new {
2406 my $class = shift; 3206 my $class = shift;
2407 3207
2408 my $self = $class->SUPER::new ( 3208 my $self = $class->SUPER::new (
2409 fontsize => 1, 3209 fontsize => 1,
2410 can_events => 0, 3210 can_events => 1,
3211 indent => 0,
2411 #font => default_font 3212 #font => default_font
2412 @_, 3213 @_,
2413 3214
2414 layout => (new CFClient::Layout 1), 3215 layout => (new CFPlus::Layout),
2415 par => [], 3216 par => [],
3217 max_par => 0,
2416 height => 0, 3218 height => 0,
2417 children => [ 3219 children => [
2418 (new CFClient::UI::Empty expand => 1), 3220 (new CFPlus::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 3221 (new CFPlus::UI::Slider vertical => 1),
2420 ], 3222 ],
2421 ); 3223 );
2422 3224
2423 $self->{children}[1]->connect (changed => sub { $self->update }); 3225 $self->{children}[1]->connect (changed => sub { $self->update });
2424 3226
… …
2430 3232
2431 $self->{fontsize} = $fontsize; 3233 $self->{fontsize} = $fontsize;
2432 $self->reflow; 3234 $self->reflow;
2433} 3235}
2434 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
2435sub size_allocate { 3246sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 3247 my ($self, $w, $h) = @_;
2437 3248
2438 $self->SUPER::size_allocate ($w, $h); 3249 my ($empty, $slider, @other) = @{ $self->{children} };
3250 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 3251
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3252 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3253 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $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});
2443 3256
2444 $self->reflow; 3257 $self->reflow;
2445}
2446 3258
2447sub text_size { 3259 local $self->{children} = [$empty, $slider];
3260 $self->SUPER::invoke_size_allocate ($w, $h)
3261}
3262
3263sub invoke_mouse_wheel {
2448 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) = @_;
2449 3275
2450 my $layout = $self->{layout}; 3276 my $layout = $self->{layout};
2451 3277
3278 $layout->set_font ($self->{font}) if $self->{font};
3279 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3280 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $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});
2454 $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}}
2455 3289 );
3290
2456 $layout->size 3291 $layout
2457} 3292}
2458 3293
2459sub reflow { 3294sub reflow {
2460 my ($self) = @_; 3295 my ($self) = @_;
2461 3296
… …
2468 3303
2469 # todo: base offset on lines or so, not on pixels 3304 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset); 3305 $self->{children}[1]->set_value ($offset);
2471} 3306}
2472 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
2473sub clear { 3323sub clear {
2474 my ($self) = @_; 3324 my ($self) = @_;
3325
3326 my (undef, undef, @other) = @{ $self->{children} };
3327 $self->remove ($_) for @other;
2475 3328
2476 $self->{par} = []; 3329 $self->{par} = [];
2477 $self->{height} = 0; 3330 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3331 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 3332}
2480 3333
2481sub add_paragraph { 3334sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 3335 my $self = shift;
2483 3336
2484 for my $line (split /\n/, $text) { 3337 for my $para (@_) {
2485 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
2486 $self->{height} += $h; 3389 $self->{height} = $height;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3390 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488 }
2489 3391
2490 $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 }
2491} 3398}
2492 3399
2493sub update { 3400sub update {
2494 my ($self) = @_; 3401 my ($self) = @_;
2495 3402
… …
2497 3404
2498 return unless $self->{h} > 0; 3405 return unless $self->{h} > 0;
2499 3406
2500 delete $self->{texture}; 3407 delete $self->{texture};
2501 3408
2502 $ROOT->on_post_alloc ($self, sub { 3409 $ROOT->on_post_alloc ($self => sub {
3410 $self->force_uptodate;
3411
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3412 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 3413
2505 if (delete $self->{need_reflow}) {
2506 my $height = 0;
2507
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2523
2524 $self->{height} = $height;
2525
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527
2528 delete $self->{texture};
2529 }
2530
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3414 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 3415 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 3416 glClear GL_COLOR_BUFFER_BIT;
2534 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;
2535 my $top = int $self->{children}[1]{range}[0]; 3426 my $top = int $self->{children}[1]{range}[0];
2536 3427
2537 my $y0 = $top; 3428 my $y0 = $top;
2538 my $y1 = $top + $H; 3429 my $y1 = $top + $H;
2539 3430
2540 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 3431 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 3432 my $h = $para->{h};
3433 my $y = $para->{y};
2552 3434
2553 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 3436 my $layout = $self->get_layout ($para);
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 3437
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
2559 3440
2560 glRasterPos $par->[3], $y - $y0; 3441 if (my @w = @{ $para->{widget} }) {
2561 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 }
2562 } 3453 }
2563 3454
2564 $y += $h; 3455 $paridx++;
3456 $top_paragraph ||= $paridx if $y >= $top;
2565 } 3457 }
2566 3458
2567 glDisable GL_BLEND; 3459 $self->{top_paragraph} = $top_paragraph;
2568 }; 3460 };
2569 }); 3461 });
2570} 3462}
2571 3463
3464sub reconfigure {
3465 my ($self) = @_;
3466
3467 $self->SUPER::reconfigure;
3468
3469 $_->{w} = 1e10 for @{ $self->{par} };
3470 $self->reflow;
3471}
3472
2572sub _draw { 3473sub _draw {
2573 my ($self) = @_; 3474 my ($self) = @_;
2574 3475
2575 glEnable GL_TEXTURE_2D; 3476 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 3478 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 3480 glDisable GL_TEXTURE_2D;
2580 3481
2581 $self->{children}[1]->draw; 3482 $self->{children}[1]->draw;
2582
2583} 3483}
2584 3484
2585############################################################################# 3485#############################################################################
2586 3486
2587package CFClient::UI::Animator; 3487package CFPlus::UI::Animator;
2588 3488
2589use CFClient::OpenGL; 3489use CFPlus::OpenGL;
2590 3490
2591our @ISA = CFClient::UI::Bin::; 3491our @ISA = CFPlus::UI::Bin::;
2592 3492
2593sub moveto { 3493sub moveto {
2594 my ($self, $x, $y) = @_; 3494 my ($self, $x, $y) = @_;
2595 3495
2596 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3496 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2624 glPopMatrix; 3524 glPopMatrix;
2625} 3525}
2626 3526
2627############################################################################# 3527#############################################################################
2628 3528
2629package CFClient::UI::Flopper; 3529package CFPlus::UI::Flopper;
2630 3530
2631our @ISA = CFClient::UI::Button::; 3531our @ISA = CFPlus::UI::Button::;
2632 3532
2633sub new { 3533sub new {
2634 my $class = shift; 3534 my $class = shift;
2635 3535
2636 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
… …
2648 $self->{other}->toggle_visibility; 3548 $self->{other}->toggle_visibility;
2649} 3549}
2650 3550
2651############################################################################# 3551#############################################################################
2652 3552
2653package CFClient::UI::Tooltip; 3553package CFPlus::UI::Tooltip;
2654 3554
2655our @ISA = CFClient::UI::Bin::; 3555our @ISA = CFPlus::UI::Bin::;
2656 3556
2657use CFClient::OpenGL; 3557use CFPlus::OpenGL;
2658 3558
2659sub new { 3559sub new {
2660 my $class = shift; 3560 my $class = shift;
2661 3561
2662 $class->SUPER::new ( 3562 $class->SUPER::new (
… …
2666} 3566}
2667 3567
2668sub set_tooltip_from { 3568sub set_tooltip_from {
2669 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
2670 3570
2671 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 =~ /^#(.*)$/;
2672 3576
2673 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
2678 } 3582 }
2679 3583
3584 $tip =~ s/^\n+//;
3585 $tip =~ s/\n+$//;
3586
2680 $self->add (new CFClient::UI::Label 3587 $self->add (new CFPlus::UI::Label
2681 markup => $tooltip, 3588 markup => $tip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 3590 fontsize => 0.8,
2684 fg => [0, 0, 0, 1], 3591 style => 1, # FLAG_INVERSE
2685 ellipsise => 0, 3592 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 ); 3594 );
2688} 3595}
2689 3596
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3600 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 3601
2695 ($w + 4, $h + 4) 3602 ($w + 4, $h + 4)
2696} 3603}
2697 3604
2698sub size_allocate { 3605sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 3606 my ($self, $w, $h) = @_;
2700 3607
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 3608 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 3609}
2703 3610
2704sub visibility_change { 3611sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 3612 my ($self, $visible) = @_;
2706 3613
2707 return unless $visible; 3614 return unless $visible;
2708 3615
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 3616 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner} 3617 my $widget = $self->{owner}
2711 or return; 3618 or return;
2712 3619
3620 if ($widget->{visible}) {
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3621 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 3622
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3623 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 3624 if $x + $self->{w} > $self->{root}{w};
2717 3625
2718 $self->move_abs ($x, $y); 3626 $self->move_abs ($x, $y);
3627 } else {
3628 $self->hide;
3629 }
2719 }); 3630 });
2720} 3631}
2721 3632
2722sub _draw { 3633sub _draw {
2723 my ($self) = @_; 3634 my ($self) = @_;
2724 3635
2725 glTranslate 0.375, 0.375;
2726
2727 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
2728 3637
2729 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
2730 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
2731 glVertex 0 , 0;
2732 glVertex 0 , $h;
2733 glVertex $w, $h;
2734 glVertex $w, 0;
2735 glEnd;
2736 3640
2737 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
2738 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
2739 glVertex 0 , 0;
2740 glVertex 0 , $h;
2741 glVertex $w, $h;
2742 glVertex $w, 0;
2743 glEnd;
2744 3643
2745 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
2746 3645
2747 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
2748} 3647}
2749 3648
2750############################################################################# 3649#############################################################################
2751 3650
2752package CFClient::UI::Face; 3651package CFPlus::UI::Face;
2753 3652
2754our @ISA = CFClient::UI::Base::; 3653our @ISA = CFPlus::UI::DrawBG::;
2755 3654
2756use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2757 3656
2758sub new { 3657sub new {
2759 my $class = shift; 3658 my $class = shift;
2760 3659
2761 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3661 size_w => 32,
3662 size_h => 8,
2762 aspect => 1, 3663 aspect => 1,
2763 can_events => 0, 3664 can_events => 0,
2764 @_, 3665 @_,
2765 ); 3666 );
2766 3667
2767 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
2769 3670
3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2770 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1, 3674 parked => 1,
2773 interval => $self->{animspeed},
2774 cb => sub { 3675 cb => sub {
3676 return unless $::CONN;
3677
3678 my $w = $widget
3679 or return;
3680
2775 ++$widget->{frame}; 3681 ++$w->{frame};
3682 $w->update_face;
3683
3684 # somehow, $widget can go away
2776 $widget->update; 3685 $w->update;
3686 $w->update_timer;
2777 }, 3687 },
2778 ); 3688 );
3689
3690 $self->update_face;
3691 $self->update_timer;
2779 } 3692 }
2780 3693
2781 $self 3694 $self
2782} 3695}
2783 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
2784sub size_request { 3733sub size_request {
2785 (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)
2786} 3751}
2787 3752
2788sub update { 3753sub update {
2789 my ($self) = @_; 3754 my ($self) = @_;
2790 3755
2791 return unless $self->{visible}; 3756 return unless $self->{visible};
2792 3757
2793 $self->SUPER::update; 3758 $self->SUPER::update;
2794} 3759}
2795 3760
3761sub invoke_visibility_change {
3762 my ($self) = @_;
3763
3764 $self->update_timer;
3765
3766 0
3767}
3768
2796sub _draw { 3769sub _draw {
2797 my ($self) = @_; 3770 my ($self) = @_;
2798 3771
2799 return unless $::CONN; 3772 $self->SUPER::_draw;
2800 3773
2801 my $face; 3774 if (my $tex = $self->{tex}) {
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811
2812 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3777 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
2818 } 3780 }
2819} 3781}
2820 3782
2821sub DESTROY { 3783sub destroy {
2822 my ($self) = @_; 3784 my ($self) = @_;
2823 3785
2824 $self->{timer}->cancel 3786 (delete $self->{timer})->cancel
2825 if $self->{timer}; 3787 if $self->{timer};
2826 3788
2827 $self->SUPER::DESTROY; 3789 $self->SUPER::destroy;
2828} 3790}
2829 3791
2830############################################################################# 3792#############################################################################
2831 3793
3794package CFPlus::UI::Buttonbar;
3795
3796our @ISA = CFPlus::UI::HBox::;
3797
3798# TODO: should actually wrap buttons and other goodies.
3799
3800#############################################################################
3801
2832package CFClient::UI::Menu; 3802package CFPlus::UI::Menu;
2833 3803
2834our @ISA = CFClient::UI::FancyFrame::; 3804our @ISA = CFPlus::UI::Toplevel::;
2835 3805
2836use CFClient::OpenGL; 3806use CFPlus::OpenGL;
2837 3807
2838sub new { 3808sub new {
2839 my $class = shift; 3809 my $class = shift;
2840 3810
2841 my $self = $class->SUPER::new ( 3811 my $self = $class->SUPER::new (
2842 items => [], 3812 items => [],
2843 z => 100, 3813 z => 100,
2844 @_, 3814 @_,
2845 ); 3815 );
2846 3816
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3817 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848 3818
2849 for my $item (@{ $self->{items} }) { 3819 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3820 my ($widget, $cb, $tooltip) = @$item;
2851 3821
2852 # handle various types of items, only text for now 3822 # handle various types of items, only text for now
2853 if (!ref $widget) { 3823 if (!ref $widget) {
3824 if ($widget =~ /\t/) {
3825 my ($left, $right) = split /\t/, $widget, 2;
3826
2854 $widget = new CFClient::UI::Label 3827 $widget = new CFPlus::UI::HBox
2855 can_hover => 1, 3828 can_hover => 1,
2856 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,
2857 text => $widget; 3841 markup => $widget,
3842 tooltip => $tooltip;
3843 }
2858 } 3844 }
2859 3845
2860 $self->{item}{$widget} = $item; 3846 $self->{item}{$widget} = $item;
2861 3847
2862 $self->{vbox}->add ($widget); 3848 $self->{vbox}->add ($widget);
… …
2867 3853
2868# 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)
2869sub popup { 3855sub popup {
2870 my ($self, $ev) = @_; 3856 my ($self, $ev) = @_;
2871 3857
2872 $self->_emit ("popdown"); 3858 $self->emit ("popdown");
2873 3859
2874 # maybe save $GRAB? must be careful about events... 3860 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3861 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3862 $self->{button} = $ev->{button};
2877 3863
2878 $self->show; 3864 $self->show;
2879 $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);
2880} 3866}
2881 3867
2882sub mouse_motion { 3868sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3869 my ($self, $ev, $x, $y) = @_;
2884 3870
2885 # TODO: should use vbox->find_widget or so 3871 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3872 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3873 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3874
3875 0
3876}
3877
2890sub button_up { 3878sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3879 my ($self, $ev, $x, $y) = @_;
2892 3880
2893 if ($ev->{button} == $self->{button}) { 3881 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3882 undef $GRAB;
2895 $self->hide; 3883 $self->hide;
2896 3884
2897 $self->_emit ("popdown"); 3885 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3886 $self->{hover}[1]->() if $self->{hover};
3887 } else {
3888 return 0
3889 }
3890
2899 } 3891 1
2900} 3892}
2901 3893
2902############################################################################# 3894#############################################################################
2903 3895
2904package CFClient::UI::Statusbox; 3896package CFPlus::UI::Multiplexer;
2905 3897
2906our @ISA = CFClient::UI::VBox::; 3898our @ISA = CFPlus::UI::Container::;
2907 3899
2908sub new { 3900sub new {
2909 my $class = shift; 3901 my $class = shift;
2910 3902
2911 $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 (
2912 fontsize => 0.8, 4151 fontsize => 0.8,
2913 @_, 4152 @_,
2914 ) 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
2915} 4160}
2916 4161
2917sub reorder { 4162sub reorder {
2918 my ($self) = @_; 4163 my ($self) = @_;
2919 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} };
2920 4170
2921 while (my ($k, $v) = each %{ $self->{item} }) { 4171 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4172 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 4173 }
2924 4174
… …
2927 my @items = sort { 4177 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 4178 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 4179 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 4180 } values %{ $self->{item} };
2931 4181
4182 $self->{timer}->interval (1);
4183
2932 my $count = 10 + 1; 4184 my $count = 10 + 1;
2933 for my $item (@items) { 4185 for my $item (@items) {
2934 last unless --$count; 4186 last unless --$count;
2935 4187
2936 push @widgets, $item->{label} ||= do { 4188 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 4189 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 4190 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 4191 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 4192 : $item->{text};
2941 4193
2942 for ($short) { 4194 for ($short) {
2943 s/^\s+//; 4195 s/^\s+//;
2944 s/\s+/ /g; 4196 s/\s+/ /g;
2945 } 4197 }
2946 4198
2947 new CFClient::UI::Label 4199 new CFPlus::UI::Label
2948 markup => $short, 4200 markup => $short,
2949 tooltip => $item->{tooltip}, 4201 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 4202 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 4203 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 4204 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 4205 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 4206 fg => [@{ $item->{fg} }],
2955 can_events => 1, 4207 can_events => 1,
2956 can_hover => 1 4208 can_hover => 1
2957 }; 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;
2958 } 4222 }
2959 4223
2960 $self->clear; 4224 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 4225 $self->SUPER::add (reverse @widgets);
2962} 4226}
… …
2967 $text =~ s/^\s+//; 4231 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 4232 $text =~ s/\s+$//;
2969 4233
2970 return unless $text; 4234 return unless $text;
2971 4235
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 4236 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 4237
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4238 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 4239
2976 if (my $item = $self->{item}{$group}) { 4240 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 4241 if ($item->{text} eq $text) {
2978 $item->{count}++; 4242 $item->{count}++;
2979 } else { 4243 } else {
2980 $item->{count} = 1; 4244 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 4245 $item->{text} = $item->{tooltip} = $text;
2982 } 4246 }
2983 $item->{id} = ++$self->{id}; 4247 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 4248 $item->{timeout} = $timeout;
2985 delete $item->{label}; 4249 delete $item->{label};
2986 } else { 4250 } else {
2987 $self->{item}{$group} = { 4251 $self->{item}{$group} = {
2988 id => ++$self->{id}, 4252 id => ++$self->{id},
… …
2994 count => 1, 4258 count => 1,
2995 %arg, 4259 %arg,
2996 }; 4260 };
2997 } 4261 }
2998 4262
4263 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 4264 $self->reorder;
4265 });
3000} 4266}
3001 4267
3002sub reconfigure { 4268sub reconfigure {
3003 my ($self) = @_; 4269 my ($self) = @_;
3004 4270
… …
3007 4273
3008 $self->reorder; 4274 $self->reorder;
3009 $self->SUPER::reconfigure; 4275 $self->SUPER::reconfigure;
3010} 4276}
3011 4277
4278sub destroy {
4279 my ($self) = @_;
4280
4281 $self->{timer}->cancel;
4282
4283 $self->SUPER::destroy;
4284}
4285
3012############################################################################# 4286#############################################################################
3013 4287
3014package CFClient::UI::Inventory;
3015
3016our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018sub new {
3019 my $class = shift;
3020
3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_,
3024 );
3025
3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3175
3176 $self->clear_command_list;
3177 $self->{recording} = 0;
3178 $self->{rec_btn}->set_text ("start recording");
3179
3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
3198
3199sub update_binding_widgets {
3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root; 4288package CFPlus::UI::Root;
3306 4289
3307our @ISA = CFClient::UI::Container::; 4290our @ISA = CFPlus::UI::Container::;
3308 4291
4292use List::Util qw(min max);
4293
3309use CFClient::OpenGL; 4294use CFPlus::OpenGL;
3310 4295
3311sub new { 4296sub new {
3312 my $class = shift; 4297 my $class = shift;
3313 4298
3314 my $self = $class->SUPER::new ( 4299 my $self = $class->SUPER::new (
3315 visible => 1, 4300 visible => 1,
3316 @_, 4301 @_,
3317 ); 4302 );
3318 4303
3319 Scalar::Util::weaken ($self->{root} = $self); 4304 CFPlus::weaken ($self->{root} = $self);
3320 4305
3321 $self 4306 $self
3322} 4307}
3323 4308
3324sub size_request { 4309sub size_request {
… …
3339 $coord = $max - $size if $coord > $max - $size; 4324 $coord = $max - $size if $coord > $max - $size;
3340 4325
3341 int $coord + 0.5 4326 int $coord + 0.5
3342} 4327}
3343 4328
3344sub size_allocate { 4329sub invoke_size_allocate {
3345 my ($self, $w, $h) = @_; 4330 my ($self, $w, $h) = @_;
3346 4331
3347 for my $child ($self->children) { 4332 for my $child ($self->children) {
3348 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)};
3349 4334
… …
3353 $X = _to_pixel $X, $W, $self->{w}; 4338 $X = _to_pixel $X, $W, $self->{w};
3354 $Y = _to_pixel $Y, $H, $self->{h}; 4339 $Y = _to_pixel $Y, $H, $self->{h};
3355 4340
3356 $child->configure ($X, $Y, $W, $H); 4341 $child->configure ($X, $Y, $W, $H);
3357 } 4342 }
4343
4344 1
3358} 4345}
3359 4346
3360sub coord2local { 4347sub coord2local {
3361 my ($self, $x, $y) = @_; 4348 my ($self, $x, $y) = @_;
3362 4349
… …
3370} 4357}
3371 4358
3372sub update { 4359sub update {
3373 my ($self) = @_; 4360 my ($self) = @_;
3374 4361
3375 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
3376} 4363}
3377 4364
3378sub add { 4365sub add {
3379 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
3380 4367
… …
3417 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
3418 $_->() 4405 $_->()
3419 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
3420 } 4407 }
3421 4408
3422 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
3423 my %queue; 4410 my %queue;
3424 my @queue; 4411 my @queue;
3425 my $widget; 4412 my $widget;
3426 4413
3427 outer: 4414 outer:
… …
3447 4434
3448 delete $queue{$widget+0}; 4435 delete $queue{$widget+0};
3449 4436
3450 my ($w, $h) = $widget->size_request; 4437 my ($w, $h) = $widget->size_request;
3451 4438
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4439 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $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};
3454 4444
3455 $w = $widget->{force_w} if exists $widget->{force_w}; 4445 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h}; 4446 $h = $widget->{force_h} if exists $widget->{force_h};
3457 4447
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4448 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3471 } 4461 }
3472 } 4462 }
3473 4463
3474 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
3475 } 4465 }
3476 }
3477 4466
3478 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
3479 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
3480 values %$size_alloc; 4469 values %$size_alloc;
3481 4470
3482 while () { 4471 while () {
3483 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
3484 4473
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486 4475
3487 $w = 0 if $w < 0; 4476 $w = max $widget->{min_w}, $w;
3488 $h = 0 if $h < 0; 4477 $h = max $widget->{min_h}, $h;
3489 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
3490 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
3491 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
3492 4487
3493 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}) {
3494 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
3496 4491
3497 $widget->{w} = $w; 4492 $widget->{w} = $w;
3498 $widget->{h} = $h; 4493 $widget->{h} = $h;
3499 4494
3500 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
3501 } 4497 }
3502 } 4498 }
3503 } 4499 }
3504 4500
3505 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {
3506 $_->() 4502 $_->()
3507 for values %{delete $self->{post_alloc_hook}}; 4503 for values %{delete $self->{post_alloc_hook}};
3508 } 4504 }
3509
3510 4505
3511 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4506 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4507 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3513 glClear GL_COLOR_BUFFER_BIT; 4508 glClear GL_COLOR_BUFFER_BIT;
3514 4509
… …
3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4512 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3518 glMatrixMode GL_MODELVIEW; 4513 glMatrixMode GL_MODELVIEW;
3519 glLoadIdentity; 4514 glLoadIdentity;
3520 4515
3521 { 4516 {
3522 package CFClient::UI::Base; 4517 package CFPlus::UI::Base;
3523 4518
3524 ($draw_x, $draw_y, $draw_w, $draw_h) = 4519 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h}); 4520 (0, 0, $self->{w}, $self->{h});
3526 }
3527 4521
3528 $self->_draw; 4522 $self->_draw;
4523 }
3529} 4524}
3530 4525
3531############################################################################# 4526#############################################################################
3532 4527
3533package CFClient::UI; 4528package CFPlus::UI;
3534 4529
3535$ROOT = new CFClient::UI::Root; 4530$ROOT = new CFPlus::UI::Root;
3536$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4531$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3537 4532
35381 45331
3539 4534

Diff Legend

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