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

Diff Legend

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