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.374 by root, Mon Jul 16 12:36:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
366 400
367 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
368 } 402 }
369} 403}
370 404
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
376} 411}
377 412
378sub set_max_size { 413sub set_max_size {
379 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
380 415
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
383} 420}
384 421
385sub set_tooltip { 422sub set_tooltip {
386 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
387 424
… …
390 427
391 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
392 429
393 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
394 431
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
398 } 435 }
399} 436}
400 437
401# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
402sub coord2local { 439sub coord2local {
403 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
404 441
442 Carp::confess unless $self->{parent};#d#
443
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 445}
407 446
408# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
409sub coord2global { 448sub coord2global {
410 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
411 450
451 Carp::confess unless $self->{parent};#d#
452
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 454}
414 455
415sub focus_in { 456sub invoke_focus_in {
416 my ($self) = @_; 457 my ($self) = @_;
417 458
418 return if $FOCUS == $self; 459 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
420 461
421 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
422 463
423 $self->_emit (focus_in => $focus); 464 $self->update;
424 465
425 $focus->update if $focus; 466 0
426 $FOCUS->update;
427} 467}
428 468
429sub focus_out { 469sub invoke_focus_out {
430 my ($self) = @_; 470 my ($self) = @_;
431 471
432 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
433 473
434 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
435 475
436 $self->_emit (focus_out => $focus); 476 $self->update;
437 477
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 479 unless $FOCUS;
442}
443 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
444sub mouse_motion { 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
863our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
864 950
865sub new { 951sub new {
866 my $class = shift; 952 my $class = shift;
867 953
868 $class->SUPER::new ( 954 $class->SUPER::new (
… …
881 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
882 968
883 ($w, $h) 969 ($w, $h)
884} 970}
885 971
886sub size_allocate { 972sub invoke_size_allocate {
887 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
888 974
889 my $child = $self->child; 975 my $child = $self->child;
890 976
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893 979
894 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
895 $self->update; 981 $self->update;
982
983 1
896} 984}
897 985
898sub set_offset { 986sub set_offset {
899 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
900 988
… …
926 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
927 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
928 ) { 1016 ) {
929 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
930 } else { 1018 } else {
931 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
932 } 1020 }
933} 1021}
934 1022
935sub _render { 1023sub _render {
936 my ($self) = @_; 1024 my ($self) = @_;
937 1025
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
940 1028
941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
942 1030
943 $self->SUPER::_render; 1031 $self->SUPER::_render;
944} 1032}
945 1033
946############################################################################# 1034#############################################################################
947 1035
948package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
949 1037
950our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
951 1039
952sub new { 1040sub new {
953 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
954 1044
955 my $self; 1045 my $self;
956 1046
957 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
958 vertical => 1, 1057 vertical => 1,
959 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
960 on_changed => sub { 1059 on_changed => sub {
961 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
962 }, 1062 },
963 ; 1063 ;
964 1064
965 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
967 slider => $slider, 1069 hslider => $hslider,
968 @_, 1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1073 %arg,
969 ); 1074 );
970 1075
971 $self->{vp}->add ($self->{scrolled}); 1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
972 $self->add ($self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
973 $self->add ($self->{slider}); 1083
1084 $self->add ($child) if $child;
974 1085
975 $self 1086 $self
976} 1087}
977 1088
1089#TODO# update range on size_allocate depending on child
1090
1091sub add {
1092 my ($self, $widget) = @_;
1093
1094 $self->{vp}->add ($self->{child} = $widget);
1095}
1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
978sub update { 1131sub update {
979 my ($self) = @_; 1132 my ($self) = @_;
980 1133
981 $self->SUPER::update; 1134 $self->SUPER::update;
982 1135 $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} 1136}
987 1137
988sub size_allocate { 1138sub invoke_size_allocate {
989 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
990 1140
1141 $self->update_slider;
991 $self->SUPER::size_allocate ($w, $h); 1142 $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} 1143}
996
997#TODO# update range on size_allocate depending on child
998# update viewport offset on scroll
999 1144
1000############################################################################# 1145#############################################################################
1001 1146
1002package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1003 1148
1004our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1005 1150
1006use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1007 1152
1008sub new { 1153sub new {
1009 my $class = shift; 1154 my $class = shift;
1010 1155
1011 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1019 1164
1020 if ($self->{bg}) { 1165 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1166 my ($w, $h) = @$self{qw(w h)};
1022 1167
1023 glEnable GL_BLEND; 1168 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1169 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1170 glColor_premultiply @{ $self->{bg} };
1026 1171
1027 glBegin GL_QUADS; 1172 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1173 glVertex 0 , 0;
1029 glVertex 0 , $h; 1174 glVertex 0 , $h;
1030 glVertex $w, $h; 1175 glVertex $w, $h;
… …
1037 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1038} 1183}
1039 1184
1040############################################################################# 1185#############################################################################
1041 1186
1042package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1043 1188
1044our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1045 1190
1046use CFClient::OpenGL; 1191use 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 1192
1056sub new { 1193sub new {
1057 my ($class, %arg) = @_; 1194 my ($class, %arg) = @_;
1058 1195
1059 my $title = delete $arg{title}; 1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1292
1293my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1295 mipmap => 1, wrap => 1;
1296
1297my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300
1301sub new {
1302 my ($class, %arg) = @_;
1060 1303
1061 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1307 border => 0.6,
1065 can_events => 1, 1308 can_events => 1,
1066 min_w => 16, 1309 min_w => 64,
1067 min_h => 16, 1310 min_h => 32,
1068 %arg, 1311 %arg,
1069 ); 1312 );
1070 1313
1071 $self->{title} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1072 align => 0, 1315 align => 0,
1073 valign => 1, 1316 valign => 1,
1074 text => $title, 1317 text => $self->{title},
1075 fontsize => $self->{border} 1318 fontsize => $self->{border},
1076 if defined $title; 1319 if exists $self->{title};
1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1077 1329
1078 $self 1330 $self
1079} 1331}
1080 1332
1081sub add { 1333sub add {
1082 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1083 1335
1084 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1339}
1087 1340
1088sub border { 1341sub border {
1089 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1090} 1343}
1091 1344
1092sub size_request { 1345sub size_request {
1093 my ($self) = @_; 1346 my ($self) = @_;
1094 1347
1095 $self->{title}->size_request 1348 $self->{title_widget}->size_request
1096 if $self->{title}; 1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1097 1353
1098 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1099 1355
1100 ( 1356 (
1101 $w + $self->border * 2, 1357 $w + $self->border * 2,
1102 $h + $self->border * 2, 1358 $h + $self->border * 2,
1103 ) 1359 )
1104} 1360}
1105 1361
1106sub size_allocate { 1362sub invoke_size_allocate {
1107 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1108 1364
1109 if ($self->{title}) { 1365 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1366 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1367 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1113 } 1369 }
1114 1370
1115 my $border = $self->border; 1371 my $border = $self->border;
1116 1372
1117 $h -= List::Util::max 0, $border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1118 $w -= List::Util::max 0, $border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1375
1376 $self->child->configure ($border, $border, $w, $h);
1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1119 1388
1120 $self->child->configure ($border, $border, $w, $h); 1389 1
1121} 1390}
1122 1391
1123sub button_down { 1392sub invoke_button_down {
1124 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1125 1394
1126 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1127 my $border = $self->border; 1396 my $border = $self->border;
1128 1397
… …
1144 my $dy = $ev->{y} - $oy; 1413 my $dy = $ev->{y} - $oy;
1145 1414
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1415 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1416 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1417
1418 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1419 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1420 };
1152 1421
1153 } elsif ($lr ^ $td) { 1422 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1423 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1424 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1427 my ($ev, $x, $y) = @_;
1159 1428
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1430
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1432 # HACK: the next line is required to enforce placement
1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1434 };
1164 } else { 1435 } else {
1165 return 0; 1436 return 0;
1166 } 1437 }
1167 1438
1168 1 1439 1
1169} 1440}
1170 1441
1171sub button_up { 1442sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1173 1444
1174 !!delete $self->{motion} 1445 ! ! delete $self->{motion}
1175} 1446}
1176 1447
1177sub mouse_motion { 1448sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1179 1450
1180 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181 1452
1182 !!$self->{motion} 1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1183} 1462}
1184 1463
1185sub _draw { 1464sub _draw {
1186 my ($self) = @_; 1465 my ($self) = @_;
1187 1466
… …
1213 1492
1214 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1215 1494
1216 $child->draw; 1495 $child->draw;
1217 1496
1218 if ($self->{title}) { 1497 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1498 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1221 } 1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1222} 1506}
1223 1507
1224############################################################################# 1508#############################################################################
1225 1509
1226package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1227 1511
1228our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1229 1513
1230use List::Util qw(max sum); 1514use List::Util qw(max sum);
1231 1515
1232use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1233 1517
1234sub new { 1518sub new {
1235 my $class = shift; 1519 my $class = shift;
1236 1520
1237 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1238 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1239 @_, 1525 @_,
1240 ) 1526 )
1241} 1527}
1242 1528
1243sub children { 1529sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1245} 1531}
1246 1532
1533# TODO: store row/col info in child widget and use standard add/del
1247sub add { 1534sub add {
1248 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1249 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1250 $child->set_parent ($self); 1539 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1252 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1253 $self->realloc; 1545 $self->realloc;
1546}
1547
1548sub remove {
1549 my ($self, $child) = @_;
1550
1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1254} 1556}
1255 1557
1256# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1257sub clear { 1559sub clear {
1258 my ($self) = @_; 1560 my ($self) = @_;
… …
1299 (sum @$ws), 1601 (sum @$ws),
1300 (sum @$hs), 1602 (sum @$hs),
1301 ) 1603 )
1302} 1604}
1303 1605
1304sub size_allocate { 1606sub invoke_size_allocate {
1305 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1306 1608
1307 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1308 1610
1309 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1310 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1311 1613
1312 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1313 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1314 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1315 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1316 1618
1317 # linearly scale sizes
1318 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1319 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1320 1620
1321 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1322 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1323 1630
1324 my $y; 1631 my $y;
1325 1632
1326 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1341 } 1648 }
1342 1649
1343 $y += $row_h; 1650 $y += $row_h;
1344 } 1651 }
1345 1652
1653 1
1346} 1654}
1347 1655
1348sub find_widget { 1656sub find_widget {
1349 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1350 1658
… …
1369 } 1677 }
1370} 1678}
1371 1679
1372############################################################################# 1680#############################################################################
1373 1681
1374package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1375 1683
1684use List::Util qw(min max);
1685
1376our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1377 1767
1378sub size_request { 1768sub size_request {
1379 my ($self) = @_; 1769 my ($self) = @_;
1380 1770
1381 $self->{vertical} 1771 $self->{vertical}
… …
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 ) 1779 )
1390} 1780}
1391 1781
1392sub size_allocate { 1782sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1394 1784
1395 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1396 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1397 1787
1398 my @req; 1788 my @req;
1399 1789
1400 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1401 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1402 } else { 1792 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1404 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1405 1795
1406 if ($req > $space) { 1796 if ($req > $space) {
1407 # ah well, not enough space 1797 # ah well, not enough space
1408 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1409 } else { 1799 } else {
1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1411 1801
1412 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1413 1803
1414 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1415 for 0 .. $#$children; 1805 for 0 .. $#children;
1416 } 1806 }
1417 } 1807 }
1418 1808
1419 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1420 1810
1421 my $pos = 0; 1811 my $pos = 0;
1422 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1423 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1425 1815
1426 $pos += $alloc; 1816 $pos += $alloc;
1427 } 1817 }
1428 1818
1429 1 1819 1
1430} 1820}
1431 1821
1432############################################################################# 1822#############################################################################
1433 1823
1434package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1435 1825
1436our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1437 1827
1438sub new { 1828sub new {
1439 my $class = shift; 1829 my $class = shift;
1440 1830
1441 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1444 ) 1834 )
1445} 1835}
1446 1836
1447############################################################################# 1837#############################################################################
1448 1838
1449package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1450 1840
1451our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1452 1842
1453sub new { 1843sub new {
1454 my $class = shift; 1844 my $class = shift;
1455 1845
1456 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1459 ) 1849 )
1460} 1850}
1461 1851
1462############################################################################# 1852#############################################################################
1463 1853
1464package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1465 1855
1466our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1467 1857
1468use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1469 1859
1470sub new { 1860sub new {
1471 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1472 1862
1473 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1476 #active_bg => none 1866 #active_bg => none
1477 #font => default_font 1867 #font => default_font
1478 #text => initial text 1868 #text => initial text
1479 #markup => initial narkup 1869 #markup => initial narkup
1480 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1481 ellipsise => 3, # end 1872 ellipsise => 3, # end
1482 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1483 fontsize => 1, 1874 fontsize => 1,
1484 align => -1, 1875 align => -1,
1485 valign => -1, 1876 valign => -1,
1486 padding_x => 2, 1877 padding_x => 2,
1487 padding_y => 2, 1878 padding_y => 2,
1488 can_events => 0, 1879 can_events => 0,
1489 %arg 1880 %arg
1490 ); 1881 );
1491 1882
1492 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1493 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1494 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1495 $self->{template} = $layout; 1886 $self->{template} = $layout;
1496 } 1887 }
1497 1888
1498 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1502 } 1893 }
1503 1894
1504 $self 1895 $self
1505} 1896}
1506 1897
1507sub escape($) {
1508 local $_ = $_[0];
1509
1510 s/&/&amp;/g;
1511 s/>/&gt;/g;
1512 s/</&lt;/g;
1513
1514 $_
1515}
1516
1517sub update { 1898sub update {
1518 my ($self) = @_; 1899 my ($self) = @_;
1519 1900
1520 delete $self->{texture}; 1901 delete $self->{texture};
1521 $self->SUPER::update; 1902 $self->SUPER::update;
1522} 1903}
1523 1904
1905sub realloc {
1906 my ($self) = @_;
1907
1908 delete $self->{ox};
1909 $self->SUPER::realloc;
1910}
1911
1524sub set_text { 1912sub set_text {
1525 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1526 1914
1527 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1529 1917
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1532 1919
1920 delete $self->{size_req};
1533 $self->realloc; 1921 $self->realloc;
1534 $self->update; 1922 $self->update;
1535} 1923}
1536 1924
1537sub set_markup { 1925sub set_markup {
… …
1540 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1541 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1542 1930
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1932
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1547 1934
1935 delete $self->{size_req};
1548 $self->realloc; 1936 $self->realloc;
1549 $self->update; 1937 $self->update;
1550} 1938}
1551 1939
1552sub size_request { 1940sub size_request {
1553 my ($self) = @_; 1941 my ($self) = @_;
1554 1942
1943 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1949
1561 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1562 1951
1563 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1956
1567 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1568 1958
1569 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1961 }
1962
1963 [$w, $h]
1571 } 1964 };
1572 1965
1573 ($w, $h) 1966 @{ $self->{size_req} }
1574} 1967}
1575 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1576sub size_allocate { 1973sub invoke_size_allocate {
1577 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1578 1975
1579 delete $self->{ox}; 1976 delete $self->{ox};
1580 1977
1581 delete $self->{texture} 1978 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1583} 1982}
1584 1983
1585sub set_fontsize { 1984sub set_fontsize {
1586 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1587 1986
1588 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1589 delete $self->{texture}; 1989 delete $self->{texture};
1590 1990
1591 $self->realloc; 1991 $self->realloc;
1592} 1992}
1593 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1594sub _draw { 2003sub _draw {
1595 my ($self) = @_; 2004 my ($self) = @_;
1596 2005
1597 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1598 2007
1599 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1601 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1602 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606 2015
1607 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1608 }; 2017 };
1609 2018
1610 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1613 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1614 2023
1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1618 }; 2027 };
1619 2028
1620 glEnable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1622 2031
1623 if ($tex->{format} == GL_ALPHA) { 2032 $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} 2033}
1632 2034
1633############################################################################# 2035#############################################################################
1634 2036
1635package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1636 2038
1637our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1638 2040
1639use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1640 2042
1641sub new { 2043sub new {
1642 my $class = shift; 2044 my $class = shift;
1643 2045
1644 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1648 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1649 can_hover => 1, 2051 can_hover => 1,
1650 can_focus => 1, 2052 can_focus => 1,
1651 valign => 0, 2053 valign => 0,
1652 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1653 #text => ... 2056 #text => ...
2057 #hidden => "*",
1654 @_ 2058 @_
1655 ) 2059 )
1656} 2060}
1657 2061
1658sub _set_text { 2062sub _set_text {
… …
1660 2064
1661 delete $self->{cur_h}; 2065 delete $self->{cur_h};
1662 2066
1663 return if $self->{text} eq $text; 2067 return if $self->{text} eq $text;
1664 2068
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 2070 $self->{text} = $text;
1669 2071
1670 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1672 2075
1673 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
2079 $self->update;
1674} 2080}
1675 2081
1676sub set_text { 2082sub set_text {
1677 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1678 2084
1679 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 2086 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 2087}
1684 2088
1685sub get_text { 2089sub get_text {
1686 $_[0]{text} 2090 $_[0]{text}
1687} 2091}
… …
1692 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1693 2097
1694 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1695} 2099}
1696 2100
1697sub key_down { 2101sub invoke_key_down {
1698 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1699 2103
1700 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1701 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1702 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1703 2107
1704 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1705 2111
1706 if ($uni == 8) { 2112 if ($uni == 8) {
1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1708 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1709 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1710 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1711 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1712 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1713 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1714 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1715 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1716 } elsif ($sym == CFClient::SDLK_END) {
1717 $self->{cursor} = length $text;
1718 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1719 $self->_emit ('escape'); 2136 $self->emit ('escape');
1720 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1721 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else { 2141 } else {
1723 return 0; 2142 return 0;
1724 } 2143 }
1725 2144
1726 $self->_set_text ($text); 2145 $self->_set_text ($text);
1727 2146
1728 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1729 2149
1730 1 2150 1
1731} 2151}
1732 2152
1733sub focus_in { 2153sub invoke_focus_in {
1734 my ($self) = @_; 2154 my ($self) = @_;
1735 2155
1736 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1737 2157
1738 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1739} 2159}
1740 2160
1741sub button_down { 2161sub invoke_button_down {
1742 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1743 2163
1744 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1745 2165
1746 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1747 2167
1748 # byte-index to char-index 2168 # byte-index to char-index
1749 my $text = $self->{text}; 2169 my $text = $self->{text};
1750 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1751 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1752 2172
1753 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1754 $self->update; 2174 $self->update;
1755 2175
1756 1 2176 1
1757} 2177}
1758 2178
1759sub mouse_motion { 2179sub invoke_mouse_motion {
1760 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762 2182
1763 0 2183 1
1764} 2184}
1765 2185
1766sub _draw { 2186sub _draw {
1767 my ($self) = @_; 2187 my ($self) = @_;
1768 2188
1769 local $self->{fg} = $self->{fg}; 2189 local $self->{fg} = $self->{fg};
1770 2190
1771 if ($FOCUS == $self) { 2191 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 2192 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 2193 $self->{fg} = $self->{active_fg};
1774 } else { 2194 } else {
1775 glColor @{$self->{bg}}; 2195 glColor_premultiply @{$self->{bg}};
1776 } 2196 }
1777 2197
1778 glEnable GL_BLEND; 2198 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 2200 glBegin GL_QUADS;
1781 glVertex 0 , 0; 2201 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 2202 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 2203 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 2204 glVertex $self->{w}, 0;
… …
1795 utf8::encode $text; 2215 utf8::encode $text;
1796 2216
1797 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1798 } 2218 }
1799 2219
1800 glColor @{$self->{fg}};
1801 glBegin GL_LINES; 2220 glBegin GL_LINES;
1802 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1803 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1804 glEnd; 2223 glEnd;
1805 } 2224 }
1806} 2225}
1807 2226
2227#############################################################################
2228
1808package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1809 2230
1810our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1811 2232
1812use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1813 2234
1814sub key_down { 2235sub invoke_key_down {
1815 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1816 2237
1817 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1818 2239
1819 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1820 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1821 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1822 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1824 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1825 $self->update; 2247 $self->update;
1826 2248
1827 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1828 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1829 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1830 } 2252 }
1831 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1832 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1834 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1835 } 2257 }
1836 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1837 } 2259 }
1838 2260
1839 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1840 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1841 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1842 2264
1843 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1844 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1845 } else { 2267 } else {
1846 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1847 } 2269 }
1848 2270
1849 } else { 2271 } else {
1850 return $self->SUPER::key_down ($ev) 2272 return $self->SUPER::invoke_key_down ($ev)
1851 } 2273 }
1852 2274
1853 1 2275 1
1854} 2276}
1855 2277
1856############################################################################# 2278#############################################################################
1857 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1858package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1859 2320
1860our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1861 2322
1862use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1863 2324
1864my @tex = 2325my @tex =
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1867 2328
1868sub new { 2329sub new {
1869 my $class = shift; 2330 my $class = shift;
1870 2331
… …
1879 can_events => 1, 2340 can_events => 1,
1880 @_ 2341 @_
1881 ) 2342 )
1882} 2343}
1883 2344
1884sub activate { }
1885
1886sub button_up { 2345sub invoke_button_up {
1887 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1888 2347
1889 $self->emit ("activate") 2348 $self->emit ("activate")
1890 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1891 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
… …
1894} 2353}
1895 2354
1896sub _draw { 2355sub _draw {
1897 my ($self) = @_; 2356 my ($self) = @_;
1898 2357
1899 local $self->{fg} = $self->{fg}; 2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 2359
1905 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1908 2363
… …
1913 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1914} 2369}
1915 2370
1916############################################################################# 2371#############################################################################
1917 2372
1918package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1919 2374
1920our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1921 2376
1922my @tex = 2377my @tex =
1923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1924 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1925 2380
1926use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1927 2382
1928sub new { 2383sub new {
1929 my $class = shift; 2384 my $class = shift;
1930 2385
1931 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1945 my ($self) = @_; 2400 my ($self) = @_;
1946 2401
1947 (6) x 2 2402 (6) x 2
1948} 2403}
1949 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1950sub button_down { 2413sub invoke_button_down {
1951 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1952 2415
1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1955 $self->{state} = !$self->{state}; 2418 $self->toggle;
1956 $self->_emit (changed => $self->{state});
1957 } else { 2419 } else {
1958 return 0 2420 return 0
1959 } 2421 }
1960 2422
1961 1 2423 1
… …
1981 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1982} 2444}
1983 2445
1984############################################################################# 2446#############################################################################
1985 2447
1986package CFClient::UI::Image; 2448package CFPlus::UI::Image;
1987 2449
1988our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
1989 2451
1990use CFClient::OpenGL; 2452use CFPlus::OpenGL;
1991use Carp qw/confess/;
1992 2453
1993our %loaded_images; 2454our %texture_cache;
1994 2455
1995sub new { 2456sub new {
1996 my $class = shift; 2457 my $class = shift;
1997 2458
1998 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
1999 2463
2000 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2001 2466
2002 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2003 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2004 2469
2005 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2006 2471
2007 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2008
2009 $self->{aspect} = $tex->{w} / $tex->{h};
2010 2473
2011 $self 2474 $self
2012} 2475}
2013 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2014sub size_request { 2492sub size_request {
2015 my ($self) = @_; 2493 my ($self) = @_;
2016 2494
2017 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
2018} 2496}
2019 2497
2020sub _draw { 2498sub _draw {
2021 my ($self) = @_; 2499 my ($self) = @_;
2022 2500
… …
2032 } 2510 }
2033 2511
2034 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2036 2514
2037 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
2038 2516
2039 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2040} 2518}
2041 2519
2042############################################################################# 2520#############################################################################
2043 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
2044package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
2045 2559
2046our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2047 2561
2048use List::Util qw(min max); 2562use List::Util qw(min max);
2049 2563
2050use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2051 2565
2052my %tex = ( 2566my %tex = (
2053 food => [ 2567 food => [
2054 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2055 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2056 ], 2570 ],
2057 grace => [ 2571 grace => [
2058 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 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/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2060 ], 2574 ],
2061 hp => [ 2575 hp => [
2062 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2063 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2064 ], 2578 ],
2065 mana => [ 2579 mana => [
2066 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 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/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2068 ], 2582 ],
2069); 2583);
2070 2584
2071# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2131 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2132 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2133 2647
2134 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2136 2653
2137 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2659
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2660 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2661 glBegin GL_QUADS;
… …
2158 2676
2159 if ($t3) { 2677 if ($t3) {
2160 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2161 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2162 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2163 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2164 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2165 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2166 glEnd; 2684 glEnd;
2167 } 2685 }
2168 2686
2169 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2170 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2171} 2689}
2172 2690
2173############################################################################# 2691#############################################################################
2174 2692
2175package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2176 2694
2177our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2178 2696
2179sub new { 2697sub new {
2180 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2181 2699
2182 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2184 can_hover => 1, 2702 can_hover => 1,
2185 can_events => 1, 2703 can_events => 1,
2186 %arg, 2704 %arg,
2187 ); 2705 );
2188 2706
2189 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2190 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2191 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2192 2710
2193 $self 2711 $self
2194} 2712}
2195 2713
2196sub set_fontsize { 2714sub set_fontsize {
… …
2217 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2218} 2736}
2219 2737
2220############################################################################# 2738#############################################################################
2221 2739
2222package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2223 2741
2224use strict; 2742use strict;
2225 2743
2226use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2227 2745
2228our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2229 2747
2230my @tex = 2748my @tex =
2231 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2232 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2233 2751
2234sub new { 2752sub new {
2235 my $class = shift; 2753 my $class = shift;
2236 2754
… …
2257 $self->update; 2775 $self->update;
2258 2776
2259 $self 2777 $self
2260} 2778}
2261 2779
2262sub changed { }
2263
2264sub set_range { 2780sub set_range {
2265 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2266 2782
2267 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2268 2784
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2271} 2789}
2272 2790
2273sub set_value { 2791sub set_value {
2274 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2275 2793
… …
2286 if $unit; 2804 if $unit;
2287 2805
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289 2807
2290 if ($value != $old_value) { 2808 if ($value != $old_value) {
2291 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2292 $self->update; 2810 $self->update;
2293 } 2811 }
2294} 2812}
2295 2813
2296sub size_request { 2814sub size_request {
2297 my ($self) = @_; 2815 my ($self) = @_;
2298 2816
2299 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2300} 2818}
2301 2819
2302sub button_down { 2820sub invoke_button_down {
2303 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2304 2822
2305 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2306 2824
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308 2826
2309 $self->mouse_motion ($ev, $x, $y) 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2310} 2828}
2311 2829
2312sub mouse_motion { 2830sub invoke_mouse_motion {
2313 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2314 2832
2315 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317 2835
… …
2325 } 2843 }
2326 2844
2327 1 2845 1
2328} 2846}
2329 2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2858}
2859
2330sub update { 2860sub update {
2331 my ($self) = @_; 2861 my ($self) = @_;
2332 2862
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2863 delete $self->{knob_w};
2864 $self->SUPER::update;
2865}
2866
2867sub _draw {
2868 my ($self) = @_;
2869
2870 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2871 $self->set_value ($self->{range}[0]);
2335 2872
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2873 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2874 my $range = ($hi - $page - $lo) || 1e-100;
2338 2875
… …
2344 $value = ($value - $lo) / $range; 2881 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2882 $value = $value * $self->{scale} + $self->{offset};
2346 2883
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2884 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2885 $self->{knob_w} = $knob_w;
2349 }); 2886 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2887
2357 $self->SUPER::_draw (); 2888 $self->SUPER::_draw ();
2358 2889
2359 glScale $self->{w}, $self->{h}; 2890 glScale $self->{w}, $self->{h};
2360 2891
… …
2380 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2381} 2912}
2382 2913
2383############################################################################# 2914#############################################################################
2384 2915
2385package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2386 2917
2387our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2388 2919
2389sub new { 2920sub new {
2390 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2391 2922
2392 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2393 2924
2394 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift }, 2928 to_value => sub { shift },
2398 from_value => sub { shift }, 2929 from_value => sub { shift },
2399 %arg, 2930 %arg,
2400 ); 2931 );
2401 2932
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2423 2954
2424############################################################################# 2955#############################################################################
2425 2956
2426package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2427 2958
2428our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2429 2960
2430use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2431 2962
2432sub new { 2963sub new {
2433 my $class = shift; 2964 my $class = shift;
2434 2965
2435 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2436 fontsize => 1, 2967 fontsize => 1,
2437 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2438 #font => default_font 2970 #font => default_font
2439 @_, 2971 @_,
2440 2972
2441 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2442 par => [], 2974 par => [],
2975 max_par => 0,
2443 height => 0, 2976 height => 0,
2444 children => [ 2977 children => [
2445 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2446 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2447 ], 2980 ],
2448 ); 2981 );
2449 2982
2450 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2451 2984
… …
2457 2990
2458 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2459 $self->reflow; 2992 $self->reflow;
2460} 2993}
2461 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2462sub size_allocate { 3004sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2464 3006
2465 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2466 3009
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 3014
2471 $self->reflow; 3015 $self->reflow;
2472}
2473 3016
2474sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2475 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2476 3033
2477 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2478 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2482 3047 );
3048
2483 $layout->size 3049 $layout
2484} 3050}
2485 3051
2486sub reflow { 3052sub reflow {
2487 my ($self) = @_; 3053 my ($self) = @_;
2488 3054
… …
2495 3061
2496 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2498} 3064}
2499 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2500sub clear { 3081sub clear {
2501 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2502 3086
2503 $self->{par} = []; 3087 $self->{par} = [];
2504 $self->{height} = 0; 3088 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506} 3090}
2507 3091
2508sub add_paragraph { 3092sub add_paragraph {
2509 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2510 3094
2511 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2512 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2513 $self->{height} += $h; 3147 $self->{height} = $height;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2515 }
2516 3149
2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2518} 3156}
2519 3157
2520sub update { 3158sub update {
2521 my ($self) = @_; 3159 my ($self) = @_;
2522 3160
… …
2524 3162
2525 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2526 3164
2527 delete $self->{texture}; 3165 delete $self->{texture};
2528 3166
2529 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 3171
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 { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 3173 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2561 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2562 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2563 3185
2564 my $y0 = $top; 3186 my $y0 = $top;
2565 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2566 3188
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}}) { 3189 for my $para (@{$self->{par}}) {
2578 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2579 3192
2580 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2582 $layout->set_width ($W - $par->[3]);
2583 $layout->set_markup ($par->[4]);
2584 3195
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2586 3197
2587 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2589 } 3210 }
2590 3211
2591 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2592 } 3214 }
2593 3215
2594 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2595 }; 3217 };
2596 }); 3218 });
2597} 3219}
2598 3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
3228}
3229
2599sub _draw { 3230sub _draw {
2600 my ($self) = @_; 3231 my ($self) = @_;
2601 3232
2602 glEnable GL_TEXTURE_2D; 3233 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 3235 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2607 3238
2608 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2609
2610} 3240}
2611 3241
2612############################################################################# 3242#############################################################################
2613 3243
2614package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2615 3245
2616use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2617 3247
2618our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2619 3249
2620sub moveto { 3250sub moveto {
2621 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2622 3252
2623 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2651 glPopMatrix; 3281 glPopMatrix;
2652} 3282}
2653 3283
2654############################################################################# 3284#############################################################################
2655 3285
2656package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2657 3287
2658our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2659 3289
2660sub new { 3290sub new {
2661 my $class = shift; 3291 my $class = shift;
2662 3292
2663 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2675 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2676} 3306}
2677 3307
2678############################################################################# 3308#############################################################################
2679 3309
2680package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2681 3311
2682our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2683 3313
2684use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2685 3315
2686sub new { 3316sub new {
2687 my $class = shift; 3317 my $class = shift;
2688 3318
2689 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2692 ) 3322 )
2693} 3323}
2694 3324
2695sub set_tooltip_from { 3325sub set_tooltip_from {
2696 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2697 3330
2698 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2699 3332
2700 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 3336 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 3337 . "visible $widget->{visible}";
2705 } 3338 }
2706 3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2707 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2708 markup => $tooltip, 3344 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 3346 fontsize => 0.8,
2711 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2712 ellipsise => 0, 3348 ellipsise => 0,
2713 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2714 ); 3350 );
2715} 3351}
2716 3352
… …
2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2721 3357
2722 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2723} 3359}
2724 3360
2725sub size_allocate { 3361sub invoke_size_allocate {
2726 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2727 3363
2728 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2729} 3365}
2730 3366
2731sub visibility_change { 3367sub invoke_visibility_change {
2732 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2733 3369
2734 return unless $visible; 3370 return unless $visible;
2735 3371
2736 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2738 or return; 3374 or return;
2739 3375
3376 if ($widget->{visible}) {
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 3378
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2744 3381
2745 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2746 }); 3386 });
2747} 3387}
2748 3388
2749sub _draw { 3389sub _draw {
2750 my ($self) = @_; 3390 my ($self) = @_;
… …
2774 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2775} 3415}
2776 3416
2777############################################################################# 3417#############################################################################
2778 3418
2779package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2780 3420
2781our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2782 3422
2783use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2784 3424
2785sub new { 3425sub new {
2786 my $class = shift; 3426 my $class = shift;
2787 3427
2788 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2789 aspect => 1, 3431 aspect => 1,
2790 can_events => 0, 3432 can_events => 0,
2791 @_, 3433 @_,
2792 ); 3434 );
2793 3435
2794 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2796 3438
2797 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1, 3441 hard => 1,
2800 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2801 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2802 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2803 $widget->update; 3448 $self->update;
2804 }, 3449 },
2805 ); 3450 );
3451
3452 $self->update_face;
2806 } 3453 }
2807 3454
2808 $self 3455 $self
2809} 3456}
2810 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2811sub size_request { 3471sub size_request {
2812 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2813} 3487}
2814 3488
2815sub update { 3489sub update {
2816 my ($self) = @_; 3490 my ($self) = @_;
2817 3491
… …
2823sub _draw { 3497sub _draw {
2824 my ($self) = @_; 3498 my ($self) = @_;
2825 3499
2826 return unless $::CONN; 3500 return unless $::CONN;
2827 3501
2828 my $face; 3502 $self->SUPER::_draw;
2829 3503
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2832 3505 or return;
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836 3506
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2838 3508
2839 if ($tex) { 3509 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 3512 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2845 } 3515 }
2846} 3516}
2847 3517
2848sub DESTROY { 3518sub destroy {
2849 my ($self) = @_; 3519 my ($self) = @_;
2850 3520
2851 $self->{timer}->cancel 3521 $self->{timer}->cancel
2852 if $self->{timer}; 3522 if $self->{timer};
2853 3523
2854 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2855} 3525}
2856 3526
2857############################################################################# 3527#############################################################################
2858 3528
3529package CFPlus::UI::Buttonbar;
3530
3531our @ISA = CFPlus::UI::HBox::;
3532
3533# TODO: should actually wrap buttons and other goodies.
3534
3535#############################################################################
3536
2859package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2860 3538
2861our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2862 3540
2863use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2864 3542
2865sub new { 3543sub new {
2866 my $class = shift; 3544 my $class = shift;
2867 3545
2868 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2869 items => [], 3547 items => [],
2870 z => 100, 3548 z => 100,
2871 @_, 3549 @_,
2872 ); 3550 );
2873 3551
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2875 3553
2876 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2878 3556
2879 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2880 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2881 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2882 can_hover => 1, 3563 can_hover => 1,
2883 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2884 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2885 } 3579 }
2886 3580
2887 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2888 3582
2889 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2894 3588
2895# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2896sub popup { 3590sub popup {
2897 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2898 3592
2899 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2900 3594
2901 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2902 $GRAB = $self; 3596 $GRAB = $self;
2903 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2904 3598
2905 $self->show; 3599 $self->show;
2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2907} 3601}
2908 3602
2909sub mouse_motion { 3603sub invoke_mouse_motion {
2910 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2911 3605
2912 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2914 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2915 3609
2916 0 3610 0
2917} 3611}
2918 3612
2919sub button_up { 3613sub invoke_button_up {
2920 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2921 3615
2922 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2923 undef $GRAB; 3617 undef $GRAB;
2924 $self->hide; 3618 $self->hide;
2925 3619
2926 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2927 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
2928 } else { 3622 } else {
2929 return 0 3623 return 0
2930 } 3624 }
2931 3625
2932 1 3626 1
2933} 3627}
2934 3628
2935############################################################################# 3629#############################################################################
2936 3630
2937package CFClient::UI::Statusbox; 3631package CFPlus::UI::Multiplexer;
2938 3632
2939our @ISA = CFClient::UI::VBox::; 3633our @ISA = CFPlus::UI::Container::;
2940 3634
2941sub new { 3635sub new {
2942 my $class = shift; 3636 my $class = shift;
2943 3637
2944 $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 @_,
3640 );
3641
3642 $self->{current} = $self->{children}[0]
3643 if @{ $self->{children} };
3644
3645 $self
3646}
3647
3648sub add {
3649 my ($self, @widgets) = @_;
3650
3651 $self->SUPER::add (@widgets);
3652
3653 $self->{current} = $self->{children}[0]
3654 if @{ $self->{children} };
3655}
3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3663sub set_current_page {
3664 my ($self, $page_or_widget) = @_;
3665
3666 my $widget = ref $page_or_widget
3667 ? $page_or_widget
3668 : $self->{children}[$page_or_widget];
3669
3670 $self->{current} = $widget;
3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3672
3673 $self->emit (page_changed => $self->{current});
3674
3675 $self->realloc;
3676}
3677
3678sub visible_children {
3679 $_[0]{current}
3680}
3681
3682sub size_request {
3683 my ($self) = @_;
3684
3685 $self->{current}->size_request
3686}
3687
3688sub invoke_size_allocate {
3689 my ($self, $w, $h) = @_;
3690
3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3694}
3695
3696sub _draw {
3697 my ($self) = @_;
3698
3699 $self->{current}->draw;
3700}
3701
3702#############################################################################
3703
3704package CFPlus::UI::Notebook;
3705
3706our @ISA = CFPlus::UI::VBox::;
3707
3708sub new {
3709 my $class = shift;
3710
3711 my $self = $class->SUPER::new (
3712 buttonbar => (new CFPlus::UI::Buttonbar),
3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3714 # filter => # will be put between multiplexer and $self
3715 @_,
3716 );
3717
3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720
3721 $self
3722}
3723
3724sub add {
3725 my ($self, $title, $widget, $tooltip) = @_;
3726
3727 CFPlus::weaken $self;
3728
3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3730 markup => $title,
3731 tooltip => $tooltip,
3732 on_activate => sub { $self->set_current_page ($widget) },
3733 );
3734
3735 $self->{multiplexer}->add ($widget);
3736}
3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3744sub set_current_page {
3745 my ($self, $page) = @_;
3746
3747 $self->{multiplexer}->set_current_page ($page);
3748 $self->emit (page_changed => $self->{multiplexer}{current});
3749}
3750
3751#############################################################################
3752
3753package CFPlus::UI::Selector;
3754
3755use utf8;
3756
3757our @ISA = CFPlus::UI::Button::;
3758
3759sub new {
3760 my $class = shift;
3761
3762 my $self = $class->SUPER::new (
3763 options => [], # [value, title, longdesc], ...
3764 value => undef,
3765 @_,
3766 );
3767
3768 $self->_set_value ($self->{value});
3769
3770 $self
3771}
3772
3773sub invoke_button_down {
3774 my ($self, $ev) = @_;
3775
3776 my @menu_items;
3777
3778 for (@{ $self->{options} }) {
3779 my ($value, $title, $tooltip) = @$_;
3780
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 }
3783
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785}
3786
3787sub _set_value {
3788 my ($self, $value) = @_;
3789
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3791 or return;
3792
3793 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]);
3796}
3797
3798sub set_value {
3799 my ($self, $value) = @_;
3800
3801 return unless $self->{value} ne $value;
3802
3803 $self->_set_value ($value);
3804 $self->emit (changed => $value);
3805}
3806
3807#############################################################################
3808
3809package CFPlus::UI::Statusbox;
3810
3811our @ISA = CFPlus::UI::VBox::;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3817 fontsize => 0.8,
2946 @_, 3818 @_,
2947 ) 3819 );
3820
3821 CFPlus::weaken (my $this = $self);
3822
3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3824
3825 $self
2948} 3826}
2949 3827
2950sub reorder { 3828sub reorder {
2951 my ($self) = @_; 3829 my ($self) = @_;
2952 my $NOW = time; 3830 my $NOW = Time::HiRes::time;
3831
3832 # freeze display when hovering over any label
3833 return if $CFPlus::UI::TOOLTIP->{owner}
3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3835 values %{ $self->{item} };
2953 3836
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3839 }
2957 3840
… …
2960 my @items = sort { 3843 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3844 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3845 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3846 } values %{ $self->{item} };
2964 3847
3848 $self->{timer}->interval (1);
3849
2965 my $count = 10 + 1; 3850 my $count = 10 + 1;
2966 for my $item (@items) { 3851 for my $item (@items) {
2967 last unless --$count; 3852 last unless --$count;
2968 3853
2969 push @widgets, $item->{label} ||= do { 3854 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3855 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3856 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3857 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3858 : $item->{text};
2974 3859
2975 for ($short) { 3860 for ($short) {
2976 s/^\s+//; 3861 s/^\s+//;
2977 s/\s+/ /g; 3862 s/\s+/ /g;
2978 } 3863 }
2979 3864
2980 new CFClient::UI::Label 3865 new CFPlus::UI::Label
2981 markup => $short, 3866 markup => $short,
2982 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3871 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3872 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3873 can_events => 1,
2989 can_hover => 1 3874 can_hover => 1
2990 }; 3875 };
3876
3877 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3878 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3879 $label->update;
3880 $label->set_max_size (undef, $label->{req_h} * $diff)
3881 if $diff < 1;
3882 $self->{timer}->interval (1/30);
3883 } else {
3884 $label->{fg}[3] = $item->{fg}[3] || 1;
3885 }
3886
3887 push @widgets, $label;
2991 } 3888 }
2992 3889
2993 $self->clear; 3890 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3891 $self->SUPER::add (reverse @widgets);
2995} 3892}
… …
3000 $text =~ s/^\s+//; 3897 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3898 $text =~ s/\s+$//;
3002 3899
3003 return unless $text; 3900 return unless $text;
3004 3901
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3902 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3903
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3904 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3905
3009 if (my $item = $self->{item}{$group}) { 3906 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3907 if ($item->{text} eq $text) {
3011 $item->{count}++; 3908 $item->{count}++;
3012 } else { 3909 } else {
3013 $item->{count} = 1; 3910 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
3015 } 3912 }
3016 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
3018 delete $item->{label}; 3915 delete $item->{label};
3019 } else { 3916 } else {
3020 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
3021 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
3027 count => 1, 3924 count => 1,
3028 %arg, 3925 %arg,
3029 }; 3926 };
3030 } 3927 }
3031 3928
3929 $ROOT->on_refresh (reorder => sub {
3032 $self->reorder; 3930 $self->reorder;
3931 });
3033} 3932}
3034 3933
3035sub reconfigure { 3934sub reconfigure {
3036 my ($self) = @_; 3935 my ($self) = @_;
3037 3936
… …
3040 3939
3041 $self->reorder; 3940 $self->reorder;
3042 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
3043} 3942}
3044 3943
3944sub destroy {
3945 my ($self) = @_;
3946
3947 $self->{timer}->cancel;
3948
3949 $self->SUPER::destroy;
3950}
3951
3045############################################################################# 3952#############################################################################
3046 3953
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; 3954package CFPlus::UI::Root;
3344 3955
3345our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3346 3957
3958use List::Util qw(min max);
3959
3347use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3348 3961
3349sub new { 3962sub new {
3350 my $class = shift; 3963 my $class = shift;
3351 3964
3352 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3353 visible => 1, 3966 visible => 1,
3354 @_, 3967 @_,
3355 ); 3968 );
3356 3969
3357 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3358 3971
3359 $self 3972 $self
3360} 3973}
3361 3974
3362sub size_request { 3975sub size_request {
… …
3377 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3378 3991
3379 int $coord + 0.5 3992 int $coord + 0.5
3380} 3993}
3381 3994
3382sub size_allocate { 3995sub invoke_size_allocate {
3383 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3384 3997
3385 for my $child ($self->children) { 3998 for my $child ($self->children) {
3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3387 4000
… …
3391 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3393 4006
3394 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3395 } 4008 }
4009
4010 1
3396} 4011}
3397 4012
3398sub coord2local { 4013sub coord2local {
3399 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3400 4015
… …
3485 4100
3486 delete $queue{$widget+0}; 4101 delete $queue{$widget+0};
3487 4102
3488 my ($w, $h) = $widget->size_request; 4103 my ($w, $h) = $widget->size_request;
3489 4104
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4105 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4106 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4107
4108 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4109 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 4110
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 4111 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 4112 $h = $widget->{force_h} if exists $widget->{force_h};
3495 4113
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4114 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3522 4140
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524 4142
3525 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3526 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3527 4154
3528 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3529 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3530 4157
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3556 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3557 glLoadIdentity; 4184 glLoadIdentity;
3558 4185
3559 { 4186 {
3560 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3561 4188
3562 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3564 }
3565 4191
3566 $self->_draw; 4192 $self->_draw;
4193 }
3567} 4194}
3568 4195
3569############################################################################# 4196#############################################################################
3570 4197
3571package CFClient::UI; 4198package CFPlus::UI;
3572 4199
3573$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3574$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3575 4202
35761 42031
3577 4204

Diff Legend

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