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

Diff Legend

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