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

Diff Legend

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