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.376 by root, Mon Jul 16 20:20:23 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 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
983 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
984 1095
985 $self 1096 $self
986} 1097}
1098
1099#TODO# update range on size_allocate depending on child
987 1100
988sub add { 1101sub add {
989 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
990 1103
991 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
992} 1105}
993 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
994sub update { 1131sub update {
995 my ($self) = @_; 1132 my ($self) = @_;
996 1133
997 $self->SUPER::update; 1134 $self->SUPER::update;
998 1135 $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} 1136}
1003 1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1004sub size_allocate { 1191sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1006 1193
1194 $self->update_slider;
1007 $self->SUPER::size_allocate ($w, $h); 1195 $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} 1196}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1197
1016############################################################################# 1198#############################################################################
1017 1199
1018package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1019 1201
1020our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1021 1203
1022use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1023 1205
1024sub new { 1206sub new {
1025 my $class = shift; 1207 my $class = shift;
1026 1208
1027 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1035 1217
1036 if ($self->{bg}) { 1218 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1038 1220
1039 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1042 1224
1043 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1226 glVertex 0 , 0;
1045 glVertex 0 , $h; 1227 glVertex 0 , $h;
1046 glVertex $w, $h; 1228 glVertex $w, $h;
… …
1053 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1054} 1236}
1055 1237
1056############################################################################# 1238#############################################################################
1057 1239
1058package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1059 1241
1060our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1061 1243
1062use CFClient::OpenGL; 1244use 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 1245
1072sub new { 1246sub new {
1073 my ($class, %arg) = @_; 1247 my ($class, %arg) = @_;
1074 1248
1075 my $title = delete $arg{title}; 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354sub new {
1355 my ($class, %arg) = @_;
1076 1356
1077 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1360 border => 0.6,
1081 can_events => 1, 1361 can_events => 1,
1082 min_w => 16, 1362 min_w => 64,
1083 min_h => 16, 1363 min_h => 32,
1084 %arg, 1364 %arg,
1085 ); 1365 );
1086 1366
1087 $self->{title} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1088 align => 0, 1368 align => 0,
1089 valign => 1, 1369 valign => 1,
1090 text => $title, 1370 text => $self->{title},
1091 fontsize => $self->{border} 1371 fontsize => $self->{border},
1092 if defined $title; 1372 if exists $self->{title};
1373
1374 if ($self->{has_close_button}) {
1375 $self->{close_button} =
1376 new CFPlus::UI::ImageButton
1377 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") };
1379
1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1381 }
1093 1382
1094 $self 1383 $self
1095} 1384}
1096 1385
1097sub add { 1386sub add {
1098 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1099 1388
1100 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1392}
1103 1393
1104sub border { 1394sub border {
1105 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1106} 1396}
1107 1397
1108sub size_request { 1398sub size_request {
1109 my ($self) = @_; 1399 my ($self) = @_;
1110 1400
1111 $self->{title}->size_request 1401 $self->{title_widget}->size_request
1112 if $self->{title}; 1402 if $self->{title_widget};
1403
1404 $self->{close_button}->size_request
1405 if $self->{close_button};
1113 1406
1114 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
1115 1408
1116 ( 1409 (
1117 $w + $self->border * 2, 1410 $w + $self->border * 2,
1118 $h + $self->border * 2, 1411 $h + $self->border * 2,
1119 ) 1412 )
1120} 1413}
1121 1414
1122sub size_allocate { 1415sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
1124 1417
1125 if ($self->{title}) { 1418 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1419 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1420 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1421 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1422 }
1130 1423
1131 my $border = $self->border; 1424 my $border = $self->border;
1132 1425
1133 $h -= List::Util::max 0, $border * 2; 1426 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1427 $w -= List::Util::max 0, $border * 2;
1428
1429 $self->child->configure ($border, $border, $w, $h);
1430
1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1432 if $self->{close_button};
1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1135 1441
1136 $self->child->configure ($border, $border, $w, $h); 1442 1
1137} 1443}
1138 1444
1139sub button_down { 1445sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
1141 1447
1142 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1449 my $border = $self->border;
1144 1450
… …
1175 1481
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1483
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement 1485 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1487 };
1182 } else { 1488 } else {
1183 return 0; 1489 return 0;
1184 } 1490 }
1185 1491
1186 1 1492 1
1187} 1493}
1188 1494
1189sub button_up { 1495sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1191 1497
1192 !!delete $self->{motion} 1498 ! ! delete $self->{motion}
1193} 1499}
1194 1500
1195sub mouse_motion { 1501sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1197 1503
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1505
1200 !!$self->{motion} 1506 ! ! $self->{motion}
1507}
1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1201} 1515}
1202 1516
1203sub _draw { 1517sub _draw {
1204 my ($self) = @_; 1518 my ($self) = @_;
1205 1519
… …
1231 1545
1232 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1233 1547
1234 $child->draw; 1548 $child->draw;
1235 1549
1236 if ($self->{title}) { 1550 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1551 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1552 $self->{title_widget}->_draw;
1553
1554 glTranslate 0, - ($border - $self->{h});
1239 } 1555 }
1556
1557 $self->{close_button}->draw
1558 if $self->{close_button};
1240} 1559}
1241 1560
1242############################################################################# 1561#############################################################################
1243 1562
1244package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1245 1564
1246our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1247 1566
1248use List::Util qw(max sum); 1567use List::Util qw(max sum);
1249 1568
1250use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1251 1570
1252sub new { 1571sub new {
1253 my $class = shift; 1572 my $class = shift;
1254 1573
1255 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1256 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1257 @_, 1578 @_,
1258 ) 1579 )
1259} 1580}
1260 1581
1261sub children { 1582sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1263} 1584}
1264 1585
1586# TODO: store row/col info in child widget and use standard add/del
1265sub add { 1587sub add {
1266 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1267 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1268 $child->set_parent ($self); 1592 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1270 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1271 $self->realloc; 1598 $self->realloc;
1599}
1600
1601sub remove {
1602 my ($self, $child) = @_;
1603
1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1272} 1609}
1273 1610
1274# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1275sub clear { 1612sub clear {
1276 my ($self) = @_; 1613 my ($self) = @_;
… …
1317 (sum @$ws), 1654 (sum @$ws),
1318 (sum @$hs), 1655 (sum @$hs),
1319 ) 1656 )
1320} 1657}
1321 1658
1322sub size_allocate { 1659sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1324 1661
1325 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1326 1663
1327 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1328 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1329 1666
1330 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1331 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1332 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1333 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1334 1671
1335 # linearly scale sizes
1336 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1337 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1338 1673
1339 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1340 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1341 1683
1342 my $y; 1684 my $y;
1343 1685
1344 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1345 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1359 } 1701 }
1360 1702
1361 $y += $row_h; 1703 $y += $row_h;
1362 } 1704 }
1363 1705
1706 1
1364} 1707}
1365 1708
1366sub find_widget { 1709sub find_widget {
1367 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1368 1711
… …
1387 } 1730 }
1388} 1731}
1389 1732
1390############################################################################# 1733#############################################################################
1391 1734
1392package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1393 1736
1737use List::Util qw(min max);
1738
1394our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1395 1820
1396sub size_request { 1821sub size_request {
1397 my ($self) = @_; 1822 my ($self) = @_;
1398 1823
1399 $self->{vertical} 1824 $self->{vertical}
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1831 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1832 )
1408} 1833}
1409 1834
1410sub size_allocate { 1835sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1412 1837
1413 my $space = $self->{vertical} ? $h : $w; 1838 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1839 my @children = $self->visible_children;
1415 1840
1416 my @req; 1841 my @req;
1417 1842
1418 if ($self->{homogeneous}) { 1843 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1844 @req = ($space / (@children || 1)) x @children;
1420 } else { 1845 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1846 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1847 my $req = List::Util::sum @req;
1423 1848
1424 if ($req > $space) { 1849 if ($req > $space) {
1425 # ah well, not enough space 1850 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1851 $_ *= $space / $req for @req;
1427 } else { 1852 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1853 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1854
1430 $space = ($space - $req) / $expand; # remaining space to give away 1855 $space = ($space - $req) / $expand; # remaining space to give away
1431 1856
1432 $req[$_] += $space * $children->[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1858 for 0 .. $#children;
1434 } 1859 }
1435 } 1860 }
1436 1861
1437 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1438 1863
1439 my $pos = 0; 1864 my $pos = 0;
1440 for (0 .. $#$children) { 1865 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1443 1868
1444 $pos += $alloc; 1869 $pos += $alloc;
1445 } 1870 }
1446 1871
1447 1 1872 1
1448} 1873}
1449 1874
1450############################################################################# 1875#############################################################################
1451 1876
1452package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1453 1878
1454our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1455 1880
1456sub new { 1881sub new {
1457 my $class = shift; 1882 my $class = shift;
1458 1883
1459 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1462 ) 1887 )
1463} 1888}
1464 1889
1465############################################################################# 1890#############################################################################
1466 1891
1467package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1468 1893
1469our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1470 1895
1471sub new { 1896sub new {
1472 my $class = shift; 1897 my $class = shift;
1473 1898
1474 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1477 ) 1902 )
1478} 1903}
1479 1904
1480############################################################################# 1905#############################################################################
1481 1906
1482package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1483 1908
1484our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1485 1910
1486use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1487 1912
1488sub new { 1913sub new {
1489 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1490 1915
1491 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1494 #active_bg => none 1919 #active_bg => none
1495 #font => default_font 1920 #font => default_font
1496 #text => initial text 1921 #text => initial text
1497 #markup => initial narkup 1922 #markup => initial narkup
1498 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1499 ellipsise => 3, # end 1925 ellipsise => 3, # end
1500 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1501 fontsize => 1, 1927 fontsize => 1,
1502 align => -1, 1928 align => -1,
1503 valign => -1, 1929 valign => -1,
1504 padding_x => 2, 1930 padding_x => 2,
1505 padding_y => 2, 1931 padding_y => 2,
1506 can_events => 0, 1932 can_events => 0,
1507 %arg 1933 %arg
1508 ); 1934 );
1509 1935
1510 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1511 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1512 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1513 $self->{template} = $layout; 1939 $self->{template} = $layout;
1514 } 1940 }
1515 1941
1516 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1520 } 1946 }
1521 1947
1522 $self 1948 $self
1523} 1949}
1524 1950
1525sub escape($) {
1526 local $_ = $_[0];
1527
1528 s/&/&amp;/g;
1529 s/>/&gt;/g;
1530 s/</&lt;/g;
1531
1532 $_
1533}
1534
1535sub update { 1951sub update {
1536 my ($self) = @_; 1952 my ($self) = @_;
1537 1953
1538 delete $self->{texture}; 1954 delete $self->{texture};
1539 $self->SUPER::update; 1955 $self->SUPER::update;
1540} 1956}
1541 1957
1958sub realloc {
1959 my ($self) = @_;
1960
1961 delete $self->{ox};
1962 $self->SUPER::realloc;
1963}
1964
1542sub set_text { 1965sub set_text {
1543 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1544 1967
1545 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1547 1970
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1550 1972
1973 delete $self->{size_req};
1551 $self->realloc; 1974 $self->realloc;
1552 $self->update; 1975 $self->update;
1553} 1976}
1554 1977
1555sub set_markup { 1978sub set_markup {
… …
1558 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1559 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1560 1983
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1985
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1565 1987
1988 delete $self->{size_req};
1566 $self->realloc; 1989 $self->realloc;
1567 $self->update; 1990 $self->update;
1568} 1991}
1569 1992
1570sub size_request { 1993sub size_request {
1571 my ($self) = @_; 1994 my ($self) = @_;
1572 1995
1996 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1998 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 2002
1579 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1580 2004
1581 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 2009
1585 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1586 2011
1587 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 2013 $h = List::Util::max $h, $h2;
2014 }
2015
2016 [$w, $h]
1589 } 2017 };
1590 2018
1591 ($w, $h) 2019 @{ $self->{size_req} }
1592} 2020}
1593 2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1594sub size_allocate { 2026sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1596 2028
1597 delete $self->{ox}; 2029 delete $self->{ox};
1598 2030
1599 delete $self->{texture} 2031 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1601} 2035}
1602 2036
1603sub set_fontsize { 2037sub set_fontsize {
1604 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1605 2039
1606 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1607 delete $self->{texture}; 2042 delete $self->{texture};
1608 2043
1609 $self->realloc; 2044 $self->realloc;
1610} 2045}
1611 2046
2047sub reconfigure {
2048 my ($self) = @_;
2049
2050 delete $self->{size_req};
2051 delete $self->{texture};
2052
2053 $self->SUPER::reconfigure;
2054}
2055
1612sub _draw { 2056sub _draw {
1613 my ($self) = @_; 2057 my ($self) = @_;
1614 2058
1615 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1616 2060
1617 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1619 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1620 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624 2068
1625 new_from_layout CFClient::Texture $self->{layout} 2069 [$self->{layout}->size]
1626 }; 2070 };
1627 2071
1628 unless (exists $self->{ox}) { 2072 unless (exists $self->{ox}) {
1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5); 2075 : ($self->{w} - $size->[0]) * 0.5);
1632 2076
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 2079 : ($self->{h} - $size->[1]) * 0.5);
1636 }; 2080 };
1637 2081
1638 glEnable GL_TEXTURE_2D; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1640 2084
1641 if ($tex->{format} == GL_ALPHA) { 2085 $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} 2086}
1650 2087
1651############################################################################# 2088#############################################################################
1652 2089
1653package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1654 2091
1655our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1656 2093
1657use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1658 2095
1659sub new { 2096sub new {
1660 my $class = shift; 2097 my $class = shift;
1661 2098
1662 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1666 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1667 can_hover => 1, 2104 can_hover => 1,
1668 can_focus => 1, 2105 can_focus => 1,
1669 valign => 0, 2106 valign => 0,
1670 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1671 #text => ... 2109 #text => ...
2110 #hidden => "*",
1672 @_ 2111 @_
1673 ) 2112 )
1674} 2113}
1675 2114
1676sub _set_text { 2115sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 2122 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 2123 $self->{text} = $text;
1685 2124
1686 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
2127 delete $self->{size_req};
1688 2128
1689 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
2130
2131 $self->realloc;
1690 $self->update; 2132 $self->update;
1691} 2133}
1692 2134
1693sub set_text { 2135sub set_text {
1694 my ($self, $text) = @_; 2136 my ($self, $text) = @_;
1695 2137
1696 $self->{cursor} = length $text; 2138 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 2139 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 2140}
1701 2141
1702sub get_text { 2142sub get_text {
1703 $_[0]{text} 2143 $_[0]{text}
1704} 2144}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1710 2150
1711 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1712} 2152}
1713 2153
1714sub key_down { 2154sub invoke_key_down {
1715 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1716 2156
1717 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1720 2160
1721 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1722 2164
1723 if ($uni == 8) { 2165 if ($uni == 8) {
1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1725 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1726 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1727 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1728 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1729 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1730 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1731 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1732 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 2189 $self->emit ('escape');
1737 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 2194 } else {
1740 return 0; 2195 return 0;
1741 } 2196 }
1742 2197
1743 $self->_set_text ($text); 2198 $self->_set_text ($text);
1744 2199
1745 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1746 2202
1747 1 2203 1
1748} 2204}
1749 2205
1750sub focus_in { 2206sub invoke_focus_in {
1751 my ($self) = @_; 2207 my ($self) = @_;
1752 2208
1753 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1754 2210
1755 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1756} 2212}
1757 2213
1758sub button_down { 2214sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1760 2216
1761 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 2218
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 2220
1765 # byte-index to char-index 2221 # byte-index to char-index
1766 my $text = $self->{text}; 2222 my $text = $self->{text};
1767 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1768 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1769 2225
1770 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1771 $self->update; 2227 $self->update;
1772 2228
1773 1 2229 1
1774} 2230}
1775 2231
1776sub mouse_motion { 2232sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779 2235
1780 0 2236 1
1781} 2237}
1782 2238
1783sub _draw { 2239sub _draw {
1784 my ($self) = @_; 2240 my ($self) = @_;
1785 2241
1786 local $self->{fg} = $self->{fg}; 2242 local $self->{fg} = $self->{fg};
1787 2243
1788 if ($FOCUS == $self) { 2244 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 2245 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 2246 $self->{fg} = $self->{active_fg};
1791 } else { 2247 } else {
1792 glColor @{$self->{bg}}; 2248 glColor_premultiply @{$self->{bg}};
1793 } 2249 }
1794 2250
1795 glEnable GL_BLEND; 2251 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
1798 glVertex 0 , 0; 2254 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 2255 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 2256 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 2257 glVertex $self->{w}, 0;
… …
1812 utf8::encode $text; 2268 utf8::encode $text;
1813 2269
1814 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1815 } 2271 }
1816 2272
1817 glColor @{$self->{fg}};
1818 glBegin GL_LINES; 2273 glBegin GL_LINES;
1819 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 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}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1821 glEnd; 2276 glEnd;
1822 } 2277 }
1823} 2278}
1824 2279
2280#############################################################################
2281
1825package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1826 2283
1827our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1828 2285
1829use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1830 2287
1831sub key_down { 2288sub invoke_key_down {
1832 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1833 2290
1834 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1835 2292
1836 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1837 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1839 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1842 $self->update; 2300 $self->update;
1843 2301
1844 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1847 } 2305 }
1848 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1849 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1851 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1852 } 2310 }
1853 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1854 } 2312 }
1855 2313
1856 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1857 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1858 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1859 2317
1860 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1861 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1862 } else { 2320 } else {
1863 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1864 } 2322 }
1865 2323
1866 } else { 2324 } else {
1867 return $self->SUPER::key_down ($ev) 2325 return $self->SUPER::invoke_key_down ($ev)
1868 } 2326 }
1869 2327
1870 1 2328 1
1871} 2329}
1872 2330
1873############################################################################# 2331#############################################################################
1874 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1875package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1876 2373
1877our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1878 2375
1879use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1880 2377
1881my @tex = 2378my @tex =
1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1883 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1884 2381
1885sub new { 2382sub new {
1886 my $class = shift; 2383 my $class = shift;
1887 2384
… …
1896 can_events => 1, 2393 can_events => 1,
1897 @_ 2394 @_
1898 ) 2395 )
1899} 2396}
1900 2397
1901sub activate { }
1902
1903sub button_up { 2398sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1905 2400
1906 $self->emit ("activate") 2401 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
… …
1911} 2406}
1912 2407
1913sub _draw { 2408sub _draw {
1914 my ($self) = @_; 2409 my ($self) = @_;
1915 2410
1916 local $self->{fg} = $self->{fg}; 2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 2412
1922 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
1925 2416
… …
1930 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1931} 2422}
1932 2423
1933############################################################################# 2424#############################################################################
1934 2425
1935package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1936 2427
1937our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1938 2429
1939my @tex = 2430my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1942 2433
1943use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1944 2435
1945sub new { 2436sub new {
1946 my $class = shift; 2437 my $class = shift;
1947 2438
1948 $class->SUPER::new ( 2439 $class->SUPER::new (
… …
1962 my ($self) = @_; 2453 my ($self) = @_;
1963 2454
1964 (6) x 2 2455 (6) x 2
1965} 2456}
1966 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1967sub button_down { 2466sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1969 2468
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2471 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2472 } else {
1975 return 0 2473 return 0
1976 } 2474 }
1977 2475
1978 1 2476 1
… …
1998 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
1999} 2497}
2000 2498
2001############################################################################# 2499#############################################################################
2002 2500
2003package CFClient::UI::Image; 2501package CFPlus::UI::Image;
2004 2502
2005our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
2006 2504
2007use CFClient::OpenGL; 2505use CFPlus::OpenGL;
2008use Carp qw/confess/;
2009 2506
2010our %loaded_images; 2507our %texture_cache;
2011 2508
2012sub new { 2509sub new {
2013 my $class = shift; 2510 my $class = shift;
2014 2511
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2016 2516
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2018 2519
2019 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2021 2522
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2023 2524
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2526
2028 $self 2527 $self
2029} 2528}
2030 2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2031sub size_request { 2545sub size_request {
2032 my ($self) = @_; 2546 my ($self) = @_;
2033 2547
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
2035} 2549}
2036 2550
2037sub _draw { 2551sub _draw {
2038 my ($self) = @_; 2552 my ($self) = @_;
2039 2553
… …
2049 } 2563 }
2050 2564
2051 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
2052 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2053 2567
2054 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
2055 2569
2056 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
2057} 2571}
2058 2572
2059############################################################################# 2573#############################################################################
2060 2574
2575package CFPlus::UI::ImageButton;
2576
2577our @ISA = CFPlus::UI::Image::;
2578
2579use CFPlus::OpenGL;
2580
2581my %textures;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 padding_x => 4,
2588 padding_y => 4,
2589 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1],
2591 can_hover => 1,
2592 align => 0,
2593 valign => 0,
2594 can_events => 1,
2595 @_
2596 );
2597}
2598
2599sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_;
2601
2602 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w}
2604 && $y >= 0 && $y < $self->{h};
2605
2606 1
2607}
2608
2609#############################################################################
2610
2061package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
2062 2612
2063our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2064 2614
2065use List::Util qw(min max); 2615use List::Util qw(min max);
2066 2616
2067use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2068 2618
2069my %tex = ( 2619my %tex = (
2070 food => [ 2620 food => [
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2073 ], 2623 ],
2074 grace => [ 2624 grace => [
2075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 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/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2077 ], 2627 ],
2078 hp => [ 2628 hp => [
2079 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2080 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2081 ], 2631 ],
2082 mana => [ 2632 mana => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 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/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2085 ], 2635 ],
2086); 2636);
2087 2637
2088# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2700
2151 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2153 2706
2154 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2712
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2713 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2714 glBegin GL_QUADS;
… …
2175 2729
2176 if ($t3) { 2730 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2737 glEnd;
2184 } 2738 }
2185 2739
2186 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2187 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2188} 2742}
2189 2743
2190############################################################################# 2744#############################################################################
2191 2745
2192package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2193 2747
2194our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2195 2749
2196sub new { 2750sub new {
2197 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2198 2752
2199 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2201 can_hover => 1, 2755 can_hover => 1,
2202 can_events => 1, 2756 can_events => 1,
2203 %arg, 2757 %arg,
2204 ); 2758 );
2205 2759
2206 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $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); 2761 $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"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2209 2763
2210 $self 2764 $self
2211} 2765}
2212 2766
2213sub set_fontsize { 2767sub set_fontsize {
… …
2234 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2235} 2789}
2236 2790
2237############################################################################# 2791#############################################################################
2238 2792
2239package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2240 2794
2241use strict; 2795use strict;
2242 2796
2243use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2244 2798
2245our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2246 2800
2247my @tex = 2801my @tex =
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2249 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2250 2804
2251sub new { 2805sub new {
2252 my $class = shift; 2806 my $class = shift;
2253 2807
… …
2274 $self->update; 2828 $self->update;
2275 2829
2276 $self 2830 $self
2277} 2831}
2278 2832
2279sub changed { }
2280
2281sub set_range { 2833sub set_range {
2282 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2283 2835
2284 ($range, $self->{range}) = ($self->{range}, $range); 2836 ($range, $self->{range}) = ($self->{range}, $range);
2285 2837
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2838 if ("@$range" ne "@{$self->{range}}") {
2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2288} 2842}
2289 2843
2290sub set_value { 2844sub set_value {
2291 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2292 2846
… …
2303 if $unit; 2857 if $unit;
2304 2858
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2860
2307 if ($value != $old_value) { 2861 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2309 $self->update; 2863 $self->update;
2310 } 2864 }
2311} 2865}
2312 2866
2313sub size_request { 2867sub size_request {
2314 my ($self) = @_; 2868 my ($self) = @_;
2315 2869
2316 ($self->{req_w}, $self->{req_h}) 2870 ($self->{req_w}, $self->{req_h})
2317} 2871}
2318 2872
2319sub button_down { 2873sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2321 2875
2322 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2877
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2879
2326 $self->mouse_motion ($ev, $x, $y) 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2881}
2328 2882
2329sub mouse_motion { 2883sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2331 2885
2332 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2888
… …
2340 } else { 2894 } else {
2341 return 0; 2895 return 0;
2342 } 2896 }
2343 2897
2344 1 2898 1
2899}
2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2345} 2911}
2346 2912
2347sub update { 2913sub update {
2348 my ($self) = @_; 2914 my ($self) = @_;
2349 2915
… …
2398 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2399} 2965}
2400 2966
2401############################################################################# 2967#############################################################################
2402 2968
2403package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2404 2970
2405our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2406 2972
2407sub new { 2973sub new {
2408 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2409 2975
2410 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2411 2977
2412 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift }, 2981 to_value => sub { shift },
2416 from_value => sub { shift }, 2982 from_value => sub { shift },
2417 %arg, 2983 %arg,
2418 ); 2984 );
2419 2985
… …
2439sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2441 3007
2442############################################################################# 3008#############################################################################
2443 3009
2444package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2445 3011
2446our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2447 3013
2448use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2449 3015
2450sub new { 3016sub new {
2451 my $class = shift; 3017 my $class = shift;
2452 3018
2453 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2454 fontsize => 1, 3020 fontsize => 1,
2455 can_events => 0, 3021 can_events => 1,
3022 indent => 0,
2456 #font => default_font 3023 #font => default_font
2457 @_, 3024 @_,
2458 3025
2459 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2460 par => [], 3027 par => [],
3028 max_par => 0,
2461 height => 0, 3029 height => 0,
2462 children => [ 3030 children => [
2463 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2464 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2465 ], 3033 ],
2466 ); 3034 );
2467 3035
2468 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2469 3037
… …
2475 3043
2476 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2477 $self->reflow; 3045 $self->reflow;
2478} 3046}
2479 3047
3048sub size_request {
3049 my ($self) = @_;
3050
3051 my ($empty, $slider) = @{ $self->{children} };
3052
3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request
3055}
3056
2480sub size_allocate { 3057sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2482 3059
2483 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 3062
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 3065 $self->{layout}->set_width ($empty->{w});
3066 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 3067
2489 $self->reflow; 3068 $self->reflow;
2490}
2491 3069
2492sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2493 my ($self, $text, $indent) = @_; 3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
3082}
3083
3084sub get_layout {
3085 my ($self, $para) = @_;
2494 3086
2495 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2496 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 3092 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 3094 $layout->set_markup ($para->{markup});
3095
3096 $layout->set_shapes (
3097 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}}
2500 3100 );
3101
2501 $layout->size 3102 $layout
2502} 3103}
2503 3104
2504sub reflow { 3105sub reflow {
2505 my ($self) = @_; 3106 my ($self) = @_;
2506 3107
… …
2513 3114
2514 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2516} 3117}
2517 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2518sub clear { 3134sub clear {
2519 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2520 3139
2521 $self->{par} = []; 3140 $self->{par} = [];
2522 $self->{height} = 0; 3141 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 3143}
2525 3144
2526sub add_paragraph { 3145sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2528 3147
2529 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2530 my ($w, $h) = $self->text_size ($line); 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
3155 w => 1e10,
3156 wrapped => 1,
3157 };
3158
3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
3167 $self->{need_reflow}++;
3168 $self->update;
3169}
3170
3171sub scroll_to_bottom {
3172 my ($self) = @_;
3173
3174 $self->{scroll_to} = $#{$self->{par}};
3175 $self->update;
3176}
3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
2531 $self->{height} += $h; 3200 $self->{height} = $height;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2533 }
2534 3202
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
2536} 3209}
2537 3210
2538sub update { 3211sub update {
2539 my ($self) = @_; 3212 my ($self) = @_;
2540 3213
… …
2542 3215
2543 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2544 3217
2545 delete $self->{texture}; 3218 delete $self->{texture};
2546 3219
2547 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 3224
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 { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 3226 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2579 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2580 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2581 3238
2582 my $y0 = $top; 3239 my $y0 = $top;
2583 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2584 3241
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}}) { 3242 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2597 3245
2598 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2600 $layout->set_width ($W - $par->[3]);
2601 $layout->set_markup ($par->[4]);
2602 3248
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2604 3250
2605 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3252 my @s = $layout->get_shapes;
3253
3254 for (@w) {
3255 my ($dx, $dy) = splice @s, 0, 2, ();
3256
3257 $_->{x} = $dx + $para->{indent};
3258 $_->{y} = $dy + $y - $y0;
3259
3260 $_->draw;
3261 }
3262 }
2607 } 3263 }
2608 3264
2609 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2610 } 3267 }
2611 3268
2612 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2613 }; 3270 };
2614 }); 3271 });
2615} 3272}
2616 3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
3281}
3282
2617sub _draw { 3283sub _draw {
2618 my ($self) = @_; 3284 my ($self) = @_;
2619 3285
2620 glEnable GL_TEXTURE_2D; 3286 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 3288 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3289 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2625 3291
2626 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2627
2628} 3293}
2629 3294
2630############################################################################# 3295#############################################################################
2631 3296
2632package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2633 3298
2634use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2635 3300
2636our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2637 3302
2638sub moveto { 3303sub moveto {
2639 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2640 3305
2641 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2669 glPopMatrix; 3334 glPopMatrix;
2670} 3335}
2671 3336
2672############################################################################# 3337#############################################################################
2673 3338
2674package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2675 3340
2676our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2677 3342
2678sub new { 3343sub new {
2679 my $class = shift; 3344 my $class = shift;
2680 3345
2681 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2693 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2694} 3359}
2695 3360
2696############################################################################# 3361#############################################################################
2697 3362
2698package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2699 3364
2700our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2701 3366
2702use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2703 3368
2704sub new { 3369sub new {
2705 my $class = shift; 3370 my $class = shift;
2706 3371
2707 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2710 ) 3375 )
2711} 3376}
2712 3377
2713sub set_tooltip_from { 3378sub set_tooltip_from {
2714 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2715 3383
2716 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2717 3385
2718 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 3389 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 3390 . "visible $widget->{visible}";
2723 } 3391 }
2724 3392
3393 $tooltip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//;
3395
2725 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2726 markup => $tooltip, 3397 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 3399 fontsize => 0.8,
2729 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2730 ellipsise => 0, 3401 ellipsise => 0,
2731 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2732 ); 3403 );
2733} 3404}
2734 3405
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 3410
2740 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2741} 3412}
2742 3413
2743sub size_allocate { 3414sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2745 3416
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 3417 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 3418}
2748 3419
2749sub visibility_change { 3420sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 3421 my ($self, $visible) = @_;
2751 3422
2752 return unless $visible; 3423 return unless $visible;
2753 3424
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2756 or return; 3427 or return;
2757 3428
3429 if ($widget->{visible}) {
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 3431
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 3433 if $x + $self->{w} > $self->{root}{w};
2762 3434
2763 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2764 }); 3439 });
2765} 3440}
2766 3441
2767sub _draw { 3442sub _draw {
2768 my ($self) = @_; 3443 my ($self) = @_;
… …
2792 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2793} 3468}
2794 3469
2795############################################################################# 3470#############################################################################
2796 3471
2797package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2798 3473
2799our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2800 3475
2801use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2802 3477
2803sub new { 3478sub new {
2804 my $class = shift; 3479 my $class = shift;
2805 3480
2806 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2807 aspect => 1, 3484 aspect => 1,
2808 can_events => 0, 3485 can_events => 0,
2809 @_, 3486 @_,
2810 ); 3487 );
2811 3488
2812 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2814 3491
2815 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1, 3494 hard => 1,
2818 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2819 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2820 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2821 $widget->update; 3501 $self->update;
2822 }, 3502 },
2823 ); 3503 );
3504
3505 $self->update_face;
2824 } 3506 }
2825 3507
2826 $self 3508 $self
2827} 3509}
2828 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2829sub size_request { 3524sub size_request {
2830 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2831} 3540}
2832 3541
2833sub update { 3542sub update {
2834 my ($self) = @_; 3543 my ($self) = @_;
2835 3544
… …
2841sub _draw { 3550sub _draw {
2842 my ($self) = @_; 3551 my ($self) = @_;
2843 3552
2844 return unless $::CONN; 3553 return unless $::CONN;
2845 3554
2846 my $face; 3555 $self->SUPER::_draw;
2847 3556
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2850 3558 or return;
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854 3559
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2856 3561
2857 if ($tex) { 3562 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3565 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2863 } 3568 }
2864} 3569}
2865 3570
2866sub DESTROY { 3571sub destroy {
2867 my ($self) = @_; 3572 my ($self) = @_;
2868 3573
2869 $self->{timer}->cancel 3574 $self->{timer}->cancel
2870 if $self->{timer}; 3575 if $self->{timer};
2871 3576
2872 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2873} 3578}
2874 3579
2875############################################################################# 3580#############################################################################
2876 3581
2877package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
2878 3583
2879our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
2880 3585
2881# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
2882 3587
2883############################################################################# 3588#############################################################################
2884 3589
2885package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2886 3591
2887our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2888 3593
2889use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2890 3595
2891sub new { 3596sub new {
2892 my $class = shift; 3597 my $class = shift;
2893 3598
2894 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2895 items => [], 3600 items => [],
2896 z => 100, 3601 z => 100,
2897 @_, 3602 @_,
2898 ); 3603 );
2899 3604
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2901 3606
2902 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2904 3609
2905 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2906 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2907 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2908 can_hover => 1, 3616 can_hover => 1,
2909 can_events => 1, 3617 can_events => 1,
3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
2910 text => $widget; 3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2911 } 3632 }
2912 3633
2913 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2914 3635
2915 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2920 3641
2921# popup given the event (must be a mouse button down event currently) 3642# popup given the event (must be a mouse button down event currently)
2922sub popup { 3643sub popup {
2923 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2924 3645
2925 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2926 3647
2927 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3649 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2930 3651
2931 $self->show; 3652 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3654}
2934 3655
2935sub mouse_motion { 3656sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2937 3658
2938 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2941 3662
2942 0 3663 0
2943} 3664}
2944 3665
2945sub button_up { 3666sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2947 3668
2948 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3670 undef $GRAB;
2950 $self->hide; 3671 $self->hide;
2951 3672
2952 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3675 } else {
2955 return 0 3676 return 0
2956 } 3677 }
2957 3678
2958 1 3679 1
2959} 3680}
2960 3681
2961############################################################################# 3682#############################################################################
2962 3683
2963package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
2964 3685
2965our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
2966 3687
2967sub new { 3688sub new {
2968 my $class = shift; 3689 my $class = shift;
2969 3690
2970 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
2984 3705
2985 $self->{current} = $self->{children}[0] 3706 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3707 if @{ $self->{children} };
2987} 3708}
2988 3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
2989sub set_current_page { 3716sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3717 my ($self, $page_or_widget) = @_;
2991 3718
2992 my $widget = ref $page_or_widget 3719 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3720 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3721 : $self->{children}[$page_or_widget];
2995 3722
2996 $self->{current} = $widget; 3723 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3725
2999 $self->_emit (page_changed => $self->{current}); 3726 $self->emit (page_changed => $self->{current});
3000 3727
3001 $self->realloc; 3728 $self->realloc;
3002} 3729}
3003 3730
3004sub visible_children { 3731sub visible_children {
… …
3009 my ($self) = @_; 3736 my ($self) = @_;
3010 3737
3011 $self->{current}->size_request 3738 $self->{current}->size_request
3012} 3739}
3013 3740
3014sub size_allocate { 3741sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3742 my ($self, $w, $h) = @_;
3016 3743
3017 $self->{current}->configure (0, 0, $w, $h); 3744 $self->{current}->configure (0, 0, $w, $h);
3745
3746 1
3018} 3747}
3019 3748
3020sub _draw { 3749sub _draw {
3021 my ($self) = @_; 3750 my ($self) = @_;
3022 3751
3023 $self->{current}->draw; 3752 $self->{current}->draw;
3024} 3753}
3025 3754
3026############################################################################# 3755#############################################################################
3027 3756
3028package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3029 3758
3030our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3031 3760
3032sub new { 3761sub new {
3033 my $class = shift; 3762 my $class = shift;
3034 3763
3035 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3039 @_, 3768 @_,
3040 ); 3769 );
3041 3770
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3046} 3775}
3047 3776
3048sub add { 3777sub add {
3049 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3050 3779
3051 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3052 3781
3053 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3054 markup => $title, 3783 markup => $title,
3055 tooltip => $tooltip, 3784 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3057 ); 3786 );
3058 3787
3059 $self->{multiplexer}->add ($widget); 3788 $self->{multiplexer}->add ($widget);
3060} 3789}
3061 3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3062sub set_current_page { 3797sub set_current_page {
3063 my ($self, $page) = @_; 3798 my ($self, $page) = @_;
3064 3799
3065 $self->{multiplexer}->set_current_page ($page); 3800 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3802}
3068 3803
3069############################################################################# 3804#############################################################################
3070 3805
3071package CFClient::UI::Statusbox; 3806package CFPlus::UI::Selector;
3072 3807
3808use utf8;
3809
3073our @ISA = CFClient::UI::VBox::; 3810our @ISA = CFPlus::UI::Button::;
3074 3811
3075sub new { 3812sub new {
3076 my $class = shift; 3813 my $class = shift;
3077 3814
3078 $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
3816 options => [], # [value, title, longdesc], ...
3817 value => undef,
3818 @_,
3819 );
3820
3821 $self->_set_value ($self->{value});
3822
3823 $self
3824}
3825
3826sub invoke_button_down {
3827 my ($self, $ev) = @_;
3828
3829 my @menu_items;
3830
3831 for (@{ $self->{options} }) {
3832 my ($value, $title, $tooltip) = @$_;
3833
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 }
3836
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838}
3839
3840sub _set_value {
3841 my ($self, $value) = @_;
3842
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3844 or return;
3845
3846 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]);
3849}
3850
3851sub set_value {
3852 my ($self, $value) = @_;
3853
3854 return unless $self->{value} ne $value;
3855
3856 $self->_set_value ($value);
3857 $self->emit (changed => $value);
3858}
3859
3860#############################################################################
3861
3862package CFPlus::UI::Statusbox;
3863
3864our @ISA = CFPlus::UI::VBox::;
3865
3866sub new {
3867 my $class = shift;
3868
3869 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3870 fontsize => 0.8,
3080 @_, 3871 @_,
3081 ) 3872 );
3873
3874 CFPlus::weaken (my $this = $self);
3875
3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3877
3878 $self
3082} 3879}
3083 3880
3084sub reorder { 3881sub reorder {
3085 my ($self) = @_; 3882 my ($self) = @_;
3086 my $NOW = time; 3883 my $NOW = Time::HiRes::time;
3884
3885 # freeze display when hovering over any label
3886 return if $CFPlus::UI::TOOLTIP->{owner}
3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3888 values %{ $self->{item} };
3087 3889
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3892 }
3091 3893
… …
3094 my @items = sort { 3896 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3897 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3898 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3899 } values %{ $self->{item} };
3098 3900
3901 $self->{timer}->interval (1);
3902
3099 my $count = 10 + 1; 3903 my $count = 10 + 1;
3100 for my $item (@items) { 3904 for my $item (@items) {
3101 last unless --$count; 3905 last unless --$count;
3102 3906
3103 push @widgets, $item->{label} ||= do { 3907 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3908 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3909 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3910 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3911 : $item->{text};
3108 3912
3109 for ($short) { 3913 for ($short) {
3110 s/^\s+//; 3914 s/^\s+//;
3111 s/\s+/ /g; 3915 s/\s+/ /g;
3112 } 3916 }
3113 3917
3114 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3115 markup => $short, 3919 markup => $short,
3116 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3924 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3925 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3926 can_events => 1,
3123 can_hover => 1 3927 can_hover => 1
3124 }; 3928 };
3929
3930 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3931 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3932 $label->update;
3933 $label->set_max_size (undef, $label->{req_h} * $diff)
3934 if $diff < 1;
3935 $self->{timer}->interval (1/30);
3936 } else {
3937 $label->{fg}[3] = $item->{fg}[3] || 1;
3938 }
3939
3940 push @widgets, $label;
3125 } 3941 }
3126 3942
3127 $self->clear; 3943 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3944 $self->SUPER::add (reverse @widgets);
3129} 3945}
… …
3134 $text =~ s/^\s+//; 3950 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3951 $text =~ s/\s+$//;
3136 3952
3137 return unless $text; 3953 return unless $text;
3138 3954
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3955 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3956
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3957 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3958
3143 if (my $item = $self->{item}{$group}) { 3959 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3960 if ($item->{text} eq $text) {
3145 $item->{count}++; 3961 $item->{count}++;
3146 } else { 3962 } else {
3147 $item->{count} = 1; 3963 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
3149 } 3965 }
3150 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3968 delete $item->{label};
3153 } else { 3969 } else {
3154 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
3161 count => 1, 3977 count => 1,
3162 %arg, 3978 %arg,
3163 }; 3979 };
3164 } 3980 }
3165 3981
3982 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3983 $self->reorder;
3984 });
3167} 3985}
3168 3986
3169sub reconfigure { 3987sub reconfigure {
3170 my ($self) = @_; 3988 my ($self) = @_;
3171 3989
… …
3174 3992
3175 $self->reorder; 3993 $self->reorder;
3176 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
3177} 3995}
3178 3996
3997sub destroy {
3998 my ($self) = @_;
3999
4000 $self->{timer}->cancel;
4001
4002 $self->SUPER::destroy;
4003}
4004
3179############################################################################# 4005#############################################################################
3180 4006
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; 4007package CFPlus::UI::Root;
3477 4008
3478our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3479 4010
4011use List::Util qw(min max);
4012
3480use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3481 4014
3482sub new { 4015sub new {
3483 my $class = shift; 4016 my $class = shift;
3484 4017
3485 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3486 visible => 1, 4019 visible => 1,
3487 @_, 4020 @_,
3488 ); 4021 );
3489 4022
3490 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3491 4024
3492 $self 4025 $self
3493} 4026}
3494 4027
3495sub size_request { 4028sub size_request {
… …
3510 $coord = $max - $size if $coord > $max - $size; 4043 $coord = $max - $size if $coord > $max - $size;
3511 4044
3512 int $coord + 0.5 4045 int $coord + 0.5
3513} 4046}
3514 4047
3515sub size_allocate { 4048sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
3517 4050
3518 for my $child ($self->children) { 4051 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 4053
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 4057 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 4058 $Y = _to_pixel $Y, $H, $self->{h};
3526 4059
3527 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
3528 } 4061 }
4062
4063 1
3529} 4064}
3530 4065
3531sub coord2local { 4066sub coord2local {
3532 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3533 4068
… …
3618 4153
3619 delete $queue{$widget+0}; 4154 delete $queue{$widget+0};
3620 4155
3621 my ($w, $h) = $widget->size_request; 4156 my ($w, $h) = $widget->size_request;
3622 4157
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4158 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4159 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4160
4161 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4162 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 4163
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 4164 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 4165 $h = $widget->{force_h} if exists $widget->{force_h};
3628 4166
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4167 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3655 4193
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657 4195
3658 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3659 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3660 4207
3661 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3662 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
3663 4210
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3689 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3690 glLoadIdentity; 4237 glLoadIdentity;
3691 4238
3692 { 4239 {
3693 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3694 4241
3695 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3697 }
3698 4244
3699 $self->_draw; 4245 $self->_draw;
4246 }
3700} 4247}
3701 4248
3702############################################################################# 4249#############################################################################
3703 4250
3704package CFClient::UI; 4251package CFPlus::UI;
3705 4252
3706$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3707$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3708 4255
37091 42561
3710 4257

Diff Legend

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