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.270 by elmex, Fri Jun 2 09:02:49 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;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1192
1054sub new { 1193sub new {
1055 my ($class, %arg) = @_; 1194 my ($class, %arg) = @_;
1056 1195
1057 my $title = delete $arg{title}; 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;
1292
1293my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1295 mipmap => 1, wrap => 1;
1296
1297my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300
1301sub new {
1302 my ($class, %arg) = @_;
1058 1303
1059 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1307 border => 0.6,
1063 can_events => 1, 1308 can_events => 1,
1064 min_w => 16, 1309 min_w => 64,
1065 min_h => 16, 1310 min_h => 32,
1066 %arg, 1311 %arg,
1067 ); 1312 );
1068 1313
1069 $self->{title} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1070 align => 0, 1315 align => 0,
1071 valign => 1, 1316 valign => 1,
1072 text => $title, 1317 text => $self->{title},
1073 fontsize => $self->{border} 1318 fontsize => $self->{border},
1074 if defined $title; 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 }
1075 1329
1076 $self 1330 $self
1077} 1331}
1078 1332
1079sub add { 1333sub add {
1080 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1081 1335
1082 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1339}
1085 1340
1086sub border { 1341sub border {
1087 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1088} 1343}
1089 1344
1090sub size_request { 1345sub size_request {
1091 my ($self) = @_; 1346 my ($self) = @_;
1092 1347
1093 $self->{title}->size_request 1348 $self->{title_widget}->size_request
1094 if $self->{title}; 1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1095 1353
1096 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1097 1355
1098 ( 1356 (
1099 $w + $self->border * 2, 1357 $w + $self->border * 2,
1100 $h + $self->border * 2, 1358 $h + $self->border * 2,
1101 ) 1359 )
1102} 1360}
1103 1361
1104sub size_allocate { 1362sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1106 1364
1107 if ($self->{title}) { 1365 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1366 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1367 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1369 }
1112 1370
1113 my $border = $self->border; 1371 my $border = $self->border;
1114 1372
1115 $h -= List::Util::max 0, $border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1375
1376 $self->child->configure ($border, $border, $w, $h);
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;
1117 1388
1118 $self->child->configure ($border, $border, $w, $h); 1389 1
1119} 1390}
1120 1391
1121sub button_down { 1392sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1123 1394
1124 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1396 my $border = $self->border;
1126 1397
… …
1142 my $dy = $ev->{y} - $oy; 1413 my $dy = $ev->{y} - $oy;
1143 1414
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1415 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1416 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1417
1418 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1419 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1420 };
1150 1421
1151 } elsif ($lr ^ $td) { 1422 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1423 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1424 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1427 my ($ev, $x, $y) = @_;
1157 1428
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1430
1160 $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});
1161 }; 1434 };
1435 } else {
1436 return 0;
1437 }
1438
1162 } 1439 1
1163} 1440}
1164 1441
1165sub button_up { 1442sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1167 1444
1168 delete $self->{motion}; 1445 ! ! delete $self->{motion}
1169} 1446}
1170 1447
1171sub mouse_motion { 1448sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1173 1450
1174 $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
1175} 1462}
1176 1463
1177sub _draw { 1464sub _draw {
1178 my ($self) = @_; 1465 my ($self) = @_;
1179 1466
… …
1205 1492
1206 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1207 1494
1208 $child->draw; 1495 $child->draw;
1209 1496
1210 if ($self->{title}) { 1497 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1498 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1213 } 1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1214} 1506}
1215 1507
1216############################################################################# 1508#############################################################################
1217 1509
1218package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1219 1511
1220our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1221 1513
1222use List::Util qw(max sum); 1514use List::Util qw(max sum);
1223 1515
1224use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1225 1517
1226sub new { 1518sub new {
1227 my $class = shift; 1519 my $class = shift;
1228 1520
1229 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1230 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1231 @_, 1525 @_,
1232 ) 1526 )
1233} 1527}
1234 1528
1235sub children { 1529sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237} 1531}
1238 1532
1533# TODO: store row/col info in child widget and use standard add/del
1239sub add { 1534sub add {
1240 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1241 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1242 $child->set_parent ($self); 1539 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1244 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1245 $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 }
1246} 1556}
1247 1557
1248# 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?
1249sub clear { 1559sub clear {
1250 my ($self) = @_; 1560 my ($self) = @_;
… …
1291 (sum @$ws), 1601 (sum @$ws),
1292 (sum @$hs), 1602 (sum @$hs),
1293 ) 1603 )
1294} 1604}
1295 1605
1296sub size_allocate { 1606sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1298 1608
1299 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1300 1610
1301 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1302 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1303 1613
1304 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1305 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1306 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1307 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1308 1618
1309 # linearly scale sizes
1310 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312 1620
1313 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
1314 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1315 1630
1316 my $y; 1631 my $y;
1317 1632
1318 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1319 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1333 } 1648 }
1334 1649
1335 $y += $row_h; 1650 $y += $row_h;
1336 } 1651 }
1337 1652
1653 1
1338} 1654}
1339 1655
1340sub find_widget { 1656sub find_widget {
1341 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1342 1658
… …
1361 } 1677 }
1362} 1678}
1363 1679
1364############################################################################# 1680#############################################################################
1365 1681
1366package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1367 1683
1684use List::Util qw(min max);
1685
1368our @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::;
1369 1767
1370sub size_request { 1768sub size_request {
1371 my ($self) = @_; 1769 my ($self) = @_;
1372 1770
1373 $self->{vertical} 1771 $self->{vertical}
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1779 )
1382} 1780}
1383 1781
1384sub size_allocate { 1782sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1386 1784
1387 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1389 1787
1390 my @req; 1788 my @req;
1391 1789
1392 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1394 } else { 1792 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1397 1795
1398 if ($req > $space) { 1796 if ($req > $space) {
1399 # ah well, not enough space 1797 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1401 } else { 1799 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1801
1404 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1405 1803
1406 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1805 for 0 .. $#children;
1408 } 1806 }
1409 } 1807 }
1410 1808
1411 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1412 1810
1413 my $pos = 0; 1811 my $pos = 0;
1414 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1416 $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));
1417 1815
1418 $pos += $alloc; 1816 $pos += $alloc;
1419 } 1817 }
1420 1818
1421 1 1819 1
1422} 1820}
1423 1821
1424############################################################################# 1822#############################################################################
1425 1823
1426package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1427 1825
1428our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1429 1827
1430sub new { 1828sub new {
1431 my $class = shift; 1829 my $class = shift;
1432 1830
1433 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1436 ) 1834 )
1437} 1835}
1438 1836
1439############################################################################# 1837#############################################################################
1440 1838
1441package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1442 1840
1443our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1444 1842
1445sub new { 1843sub new {
1446 my $class = shift; 1844 my $class = shift;
1447 1845
1448 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1451 ) 1849 )
1452} 1850}
1453 1851
1454############################################################################# 1852#############################################################################
1455 1853
1456package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1457 1855
1458our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1459 1857
1460use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1461 1859
1462sub new { 1860sub new {
1463 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1464 1862
1465 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1468 #active_bg => none 1866 #active_bg => none
1469 #font => default_font 1867 #font => default_font
1470 #text => initial text 1868 #text => initial text
1471 #markup => initial narkup 1869 #markup => initial narkup
1472 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1473 ellipsise => 3, # end 1872 ellipsise => 3, # end
1474 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1475 fontsize => 1, 1874 fontsize => 1,
1476 align => -1, 1875 align => -1,
1477 valign => -1, 1876 valign => -1,
1478 padding_x => 2, 1877 padding_x => 2,
1479 padding_y => 2, 1878 padding_y => 2,
1480 can_events => 0, 1879 can_events => 0,
1481 %arg 1880 %arg
1482 ); 1881 );
1483 1882
1484 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1485 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1486 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1487 $self->{template} = $layout; 1886 $self->{template} = $layout;
1488 } 1887 }
1489 1888
1490 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1494 } 1893 }
1495 1894
1496 $self 1895 $self
1497} 1896}
1498 1897
1499sub escape($) {
1500 local $_ = $_[0];
1501
1502 s/&/&amp;/g;
1503 s/>/&gt;/g;
1504 s/</&lt;/g;
1505
1506 $_
1507}
1508
1509sub update { 1898sub update {
1510 my ($self) = @_; 1899 my ($self) = @_;
1511 1900
1512 delete $self->{texture}; 1901 delete $self->{texture};
1513 $self->SUPER::update; 1902 $self->SUPER::update;
1514} 1903}
1515 1904
1905sub realloc {
1906 my ($self) = @_;
1907
1908 delete $self->{ox};
1909 $self->SUPER::realloc;
1910}
1911
1516sub set_text { 1912sub set_text {
1517 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1518 1914
1519 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1521 1917
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1524 1919
1920 delete $self->{size_req};
1525 $self->realloc; 1921 $self->realloc;
1526 $self->update; 1922 $self->update;
1527} 1923}
1528 1924
1529sub set_markup { 1925sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1534 1930
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1932
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1539 1934
1935 delete $self->{size_req};
1540 $self->realloc; 1936 $self->realloc;
1541 $self->update; 1937 $self->update;
1542} 1938}
1543 1939
1544sub size_request { 1940sub size_request {
1545 my ($self) = @_; 1941 my ($self) = @_;
1546 1942
1943 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1949
1553 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1554 1951
1555 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1556 $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);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1956
1559 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1560 1958
1561 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1961 }
1962
1963 [$w, $h]
1563 } 1964 };
1564 1965
1565 ($w, $h) 1966 @{ $self->{size_req} }
1566} 1967}
1567 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1568sub size_allocate { 1973sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1570 1975
1571 delete $self->{ox}; 1976 delete $self->{ox};
1572 1977
1573 delete $self->{texture} 1978 delete $self->{texture}
1574 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
1575} 1982}
1576 1983
1577sub set_fontsize { 1984sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1579 1986
1580 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1581 delete $self->{texture}; 1989 delete $self->{texture};
1582 1990
1583 $self->realloc; 1991 $self->realloc;
1584} 1992}
1585 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1586sub _draw { 2003sub _draw {
1587 my ($self) = @_; 2004 my ($self) = @_;
1588 2005
1589 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1590 2007
1591 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2015
1599 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1600 }; 2017 };
1601 2018
1602 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1606 2023
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 2027 };
1611 2028
1612 glEnable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 2031
1615 if ($tex->{format} == GL_ALPHA) { 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 2033}
1624 2034
1625############################################################################# 2035#############################################################################
1626 2036
1627package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1628 2038
1629our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1630 2040
1631use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1632 2042
1633sub new { 2043sub new {
1634 my $class = shift; 2044 my $class = shift;
1635 2045
1636 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1640 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1641 can_hover => 1, 2051 can_hover => 1,
1642 can_focus => 1, 2052 can_focus => 1,
1643 valign => 0, 2053 valign => 0,
1644 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1645 #text => ... 2056 #text => ...
2057 #hidden => "*",
1646 @_ 2058 @_
1647 ) 2059 )
1648} 2060}
1649 2061
1650sub _set_text { 2062sub _set_text {
… …
1652 2064
1653 delete $self->{cur_h}; 2065 delete $self->{cur_h};
1654 2066
1655 return if $self->{text} eq $text; 2067 return if $self->{text} eq $text;
1656 2068
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 2070 $self->{text} = $text;
1661 2071
1662 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1664 2075
1665 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
2079 $self->update;
1666} 2080}
1667 2081
1668sub set_text { 2082sub set_text {
1669 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1670 2084
1671 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 2086 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 2087}
1676 2088
1677sub get_text { 2089sub get_text {
1678 $_[0]{text} 2090 $_[0]{text}
1679} 2091}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1685 2097
1686 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1687} 2099}
1688 2100
1689sub key_down { 2101sub invoke_key_down {
1690 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1691 2103
1692 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1695 2107
1696 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;
1697 2111
1698 if ($uni == 8) { 2112 if ($uni == 8) {
1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1701 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1702 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1703 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1704 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1705 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1706 } 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 = "";
1707 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 2136 $self->emit ('escape');
1712 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
2141 } else {
2142 return 0;
1714 } 2143 }
1715 2144
1716 $self->_set_text ($text); 2145 $self->_set_text ($text);
1717 2146
1718 $self->realloc; 2147 $self->realloc;
1719} 2148 $self->update;
1720 2149
2150 1
2151}
2152
1721sub focus_in { 2153sub invoke_focus_in {
1722 my ($self) = @_; 2154 my ($self) = @_;
1723 2155
1724 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1725 2157
1726 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1727} 2159}
1728 2160
1729sub button_down { 2161sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1731 2163
1732 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 2165
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 2167
1736 # byte-index to char-index 2168 # byte-index to char-index
1737 my $text = $self->{text}; 2169 my $text = $self->{text};
1738 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1740 2172
1741 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1742 $self->update; 2174 $self->update;
2175
2176 1
1743} 2177}
1744 2178
1745sub mouse_motion { 2179sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1747# 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
1748} 2184}
1749 2185
1750sub _draw { 2186sub _draw {
1751 my ($self) = @_; 2187 my ($self) = @_;
1752 2188
1753 local $self->{fg} = $self->{fg}; 2189 local $self->{fg} = $self->{fg};
1754 2190
1755 if ($FOCUS == $self) { 2191 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 2192 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 2193 $self->{fg} = $self->{active_fg};
1758 } else { 2194 } else {
1759 glColor @{$self->{bg}}; 2195 glColor_premultiply @{$self->{bg}};
1760 } 2196 }
1761 2197
1762 glEnable GL_BLEND; 2198 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 2200 glBegin GL_QUADS;
1765 glVertex 0 , 0; 2201 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 2202 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 2203 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 2204 glVertex $self->{w}, 0;
… …
1779 utf8::encode $text; 2215 utf8::encode $text;
1780 2216
1781 @$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)
1782 } 2218 }
1783 2219
1784 glColor @{$self->{fg}};
1785 glBegin GL_LINES; 2220 glBegin GL_LINES;
1786 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};
1787 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};
1788 glEnd; 2223 glEnd;
1789 } 2224 }
1790} 2225}
1791 2226
2227#############################################################################
2228
1792package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1793 2230
1794our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1795 2232
1796use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1797 2234
1798sub key_down { 2235sub invoke_key_down {
1799 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1800 2237
1801 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1802 2239
1803 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1804 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1806 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1809 $self->update; 2247 $self->update;
1810 2248
1811 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1814 } 2252 }
1815 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1816 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1818 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1819 } 2257 }
1820 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1821 } 2259 }
1822 2260
1823 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1824 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1825 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826 2264
1827 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1828 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1829 } else { 2267 } else {
1830 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1831 } 2269 }
1832 2270
1833 } else { 2271 } else {
1834 $self->SUPER::key_down ($ev); 2272 return $self->SUPER::invoke_key_down ($ev)
2273 }
2274
1835 } 2275 1
1836
1837} 2276}
1838 2277
1839############################################################################# 2278#############################################################################
1840 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
1841package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1842 2320
1843our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1844 2322
1845use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1846 2324
1847my @tex = 2325my @tex =
1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1850 2328
1851sub new { 2329sub new {
1852 my $class = shift; 2330 my $class = shift;
1853 2331
… …
1862 can_events => 1, 2340 can_events => 1,
1863 @_ 2341 @_
1864 ) 2342 )
1865} 2343}
1866 2344
1867sub activate { }
1868
1869sub button_up { 2345sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1871 2347
1872 $self->emit ("activate") 2348 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
2351
2352 1
1875} 2353}
1876 2354
1877sub _draw { 2355sub _draw {
1878 my ($self) = @_; 2356 my ($self) = @_;
1879 2357
1880 local $self->{fg} = $self->{fg}; 2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2359
1886 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1889 2363
… …
1894 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1895} 2369}
1896 2370
1897############################################################################# 2371#############################################################################
1898 2372
1899package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1900 2374
1901our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1902 2376
1903my @tex = 2377my @tex =
1904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1905 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906 2380
1907use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1908 2382
1909sub new { 2383sub new {
1910 my $class = shift; 2384 my $class = shift;
1911 2385
1912 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1926 my ($self) = @_; 2400 my ($self) = @_;
1927 2401
1928 (6) x 2 2402 (6) x 2
1929} 2403}
1930 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1931sub button_down { 2413sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1933 2415
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2418 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2419 } else {
2420 return 0
2421 }
2422
1938 } 2423 1
1939} 2424}
1940 2425
1941sub _draw { 2426sub _draw {
1942 my ($self) = @_; 2427 my ($self) = @_;
1943 2428
… …
1958 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1959} 2444}
1960 2445
1961############################################################################# 2446#############################################################################
1962 2447
1963package CFClient::UI::Image; 2448package CFPlus::UI::Image;
1964 2449
1965our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
1966 2451
1967use CFClient::OpenGL; 2452use CFPlus::OpenGL;
1968use Carp qw/confess/;
1969 2453
1970our %loaded_images; 2454our %texture_cache;
1971 2455
1972sub new { 2456sub new {
1973 my $class = shift; 2457 my $class = shift;
1974 2458
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
1976 2463
1977 $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";
1978 2466
1979 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 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;
1981 2469
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
1983 2471
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2473
1988 $self 2474 $self
1989} 2475}
1990 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
1991sub size_request { 2492sub size_request {
1992 my ($self) = @_; 2493 my ($self) = @_;
1993 2494
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
1995} 2496}
1996 2497
1997sub _draw { 2498sub _draw {
1998 my ($self) = @_; 2499 my ($self) = @_;
1999 2500
… …
2009 } 2510 }
2010 2511
2011 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2514
2014 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
2015 2516
2016 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2017} 2518}
2018 2519
2019############################################################################# 2520#############################################################################
2020 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
2021package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
2022 2559
2023our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2024 2561
2025use List::Util qw(min max); 2562use List::Util qw(min max);
2026 2563
2027use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2028 2565
2029my %tex = ( 2566my %tex = (
2030 food => [ 2567 food => [
2031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033 ], 2570 ],
2034 grace => [ 2571 grace => [
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2036 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/
2037 ], 2574 ],
2038 hp => [ 2575 hp => [
2039 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041 ], 2578 ],
2042 mana => [ 2579 mana => [
2043 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2044 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/
2045 ], 2582 ],
2046); 2583);
2047 2584
2048# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2647
2111 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2112 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);
2113 2653
2114 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2659
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2660 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2661 glBegin GL_QUADS;
… …
2135 2676
2136 if ($t3) { 2677 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2684 glEnd;
2144 } 2685 }
2145 2686
2146 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2147 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2148} 2689}
2149 2690
2150############################################################################# 2691#############################################################################
2151 2692
2152package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2153 2694
2154our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2155 2696
2156sub new { 2697sub new {
2157 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2158 2699
2159 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2161 can_hover => 1, 2702 can_hover => 1,
2162 can_events => 1, 2703 can_events => 1,
2163 %arg, 2704 %arg,
2164 ); 2705 );
2165 2706
2166 $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");
2167 $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);
2168 $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");
2169 2710
2170 $self 2711 $self
2171} 2712}
2172 2713
2173sub set_fontsize { 2714sub set_fontsize {
… …
2194 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2195} 2736}
2196 2737
2197############################################################################# 2738#############################################################################
2198 2739
2199package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2200 2741
2201use strict; 2742use strict;
2202 2743
2203use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2204 2745
2205our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2206 2747
2207my @tex = 2748my @tex =
2208 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2210 2751
2211sub new { 2752sub new {
2212 my $class = shift; 2753 my $class = shift;
2213 2754
… …
2234 $self->update; 2775 $self->update;
2235 2776
2236 $self 2777 $self
2237} 2778}
2238 2779
2239sub changed { }
2240
2241sub set_range { 2780sub set_range {
2242 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2243 2782
2244 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2245 2784
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2248} 2789}
2249 2790
2250sub set_value { 2791sub set_value {
2251 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2252 2793
… …
2263 if $unit; 2804 if $unit;
2264 2805
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2807
2267 if ($value != $old_value) { 2808 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2269 $self->update; 2810 $self->update;
2270 } 2811 }
2271} 2812}
2272 2813
2273sub size_request { 2814sub size_request {
2274 my ($self) = @_; 2815 my ($self) = @_;
2275 2816
2276 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2277} 2818}
2278 2819
2279sub button_down { 2820sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2281 2822
2282 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2824
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2826
2286 $self->mouse_motion ($ev, $x, $y); 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2828}
2288 2829
2289sub mouse_motion { 2830sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2291 2832
2292 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2835
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2836 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2837
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2838 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2839
2299 $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
2300 } 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
2301} 2858}
2302 2859
2303sub update { 2860sub update {
2304 my ($self) = @_; 2861 my ($self) = @_;
2305 2862
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 2871 $self->set_value ($self->{range}[0]);
2308 2872
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2873 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2874 my $range = ($hi - $page - $lo) || 1e-100;
2311 2875
… …
2317 $value = ($value - $lo) / $range; 2881 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2882 $value = $value * $self->{scale} + $self->{offset};
2319 2883
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2884 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2885 $self->{knob_w} = $knob_w;
2322 }); 2886 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2887
2330 $self->SUPER::_draw (); 2888 $self->SUPER::_draw ();
2331 2889
2332 glScale $self->{w}, $self->{h}; 2890 glScale $self->{w}, $self->{h};
2333 2891
… …
2353 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2354} 2912}
2355 2913
2356############################################################################# 2914#############################################################################
2357 2915
2358package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2359 2917
2360our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2361 2919
2362sub new { 2920sub new {
2363 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2364 2922
2365 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2366 2924
2367 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift }, 2928 to_value => sub { shift },
2371 from_value => sub { shift }, 2929 from_value => sub { shift },
2372 %arg, 2930 %arg,
2373 ); 2931 );
2374 2932
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2396 2954
2397############################################################################# 2955#############################################################################
2398 2956
2399package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2400 2958
2401our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2402 2960
2403use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2404 2962
2405sub new { 2963sub new {
2406 my $class = shift; 2964 my $class = shift;
2407 2965
2408 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2409 fontsize => 1, 2967 fontsize => 1,
2410 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2411 #font => default_font 2970 #font => default_font
2412 @_, 2971 @_,
2413 2972
2414 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2415 par => [], 2974 par => [],
2975 max_par => 0,
2416 height => 0, 2976 height => 0,
2417 children => [ 2977 children => [
2418 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2420 ], 2980 ],
2421 ); 2981 );
2422 2982
2423 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2424 2984
… …
2430 2990
2431 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2992 $self->reflow;
2433} 2993}
2434 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
2435sub size_allocate { 3004sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2437 3006
2438 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 3009
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $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});
2443 3014
2444 $self->reflow; 3015 $self->reflow;
2445}
2446 3016
2447sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2448 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) = @_;
2449 3033
2450 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2451 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $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});
2454 $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}}
2455 3047 );
3048
2456 $layout->size 3049 $layout
2457} 3050}
2458 3051
2459sub reflow { 3052sub reflow {
2460 my ($self) = @_; 3053 my ($self) = @_;
2461 3054
… …
2468 3061
2469 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2471} 3064}
2472 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
2473sub clear { 3081sub clear {
2474 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2475 3086
2476 $self->{par} = []; 3087 $self->{par} = [];
2477 $self->{height} = 0; 3088 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 3090}
2480 3091
2481sub add_paragraph { 3092sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2483 3094
2484 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2485 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
2486 $self->{height} += $h; 3147 $self->{height} = $height;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488 }
2489 3149
2490 $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 }
2491} 3156}
2492 3157
2493sub update { 3158sub update {
2494 my ($self) = @_; 3159 my ($self) = @_;
2495 3160
… …
2497 3162
2498 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2499 3164
2500 delete $self->{texture}; 3165 delete $self->{texture};
2501 3166
2502 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 3171
2505 if (delete $self->{need_reflow}) {
2506 my $height = 0;
2507
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2523
2524 $self->{height} = $height;
2525
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527
2528 delete $self->{texture};
2529 }
2530
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 3173 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2534 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;
2535 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2536 3185
2537 my $y0 = $top; 3186 my $y0 = $top;
2538 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2539 3188
2540 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2552 3192
2553 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 3195
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2559 3197
2560 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2561 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 }
2562 } 3210 }
2563 3211
2564 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2565 } 3214 }
2566 3215
2567 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2568 }; 3217 };
2569 }); 3218 });
2570} 3219}
2571 3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
3228}
3229
2572sub _draw { 3230sub _draw {
2573 my ($self) = @_; 3231 my ($self) = @_;
2574 3232
2575 glEnable GL_TEXTURE_2D; 3233 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 3235 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2580 3238
2581 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2582
2583} 3240}
2584 3241
2585############################################################################# 3242#############################################################################
2586 3243
2587package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2588 3245
2589use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2590 3247
2591our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2592 3249
2593sub moveto { 3250sub moveto {
2594 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2595 3252
2596 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2624 glPopMatrix; 3281 glPopMatrix;
2625} 3282}
2626 3283
2627############################################################################# 3284#############################################################################
2628 3285
2629package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2630 3287
2631our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2632 3289
2633sub new { 3290sub new {
2634 my $class = shift; 3291 my $class = shift;
2635 3292
2636 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2648 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2649} 3306}
2650 3307
2651############################################################################# 3308#############################################################################
2652 3309
2653package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2654 3311
2655our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2656 3313
2657use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2658 3315
2659sub new { 3316sub new {
2660 my $class = shift; 3317 my $class = shift;
2661 3318
2662 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2665 ) 3322 )
2666} 3323}
2667 3324
2668sub set_tooltip_from { 3325sub set_tooltip_from {
2669 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2670 3330
2671 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2672 3332
2673 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 3336 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 3337 . "visible $widget->{visible}";
2678 } 3338 }
2679 3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2680 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2681 markup => $tooltip, 3344 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 3346 fontsize => 0.8,
2684 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2685 ellipsise => 0, 3348 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 ); 3350 );
2688} 3351}
2689 3352
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 3357
2695 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2696} 3359}
2697 3360
2698sub size_allocate { 3361sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2700 3363
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 3365}
2703 3366
2704sub visibility_change { 3367sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2706 3369
2707 return unless $visible; 3370 return unless $visible;
2708 3371
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2711 or return; 3374 or return;
2712 3375
3376 if ($widget->{visible}) {
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 3378
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2717 3381
2718 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2719 }); 3386 });
2720} 3387}
2721 3388
2722sub _draw { 3389sub _draw {
2723 my ($self) = @_; 3390 my ($self) = @_;
… …
2747 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2748} 3415}
2749 3416
2750############################################################################# 3417#############################################################################
2751 3418
2752package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2753 3420
2754our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2755 3422
2756use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2757 3424
2758sub new { 3425sub new {
2759 my $class = shift; 3426 my $class = shift;
2760 3427
2761 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2762 aspect => 1, 3431 aspect => 1,
2763 can_events => 0, 3432 can_events => 0,
2764 @_, 3433 @_,
2765 ); 3434 );
2766 3435
2767 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2769 3438
2770 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1, 3441 hard => 1,
2773 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2774 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2775 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2776 $widget->update; 3448 $self->update;
2777 }, 3449 },
2778 ); 3450 );
3451
3452 $self->update_face;
2779 } 3453 }
2780 3454
2781 $self 3455 $self
2782} 3456}
2783 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
2784sub size_request { 3471sub size_request {
2785 (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)
2786} 3487}
2787 3488
2788sub update { 3489sub update {
2789 my ($self) = @_; 3490 my ($self) = @_;
2790 3491
… …
2796sub _draw { 3497sub _draw {
2797 my ($self) = @_; 3498 my ($self) = @_;
2798 3499
2799 return unless $::CONN; 3500 return unless $::CONN;
2800 3501
2801 my $face; 3502 $self->SUPER::_draw;
2802 3503
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2805 3505 or return;
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809 3506
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2811 3508
2812 if ($tex) { 3509 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3512 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2818 } 3515 }
2819} 3516}
2820 3517
2821sub DESTROY { 3518sub destroy {
2822 my ($self) = @_; 3519 my ($self) = @_;
2823 3520
2824 $self->{timer}->cancel 3521 $self->{timer}->cancel
2825 if $self->{timer}; 3522 if $self->{timer};
2826 3523
2827 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2828} 3525}
2829 3526
2830############################################################################# 3527#############################################################################
2831 3528
3529package CFPlus::UI::Buttonbar;
3530
3531our @ISA = CFPlus::UI::HBox::;
3532
3533# TODO: should actually wrap buttons and other goodies.
3534
3535#############################################################################
3536
2832package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2833 3538
2834our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2835 3540
2836use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2837 3542
2838sub new { 3543sub new {
2839 my $class = shift; 3544 my $class = shift;
2840 3545
2841 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2842 items => [], 3547 items => [],
2843 z => 100, 3548 z => 100,
2844 @_, 3549 @_,
2845 ); 3550 );
2846 3551
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848 3553
2849 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2851 3556
2852 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2853 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2854 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2855 can_hover => 1, 3563 can_hover => 1,
2856 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,
2857 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2858 } 3579 }
2859 3580
2860 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2861 3582
2862 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2867 3588
2868# 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)
2869sub popup { 3590sub popup {
2870 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2871 3592
2872 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2873 3594
2874 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3596 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2877 3598
2878 $self->show; 3599 $self->show;
2879 $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);
2880} 3601}
2881 3602
2882sub mouse_motion { 3603sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2884 3605
2885 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3609
3610 0
3611}
3612
2890sub button_up { 3613sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2892 3615
2893 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3617 undef $GRAB;
2895 $self->hide; 3618 $self->hide;
2896 3619
2897 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
3622 } else {
3623 return 0
3624 }
3625
2899 } 3626 1
2900} 3627}
2901 3628
2902############################################################################# 3629#############################################################################
2903 3630
2904package CFClient::UI::Statusbox; 3631package CFPlus::UI::Multiplexer;
2905 3632
2906our @ISA = CFClient::UI::VBox::; 3633our @ISA = CFPlus::UI::Container::;
2907 3634
2908sub new { 3635sub new {
2909 my $class = shift; 3636 my $class = shift;
2910 3637
2911 $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 (
2912 fontsize => 0.8, 3817 fontsize => 0.8,
2913 @_, 3818 @_,
2914 ) 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
2915} 3826}
2916 3827
2917sub reorder { 3828sub reorder {
2918 my ($self) = @_; 3829 my ($self) = @_;
2919 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} };
2920 3836
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3839 }
2924 3840
… …
2927 my @items = sort { 3843 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3844 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3845 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3846 } values %{ $self->{item} };
2931 3847
3848 $self->{timer}->interval (1);
3849
2932 my $count = 10 + 1; 3850 my $count = 10 + 1;
2933 for my $item (@items) { 3851 for my $item (@items) {
2934 last unless --$count; 3852 last unless --$count;
2935 3853
2936 push @widgets, $item->{label} ||= do { 3854 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3855 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3856 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3857 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3858 : $item->{text};
2941 3859
2942 for ($short) { 3860 for ($short) {
2943 s/^\s+//; 3861 s/^\s+//;
2944 s/\s+/ /g; 3862 s/\s+/ /g;
2945 } 3863 }
2946 3864
2947 new CFClient::UI::Label 3865 new CFPlus::UI::Label
2948 markup => $short, 3866 markup => $short,
2949 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3871 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3872 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3873 can_events => 1,
2956 can_hover => 1 3874 can_hover => 1
2957 }; 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;
2958 } 3888 }
2959 3889
2960 $self->clear; 3890 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3891 $self->SUPER::add (reverse @widgets);
2962} 3892}
… …
2967 $text =~ s/^\s+//; 3897 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3898 $text =~ s/\s+$//;
2969 3899
2970 return unless $text; 3900 return unless $text;
2971 3901
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3902 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3903
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3904 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3905
2976 if (my $item = $self->{item}{$group}) { 3906 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3907 if ($item->{text} eq $text) {
2978 $item->{count}++; 3908 $item->{count}++;
2979 } else { 3909 } else {
2980 $item->{count} = 1; 3910 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
2982 } 3912 }
2983 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3915 delete $item->{label};
2986 } else { 3916 } else {
2987 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
2994 count => 1, 3924 count => 1,
2995 %arg, 3925 %arg,
2996 }; 3926 };
2997 } 3927 }
2998 3928
3929 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3930 $self->reorder;
3931 });
3000} 3932}
3001 3933
3002sub reconfigure { 3934sub reconfigure {
3003 my ($self) = @_; 3935 my ($self) = @_;
3004 3936
… …
3007 3939
3008 $self->reorder; 3940 $self->reorder;
3009 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
3010} 3942}
3011 3943
3944sub destroy {
3945 my ($self) = @_;
3946
3947 $self->{timer}->cancel;
3948
3949 $self->SUPER::destroy;
3950}
3951
3012############################################################################# 3952#############################################################################
3013 3953
3014package CFClient::UI::Inventory;
3015
3016our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018sub new {
3019 my $class = shift;
3020
3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_,
3024 );
3025
3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
3310package CFClient::UI::Root; 3954package CFPlus::UI::Root;
3311 3955
3312our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3313 3957
3958use List::Util qw(min max);
3959
3314use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3315 3961
3316sub new { 3962sub new {
3317 my $class = shift; 3963 my $class = shift;
3318 3964
3319 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3320 visible => 1, 3966 visible => 1,
3321 @_, 3967 @_,
3322 ); 3968 );
3323 3969
3324 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3325 3971
3326 $self 3972 $self
3327} 3973}
3328 3974
3329sub size_request { 3975sub size_request {
… …
3344 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3345 3991
3346 int $coord + 0.5 3992 int $coord + 0.5
3347} 3993}
3348 3994
3349sub size_allocate { 3995sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3351 3997
3352 for my $child ($self->children) { 3998 for my $child ($self->children) {
3353 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)};
3354 4000
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3360 4006
3361 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3362 } 4008 }
4009
4010 1
3363} 4011}
3364 4012
3365sub coord2local { 4013sub coord2local {
3366 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3367 4015
… …
3452 4100
3453 delete $queue{$widget+0}; 4101 delete $queue{$widget+0};
3454 4102
3455 my ($w, $h) = $widget->size_request; 4103 my ($w, $h) = $widget->size_request;
3456 4104
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4105 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $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};
3459 4110
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 4111 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 4112 $h = $widget->{force_h} if exists $widget->{force_h};
3462 4113
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4114 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3489 4140
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491 4142
3492 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3493 $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};
3494 4154
3495 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3496 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3497 4157
3498 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}) {
… …
3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3523 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3524 glLoadIdentity; 4184 glLoadIdentity;
3525 4185
3526 { 4186 {
3527 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3528 4188
3529 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3531 }
3532 4191
3533 $self->_draw; 4192 $self->_draw;
4193 }
3534} 4194}
3535 4195
3536############################################################################# 4196#############################################################################
3537 4197
3538package CFClient::UI; 4198package CFPlus::UI;
3539 4199
3540$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3541$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3542 4202
35431 42031
3544 4204

Diff Legend

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