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

Diff Legend

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