ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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