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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.446 by root, Sun Dec 16 00:21:58 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 ();
8 7
9use CFClient; 8use CFPlus;
9use CFPlus::Pod;
10use CFClient::Texture; 10use CFPlus::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT; 14our $LAYOUT;
15our $ROOT; 15our $ROOT;
16our $TOOLTIP; 16our $TOOLTIP;
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29 $TOOLTIP->hide;
30
31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
33
34 return if $ENV{CFPLUS_DEBUG} & 8;
35
36 $TOOLTIP->set_tooltip_from ($widget);
37 $TOOLTIP->show;
38 }
39
40 return;
41 }
42 }
43 }
44
45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner};
48};
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
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 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->invoke;
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 117
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
100} 126}
101 127
102sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
103 my ($ev) = @_; 129 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 130
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 132
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 134
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
111 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 137
113 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 140 $grab->update if $grab;
116 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
117 142
118 check_tooltip; 143 check_hover $widget;
144 $TOOLTIP_WATCHER->invoke;
119 } 145 }
120} 146}
121 147
122sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
123 my ($ev) = @_; 149 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
125 151
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 153
128 if ($widget != $HOVER) { 154 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 155
131 $hover->update if $hover && $hover->{can_hover}; 156 $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; 157 if $HOVER;
139} 158}
140 159
141# convert position array to integers 160# convert position array to integers
142sub harmonize { 161sub harmonize {
… …
192 reconfigure_widgets; 211 reconfigure_widgets;
193} 212}
194 213
195############################################################################# 214#############################################################################
196 215
216package CFPlus::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
197package CFClient::UI::Base; 224package CFPlus::UI::Base;
198 225
199use strict; 226use strict;
200 227
201use CFClient::OpenGL; 228use CFPlus::OpenGL;
202 229
203sub new { 230sub new {
204 my $class = shift; 231 my $class = shift;
205 232
206 my $self = bless { 233 my $self = bless {
… …
211 h => undef, 238 h => undef,
212 can_events => 1, 239 can_events => 1,
213 @_ 240 @_
214 }, $class; 241 }, $class;
215 242
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 244
218 for (keys %$self) { 245 for (keys %$self) {
219 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
221 } 248 }
222 } 249 }
223 250
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $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}; 253 $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}; 254 $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}; 255 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 256
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 259
233 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
238 265
239sub destroy { 266sub destroy {
240 my ($self) = @_; 267 my ($self) = @_;
241 268
242 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
243 %$self = (); 271 %$self = ();
244} 272}
245 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
246sub show { 278sub show {
247 my ($self) = @_; 279 my ($self) = @_;
248 280
249 return if $self->{parent}; 281 return if $self->{parent};
250 282
251 $CFClient::UI::ROOT->add ($self); 283 $CFPlus::UI::ROOT->add ($self);
252} 284}
253 285
254sub set_visible { 286sub set_visible {
255 my ($self) = @_; 287 my ($self) = @_;
256 288
… …
271 303
272 return unless $self->{visible}; 304 return unless $self->{visible};
273 305
274 $_->set_invisible for $self->children; 306 $_->set_invisible for $self->children;
275 307
308 delete $self->{visible};
276 delete $self->{root}; 309 delete $self->{root};
277 delete $self->{visible};
278 310
279 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
281 313
282 CFClient::UI::check_tooltip 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
283 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
284 316
285 $self->focus_out; 317 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
288} 319}
289 320
290sub set_visibility { 321sub set_visibility {
291 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
292 323
293 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
294 325
295 $visible ? $self->hide 326 $visible ? $self->show
296 : $self->show; 327 : $self->hide;
297} 328}
298 329
299sub toggle_visibility { 330sub toggle_visibility {
300 my ($self) = @_; 331 my ($self) = @_;
301 332
… …
314} 345}
315 346
316sub move_abs { 347sub move_abs {
317 my ($self, $x, $y, $z) = @_; 348 my ($self, $x, $y, $z) = @_;
318 349
319 $self->{x} = List::Util::max 0, int $x; 350 $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; 351 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 352 $self->{z} = $z if defined $z;
322 353
323 $self->update; 354 $self->update;
324} 355}
325 356
… …
328 359
329 $self->{force_w} = $w; 360 $self->{force_w} = $w;
330 $self->{force_h} = $h; 361 $self->{force_h} = $h;
331 362
332 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
333} 374}
334 375
335sub size_request { 376sub size_request {
336 require Carp; 377 require Carp;
337 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
338} 379}
339 380
381sub baseline_shift {
382 0
383}
384
340sub configure { 385sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 386 my ($self, $x, $y, $w, $h) = @_;
342 387
343 if ($self->{aspect}) { 388 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 389 my ($ow, $oh) = ($w, $h);
345 390
346 $w = List::Util::min $w, int $h * $self->{aspect}; 391 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 392 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 393
349 # use alignment to adjust x, y 394 # use alignment to adjust x, y
350 395
351 $x += int 0.5 * ($ow - $w); 396 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 397 $y += int 0.5 * ($oh - $h);
… …
366 411
367 $self->{root}{size_alloc}{$self+0} = $self; 412 $self->{root}{size_alloc}{$self+0} = $self;
368 } 413 }
369} 414}
370 415
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 416sub children {
376 # nop 417 # nop
377} 418}
378 419
379sub visible_children { 420sub visible_children {
… …
381} 422}
382 423
383sub set_max_size { 424sub set_max_size {
384 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
385 426
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 427 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 428 $self->{max_h} = int $h if defined $h;
429
430 $self->realloc;
388} 431}
389 432
390sub set_tooltip { 433sub set_tooltip {
391 my ($self, $tooltip) = @_; 434 my ($self, $tooltip) = @_;
392 435
… …
395 438
396 return if $self->{tooltip} eq $tooltip; 439 return if $self->{tooltip} eq $tooltip;
397 440
398 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
399 442
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
403 } 446 }
404} 447}
405 448
406# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
407sub coord2local { 450sub coord2local {
408 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
409 452
453 return (undef, undef) unless $self->{parent};
454
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 456}
412 457
413# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
414sub coord2global { 459sub coord2global {
415 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
416 461
462 return (undef, undef) unless $self->{parent};
463
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 465}
419 466
420sub focus_in { 467sub invoke_focus_in {
421 my ($self) = @_; 468 my ($self) = @_;
422 469
423 return if $FOCUS == $self; 470 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 471 return unless $self->{can_focus};
425 472
426 my $focus = $FOCUS; $FOCUS = $self; 473 $FOCUS = $self;
427 474
428 $self->_emit (focus_in => $focus); 475 $self->update;
429 476
430 $focus->update if $focus; 477 0
431 $FOCUS->update;
432} 478}
433 479
434sub focus_out { 480sub invoke_focus_out {
435 my ($self) = @_; 481 my ($self) = @_;
436 482
437 return unless $FOCUS == $self; 483 return unless $FOCUS == $self;
438 484
439 my $focus = $FOCUS; undef $FOCUS; 485 undef $FOCUS;
440 486
441 $self->_emit (focus_out => $focus); 487 $self->update;
442 488
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 489 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 490 unless $FOCUS;
447}
448 491
492 0
493}
494
495sub grab_focus {
496 my ($self) = @_;
497
498 $FOCUS->emit ("focus_out") if $FOCUS;
499 $self->emit ("focus_in");
500}
501
449sub mouse_motion { 0 } 502sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 503sub invoke_button_up { 0 }
451sub key_down { 0 } 504sub invoke_key_down { 0 }
452sub key_up { 0 } 505sub invoke_key_up { 0 }
506sub invoke_mouse_wheel { 0 }
453 507
454sub button_down { 508sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 509 my ($self, $ev, $x, $y) = @_;
456 510
457 $self->focus_in; 511 $self->grab_focus;
458 512
459 0 513 0
460} 514}
461 515
516sub connect {
517 my ($self, $signal, $cb) = @_;
518
519 push @{ $self->{signal_cb}{$signal} }, $cb;
520
521 defined wantarray and CFPlus::guard {
522 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
523 @{ $self->{signal_cb}{$signal} };
524 }
525}
526
527sub disconnect_all {
528 my ($self, $signal) = @_;
529
530 delete $self->{signal_cb}{$signal};
531}
532
533my %has_coords = (
534 button_down => 1,
535 button_up => 1,
536 mouse_motion => 1,
537 mouse_wheel => 1,
538);
539
540sub emit {
541 my ($self, $signal, @args) = @_;
542
543 # I do not really like this solution, but I do not like duplication
544 # and needlessly verbose code, either.
545 my @append
546 = $has_coords{$signal}
547 ? $args[0]->xy ($self)
548 : ();
549
550 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
551
552 for my $cb (
553 @{$self->{signal_cb}{$signal} || []}, # before
554 ($self->can ("invoke_$signal") || sub { 1 }), # closure
555 ) {
556 return $cb->($self, @args, @append) || next;
557 }
558
559 # parent
560 $self->{parent} && $self->{parent}->emit ($signal, @args)
561}
562
462sub find_widget { 563#sub find_widget {
463 my ($self, $x, $y) = @_; 564# in .xs
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473 565
474sub set_parent { 566sub set_parent {
475 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
476 568
477 Scalar::Util::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 570 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 571}
503 572
504sub realloc { 573sub realloc {
505 my ($self) = @_; 574 my ($self) = @_;
506 575
… …
531 600
532# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 602# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 604
536sub draw { 605#sub draw {
537 my ($self) = @_; 606#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555
556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2;
560 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS;
563 glVertex $x , $y;
564 glVertex $x + $self->{w}, $y;
565 glVertex $x + $self->{w}, $y + $self->{h};
566 glVertex $x , $y + $self->{h};
567 glEnd;
568 glDisable GL_BLEND;
569 }
570
571 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix;
573 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
575 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1;
580 glEnd;
581 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 }
584}
585 607
586sub _draw { 608sub _draw {
587 my ($self) = @_; 609 my ($self) = @_;
588 610
589 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
590} 612}
591 613
592sub DESTROY { 614sub DESTROY {
593 my ($self) = @_; 615 my ($self) = @_;
594 616
617 return if CFPlus::in_destruct;
618
619 local $@;
620 eval { $self->destroy };
621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
622
595 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
596 #$self->deactivate;
597} 624}
598 625
599############################################################################# 626#############################################################################
600 627
601package CFClient::UI::DrawBG; 628package CFPlus::UI::DrawBG;
602 629
603our @ISA = CFClient::UI::Base::; 630our @ISA = CFPlus::UI::Base::;
604 631
605use strict; 632use strict;
606use CFClient::OpenGL; 633use CFPlus::OpenGL;
607 634
608sub new { 635sub new {
609 my $class = shift; 636 my $class = shift;
610
611 # range [value, low, high, page]
612 637
613 $class->SUPER::new ( 638 $class->SUPER::new (
614 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
615 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
616 @_ 641 @_
… …
626 651
627 if ($color && (@$color < 4 || $color->[3])) { 652 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
629 654
630 glEnable GL_BLEND; 655 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 657 glColor_premultiply @$color;
633
634 glBegin GL_QUADS;
635 glVertex 0 , 0;
636 glVertex 0 , $h;
637 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
638 glVertex $w, 0;
639 glEnd;
640
641 glDisable GL_BLEND; 659 glDisable GL_BLEND;
642 } 660 }
643} 661}
644 662
645############################################################################# 663#############################################################################
646 664
647package CFClient::UI::Empty; 665package CFPlus::UI::Empty;
648 666
649our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
650 668
651sub new { 669sub new {
652 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
653 $class->SUPER::new (can_events => 0, %arg); 671 $class->SUPER::new (can_events => 0, %arg);
654} 672}
… …
661 679
662sub draw { } 680sub draw { }
663 681
664############################################################################# 682#############################################################################
665 683
666package CFClient::UI::Container; 684package CFPlus::UI::Container;
667 685
668our @ISA = CFClient::UI::Base::; 686our @ISA = CFPlus::UI::Base::;
669 687
670sub new { 688sub new {
671 my ($class, %arg) = @_; 689 my ($class, %arg) = @_;
672 690
673 my $children = delete $arg{children}; 691 my $children = delete $arg{children};
… …
677 can_events => 0, 695 can_events => 0,
678 %arg, 696 %arg,
679 ); 697 );
680 698
681 $self->add (@$children) 699 $self->add (@$children)
682 if $children; 700 if $children && @$children;
683 701
684 $self 702 $self
703}
704
705sub realloc {
706 my ($self) = @_;
707
708 $self->{force_realloc} = 1;
709 $self->{force_size_alloc} = 1;
710 $self->SUPER::realloc;
685} 711}
686 712
687sub add { 713sub add {
688 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
689 715
690 $_->set_parent ($self) 716 $_->set_parent ($self)
691 for @widgets; 717 for @widgets;
692 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
693 use sort 'stable'; 720 use sort 'stable';
694 721
695 $self->{children} = [ 722 $self->{children} = [
696 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
697 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
698 ]; 725 ];
699 726
700 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
701} 732}
702 733
703sub children { 734sub children {
704 @{ $_[0]{children} } 735 @{ $_[0]{children} }
705} 736}
706 737
707sub remove { 738sub remove {
708 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
709 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
710 delete $child->{parent}; 744 delete $child->{parent};
711 $child->hide; 745 $child->hide;
712
713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
714 748
715 $self->realloc; 749 $self->realloc;
716} 750}
717 751
718sub clear { 752sub clear {
719 my ($self) = @_; 753 my ($self) = @_;
720 754
721 my $children = delete $self->{children}; 755 my $children = $self->{children};
722 $self->{children} = []; 756 $self->{children} = [];
723 757
724 for (@$children) { 758 for (@$children) {
725 delete $_->{parent}; 759 delete $_->{parent};
726 $_->hide; 760 $_->hide;
… …
746} 780}
747 781
748sub _draw { 782sub _draw {
749 my ($self) = @_; 783 my ($self) = @_;
750 784
751 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
752} 786}
753 787
754############################################################################# 788#############################################################################
755 789
756package CFClient::UI::Bin; 790package CFPlus::UI::Bin;
757 791
758our @ISA = CFClient::UI::Container::; 792our @ISA = CFPlus::UI::Container::;
759 793
760sub new { 794sub new {
761 my ($class, %arg) = @_; 795 my ($class, %arg) = @_;
762 796
763 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 797 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
764 798
765 $class->SUPER::new (children => [$child], %arg) 799 $class->SUPER::new (children => [$child], %arg)
766} 800}
767 801
768sub add { 802sub add {
769 my ($self, $child) = @_; 803 my ($self, $child) = @_;
770 804
771 $self->{children} = []; 805 $self->clear;
772
773 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
774} 807}
775 808
776sub remove { 809sub remove {
777 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
778 811
779 $self->SUPER::remove ($widget); 812 $self->SUPER::remove ($widget);
780 813
781 $self->{children} = [new CFClient::UI::Empty] 814 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 815 unless @{$self->{children}};
783} 816}
784 817
785sub child { $_[0]->{children}[0] } 818sub child { $_[0]->{children}[0] }
786 819
787sub size_request { 820sub size_request {
788 $_[0]{children}[0]->size_request 821 $_[0]{children}[0]->size_request
789} 822}
790 823
791sub size_allocate { 824sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
793 826
794 $self->{children}[0]->configure (0, 0, $w, $h); 827 $self->{children}[0]->configure (0, 0, $w, $h);
828
829 1
795} 830}
796 831
797############################################################################# 832#############################################################################
798
799# back-buffered drawing area 833# back-buffered drawing area
800 834
801package CFClient::UI::Window; 835package CFPlus::UI::Window;
802 836
803our @ISA = CFClient::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
804 838
805use CFClient::OpenGL; 839use CFPlus::OpenGL;
806 840
807sub new { 841sub new {
808 my ($class, %arg) = @_; 842 my ($class, %arg) = @_;
809 843
810 my $self = $class->SUPER::new (%arg); 844 my $self = $class->SUPER::new (%arg);
… …
815 849
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 850 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 851 $self->SUPER::update;
818} 852}
819 853
820sub size_allocate { 854sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
822 856
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 857 $self->update;
858
859 $self->SUPER::invoke_size_allocate ($w, $h)
825} 860}
826 861
827sub _render { 862sub _render {
828 my ($self) = @_; 863 my ($self) = @_;
829 864
… …
831} 866}
832 867
833sub render_child { 868sub render_child {
834 my ($self) = @_; 869 my ($self) = @_;
835 870
836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 871 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
837 glClearColor 0, 0, 0, 0; 872 glClearColor 0, 0, 0, 0;
838 glClear GL_COLOR_BUFFER_BIT; 873 glClear GL_COLOR_BUFFER_BIT;
839 874
840 { 875 {
841 package CFClient::UI::Base; 876 package CFPlus::UI::Base;
842 877
843 ($draw_x, $draw_y, $draw_w, $draw_h) = 878 local ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h}); 879 (0, 0, $self->{w}, $self->{h});
880
881 $self->_render;
845 } 882 }
846
847 $self->_render;
848 }; 883 };
849} 884}
850 885
851sub _draw { 886sub _draw {
852 my ($self) = @_; 887 my ($self) = @_;
853
854 my ($w, $h) = @$self{qw(w h)};
855 888
856 my $tex = $self->{texture} 889 my $tex = $self->{texture}
857 or return; 890 or return;
858 891
859 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
862 895
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0);
864 897
865 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
866} 899}
867 900
868############################################################################# 901#############################################################################
869 902
870package CFClient::UI::ViewPort; 903package CFPlus::UI::ViewPort;
871 904
905use List::Util qw(min max);
906
872our @ISA = CFClient::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
873 908
874sub new { 909sub new {
875 my $class = shift; 910 my $class = shift;
876 911
877 $class->SUPER::new ( 912 $class->SUPER::new (
… …
884sub size_request { 919sub size_request {
885 my ($self) = @_; 920 my ($self) = @_;
886 921
887 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
888 923
889 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
891 926
892 ($w, $h) 927 ($w, $h)
893} 928}
894 929
895sub size_allocate { 930sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 931 my ($self, $w, $h) = @_;
897 932
898 my $child = $self->child; 933 my $child = $self->child;
899 934
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 935 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 936 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 937
903 $self->child->configure (0, 0, $w, $h); 938 $self->child->configure (0, 0, $w, $h);
904 $self->update; 939 $self->update;
940
941 1
905} 942}
906 943
907sub set_offset { 944sub set_offset {
908 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
909 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
910 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
911 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
912 953
954 $self->emit (changed => $x, $y);
913 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
914} 975}
915 976
916# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
917sub coord2local { 978sub coord2local {
918 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
… …
933 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
934 995
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 998 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else { 1000 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1002 }
942} 1003}
943 1004
944sub _render { 1005sub _render {
945 my ($self) = @_; 1006 my ($self) = @_;
946 1007
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949 1010
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1012
952 $self->SUPER::_render; 1013 $self->SUPER::_render;
953} 1014}
954 1015
955############################################################################# 1016#############################################################################
956 1017
957package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
958 1019
959our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
960 1021
961sub new { 1022sub new {
962 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
963 1024
964 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
965 1026
966 my $self; 1027 my $self;
967 1028
968 my $slider = new CFClient::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1032 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub {
1035 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 },
1038 ;
1039
1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
969 vertical => 1, 1043 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1045 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973 }, 1048 },
974 ; 1049 ;
975 1050
976 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1054 can_events => 1,
978 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
979 %arg, 1059 %arg,
980 ); 1060 );
981 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
983 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
984 1086
985 $self 1087 $self
986} 1088}
987 1089
… …
989 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
990 1092
991 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
992} 1094}
993 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
994sub update { 1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
995 my ($self) = @_; 1131 my ($self, $ev) = @_;
996 1132
997 $self->SUPER::update; 1133 $self->grab_focus;
998 1134
999 # todo: overwrite size_allocate of child 1135 my $ox = $self->{vp}{view_x};
1000 my $child = $self->{vp}->child; 1136 my $oy = $self->{vp}{view_y};
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1137
1002} 1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1003 1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1148sub invoke_mouse_wheel {
1149 my ($self, $ev) = @_;
1150
1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153
1154 1
1155}
1156
1157sub invoke_button_down {
1158 my ($self, $ev, $x, $y) = @_;
1159
1160 if ($ev->{button} == 2) {
1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1164
1165 0
1166}
1167
1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if (delete $self->{motion}) {
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1004sub size_allocate { 1189sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1006 1191
1192 $self->update_slider;
1007 $self->SUPER::size_allocate ($w, $h); 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1011} 1194}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1195
1016############################################################################# 1196#############################################################################
1017 1197
1018package CFClient::UI::Frame; 1198package CFPlus::UI::Frame;
1019 1199
1020our @ISA = CFClient::UI::Bin::; 1200our @ISA = CFPlus::UI::Bin::;
1021 1201
1022use CFClient::OpenGL; 1202use CFPlus::OpenGL;
1023 1203
1024sub new { 1204sub new {
1025 my $class = shift; 1205 my $class = shift;
1026 1206
1027 $class->SUPER::new ( 1207 $class->SUPER::new (
… …
1035 1215
1036 if ($self->{bg}) { 1216 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1038 1218
1039 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1051 } 1224 }
1052 1225
1053 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1054} 1227}
1055 1228
1056############################################################################# 1229#############################################################################
1057 1230
1058package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1059 1232
1060our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1061 1234
1062use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1063
1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1236
1072sub new { 1237sub new {
1073 my ($class, %arg) = @_; 1238 my ($class, %arg) = @_;
1074 1239
1075 my $title = delete $arg{title}; 1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1332
1333our @ISA = CFPlus::UI::Bin::;
1334
1335use CFPlus::OpenGL;
1336
1337my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1339 mipmap => 1, wrap => 1;
1340
1341my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1349sub new {
1350 my ($class, %arg) = @_;
1076 1351
1077 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1354 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1355 border => 0.6,
1081 can_events => 1, 1356 can_events => 1,
1082 min_w => 16, 1357 min_w => 64,
1083 min_h => 16, 1358 min_h => 32,
1084 %arg, 1359 %arg,
1085 ); 1360 );
1086 1361
1087 $self->{title} = new CFClient::UI::Label 1362 $self->{title_widget} = new CFPlus::UI::Label
1088 align => 0, 1363 align => 0,
1089 valign => 1, 1364 valign => 1,
1090 text => $title, 1365 text => $self->{title},
1091 fontsize => $self->{border} 1366 fontsize => $self->{border},
1092 if defined $title; 1367 if exists $self->{title};
1368
1369 if ($self->{has_close_button}) {
1370 $self->{close_button} =
1371 new CFPlus::UI::ImageButton
1372 path => 'x1_close.png',
1373 on_activate => sub { $self->emit ("delete") };
1374
1375 $self->CFPlus::UI::Container::add ($self->{close_button});
1376 }
1093 1377
1094 $self 1378 $self
1095} 1379}
1096 1380
1097sub add { 1381sub add {
1098 my ($self, @widgets) = @_; 1382 my ($self, @widgets) = @_;
1099 1383
1100 $self->SUPER::add (@widgets); 1384 $self->SUPER::add (@widgets);
1385 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1386 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1387}
1103 1388
1104sub border { 1389sub border {
1105 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1106} 1391}
1107 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1108sub size_request { 1402sub size_request {
1109 my ($self) = @_; 1403 my ($self) = @_;
1110 1404
1111 $self->{title}->size_request 1405 $self->{title_widget}->size_request
1112 if $self->{title}; 1406 if $self->{title_widget};
1407
1408 $self->{close_button}->size_request
1409 if $self->{close_button};
1113 1410
1114 my ($w, $h) = $self->SUPER::size_request; 1411 my ($w, $h) = $self->SUPER::size_request;
1115 1412
1116 ( 1413 (
1117 $w + $self->border * 2, 1414 $w + $self->border * 2,
1118 $h + $self->border * 2, 1415 $h + $self->border * 2,
1119 ) 1416 )
1120} 1417}
1121 1418
1122sub size_allocate { 1419sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1420 my ($self, $w, $h) = @_;
1124 1421
1125 if ($self->{title}) { 1422 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1423 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1424 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1425 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1426 }
1130 1427
1131 my $border = $self->border; 1428 my $border = $self->border;
1132 1429
1133 $h -= List::Util::max 0, $border * 2; 1430 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1431 $w -= List::Util::max 0, $border * 2;
1432
1433 $self->child->configure ($border, $border, $w, $h);
1434
1435 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1436 if $self->{close_button};
1437
1438 1
1439}
1440
1441sub invoke_delete {
1442 my ($self) = @_;
1443
1444 $self->hide;
1135 1445
1136 $self->child->configure ($border, $border, $w, $h); 1446 1
1137} 1447}
1138 1448
1139sub button_down { 1449sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
1141 1451
1142 my ($w, $h) = @$self{qw(w h)}; 1452 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1453 my $border = $self->border;
1144 1454
… …
1160 my $dy = $ev->{y} - $oy; 1470 my $dy = $ev->{y} - $oy;
1161 1471
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1474
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1476 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1477 };
1168 1478
1169 } elsif ($lr ^ $td) { 1479 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
1175 1485
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1487
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1488 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1489 # HACK: the next line is required to enforce placement
1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1491 };
1180 } else { 1492 } else {
1181 return 0; 1493 return 0;
1182 } 1494 }
1183 1495
1184 1 1496 1
1185} 1497}
1186 1498
1187sub button_up { 1499sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
1189 1501
1190 !!delete $self->{motion} 1502 ! ! delete $self->{motion}
1191} 1503}
1192 1504
1193sub mouse_motion { 1505sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1195 1507
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1509
1198 !!$self->{motion} 1510 ! ! $self->{motion}
1511}
1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1199} 1519}
1200 1520
1201sub _draw { 1521sub _draw {
1202 my ($self) = @_; 1522 my ($self) = @_;
1203 1523
… …
1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1211 1531
1212 my $border = $self->border; 1532 my $border = $self->border;
1213 1533
1214 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1215 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1219 1553
1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1221 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1222 1556
1223 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1229 1563
1230 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1231 1565
1232 $child->draw; 1566 $child->draw;
1233 1567
1234 if ($self->{title}) { 1568 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1569 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1237 } 1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1238} 1577}
1239 1578
1240############################################################################# 1579#############################################################################
1241 1580
1242package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1243 1582
1244our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1245 1584
1246use List::Util qw(max sum); 1585use List::Util qw(max sum);
1247 1586
1248use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1249 1588
1250sub new { 1589sub new {
1251 my $class = shift; 1590 my $class = shift;
1252 1591
1253 $class->SUPER::new ( 1592 $class->SUPER::new (
1254 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1255 @_, 1595 @_,
1256 ) 1596 )
1257} 1597}
1258 1598
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261}
1262
1263sub add { 1599sub add {
1264 my ($self, $x, $y, $child) = @_;
1265
1266 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child;
1268
1269 $self->realloc;
1270}
1271
1272# TODO: move to container class maybe? send children a signal on removal?
1273sub clear {
1274 my ($self) = @_; 1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{c_row} = $row;
1619 $child->{c_col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1628 my ($self) = @_;
1629
1630 my (@w, @h);
1275 1631
1276 my @children = $self->children; 1632 my @children = $self->children;
1277 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1278 1643 }
1279 for (@children) {
1280 delete $_->{parent};
1281 $_->hide;
1282 }
1283 1644
1284 $self->realloc; 1645 # second pass, rows
1285} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1286
1287sub get_wh {
1288 my ($self) = @_;
1289
1290 my (@w, @h);
1291
1292 for my $y (0 .. $#{$self->{children}}) {
1293 my $row = $self->{children}[$y]
1294 or next;
1295
1296 for my $x (0 .. $#$row) {
1297 my $widget = $row->[$x]
1298 or next;
1299 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1300 1648
1301 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1302 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1303 } 1653 }
1304 } 1654 }
1305 1655
1306 (\@w, \@h) 1656 (\@w, \@h)
1307} 1657}
… …
1315 (sum @$ws), 1665 (sum @$ws),
1316 (sum @$hs), 1666 (sum @$hs),
1317 ) 1667 )
1318} 1668}
1319 1669
1320sub size_allocate { 1670sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1322 1672
1323 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1324 1674
1325 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1326 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1327 1677
1328 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1329 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1330 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1331 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1332 1682
1333 # linearly scale sizes
1334 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1335 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1336 1684
1337 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1338 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1339 1694
1340 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1341 1697
1342 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1343 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1344 or next;
1345 1700
1346 my $x = 0; 1701 $widget->configure (
1347 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1348 1704 );
1349 for my $c (0 .. $#$row) { 1705 }
1350 my $col_w = $ws->[$c];
1351 1706
1352 if (my $widget = $row->[$c]) { 1707 1
1353 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1354 }
1355 1709
1356 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1357 } 1737 }
1358
1359 $y += $row_h;
1360 } 1738 }
1361 1739
1362} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1363 1742
1364sub find_widget { 1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1365 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1366 1762
1367 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1368 $y -= $self->{y}; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1369 1766
1370 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1371 1769
1372 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1373 $res = $_->find_widget ($x, $y) 1771 }
1374 and return $res; 1772
1375 } 1773 1
1376
1377 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1378}
1379
1380sub _draw {
1381 my ($self) = @_;
1382
1383 for (grep $_, @{$self->{children}}) {
1384 $_->draw for grep $_, @$_;
1385 }
1386} 1774}
1387 1775
1388############################################################################# 1776#############################################################################
1389 1777
1390package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1391 1779
1392our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1393 1781
1394sub size_request { 1782sub size_request {
1395 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1396 1786
1397 $self->{vertical} 1787 $self->{vertical}
1398 ? ( 1788 ? (
1399 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1401 ) 1791 )
1402 : ( 1792 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1405 ) 1795 )
1406} 1796}
1407 1797
1408sub size_allocate { 1798sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1410 1800
1411 my $space = $self->{vertical} ? $h : $w; 1801 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1802 my @children = $self->visible_children;
1413 1803
1414 my @req; 1804 my @req;
1415 1805
1416 if ($self->{homogeneous}) { 1806 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1807 @req = ($space / (@children || 1)) x @children;
1418 } else { 1808 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1810 my $req = List::Util::sum @req;
1421 1811
1422 if ($req > $space) { 1812 if ($req > $space) {
1423 # ah well, not enough space 1813 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1814 $_ *= $space / $req for @req;
1425 } else { 1815 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1817
1428 $space = ($space - $req) / $expand; # remaining space to give away 1818 $space = ($space - $req) / $expand; # remaining space to give away
1429 1819
1430 $req[$_] += $space * $children->[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1821 for 0 .. $#children;
1432 } 1822 }
1433 } 1823 }
1434 1824
1435 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1436 1826
1437 my $pos = 0; 1827 my $pos = 0;
1438 for (0 .. $#$children) { 1828 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1441 1831
1442 $pos += $alloc; 1832 $pos += $alloc;
1443 } 1833 }
1444 1834
1445 1 1835 1
1446} 1836}
1447 1837
1448############################################################################# 1838#############################################################################
1449 1839
1450package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1451 1841
1452our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1453 1843
1454sub new { 1844sub new {
1455 my $class = shift; 1845 my $class = shift;
1456 1846
1457 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1460 ) 1850 )
1461} 1851}
1462 1852
1463############################################################################# 1853#############################################################################
1464 1854
1465package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1466 1856
1467our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1468 1858
1469sub new { 1859sub new {
1470 my $class = shift; 1860 my $class = shift;
1471 1861
1472 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1475 ) 1865 )
1476} 1866}
1477 1867
1478############################################################################# 1868#############################################################################
1479 1869
1480package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1481 1871
1482our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1483 1873
1484use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1485 1875
1486sub new { 1876sub new {
1487 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1488 1878
1489 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1492 #active_bg => none 1882 #active_bg => none
1493 #font => default_font 1883 #font => default_font
1494 #text => initial text 1884 #text => initial text
1495 #markup => initial narkup 1885 #markup => initial narkup
1496 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1497 ellipsise => 3, # end 1888 ellipsise => 3, # end
1498 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1499 fontsize => 1, 1890 fontsize => 1,
1500 align => -1, 1891 align => -1,
1501 valign => -1, 1892 valign => -1,
1502 padding_x => 2, 1893 padding_x => 2,
1503 padding_y => 2, 1894 padding_y => 2,
1504 can_events => 0, 1895 can_events => 0,
1505 %arg 1896 %arg
1506 ); 1897 );
1507 1898
1508 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1509 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1510 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1511 $self->{template} = $layout; 1902 $self->{template} = $layout;
1512 } 1903 }
1513 1904
1514 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1518 } 1909 }
1519 1910
1520 $self 1911 $self
1521} 1912}
1522 1913
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1914sub update {
1534 my ($self) = @_; 1915 my ($self) = @_;
1535 1916
1536 delete $self->{texture}; 1917 delete $self->{texture};
1537 $self->SUPER::update; 1918 $self->SUPER::update;
1538} 1919}
1539 1920
1921sub realloc {
1922 my ($self) = @_;
1923
1924 delete $self->{ox};
1925 $self->SUPER::realloc;
1926}
1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1540sub set_text { 1934sub set_text {
1541 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1542 1936
1543 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1545 1939
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1548 1941
1942 delete $self->{size_req};
1549 $self->realloc; 1943 $self->realloc;
1550 $self->update; 1944 $self->update;
1551} 1945}
1552 1946
1553sub set_markup { 1947sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1950 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1951 $self->{text} = "M$markup";
1558 1952
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1954
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1563 1956
1957 delete $self->{size_req};
1564 $self->realloc; 1958 $self->realloc;
1565 $self->update; 1959 $self->update;
1566} 1960}
1567 1961
1568sub size_request { 1962sub size_request {
1569 my ($self) = @_; 1963 my ($self) = @_;
1570 1964
1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1973
1577 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1578 1975
1579 if (exists $self->{template}) { 1976 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1977 $self->{template}->set_font ($self->{font}) if $self->{font};
1978 $self->{template}->set_width ($self->{max_w} || -1);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1979 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1980
1583 my ($w2, $h2) = $self->{template}->size; 1981 my ($w2, $h2) = $self->{template}->size;
1584 1982
1585 $w = List::Util::max $w, $w2; 1983 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1984 $h = List::Util::max $h, $h2;
1985 }
1986
1987 [$w, $h]
1587 } 1988 };
1588 1989
1589 ($w, $h) 1990 @{ $self->{size_req} }
1590} 1991}
1591 1992
1993sub baseline_shift {
1994 $_[0]{layout}->descent
1995}
1996
1592sub size_allocate { 1997sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1998 my ($self, $w, $h) = @_;
1594 1999
1595 delete $self->{ox}; 2000 delete $self->{ox};
1596 2001
1597 delete $self->{texture} 2002 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2003 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2004
2005 1
1599} 2006}
1600 2007
1601sub set_fontsize { 2008sub set_fontsize {
1602 my ($self, $fontsize) = @_; 2009 my ($self, $fontsize) = @_;
1603 2010
1604 $self->{fontsize} = $fontsize; 2011 $self->{fontsize} = $fontsize;
2012 delete $self->{size_req};
1605 delete $self->{texture}; 2013 delete $self->{texture};
1606 2014
1607 $self->realloc; 2015 $self->realloc;
1608} 2016}
1609 2017
2018sub reconfigure {
2019 my ($self) = @_;
2020
2021 delete $self->{size_req};
2022 delete $self->{texture};
2023
2024 $self->SUPER::reconfigure;
2025}
2026
1610sub _draw { 2027sub _draw {
1611 my ($self) = @_; 2028 my ($self) = @_;
1612 2029
1613 $self->SUPER::_draw; # draw background, if applicable 2030 $self->SUPER::_draw; # draw background, if applicable
1614 2031
1615 my $tex = $self->{texture} ||= do { 2032 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 2033 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 2035 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2036 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2037 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 2039
1623 new_from_layout CFClient::Texture $self->{layout} 2040 [$self->{layout}->size]
1624 }; 2041 };
1625 2042
1626 unless (exists $self->{ox}) { 2043 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2044 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2045 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1630 2047
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1634 }; 2053 };
1635 2054
1636 glEnable GL_TEXTURE_2D; 2055# unless ($self->{list}) {
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1638 2057# CFPlus::OpenGL::glNewList $self->{list};
1639 if ($tex->{format} == GL_ALPHA) { 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}}; 2059# CFPlus::OpenGL::glEndList;
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 } 2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
1645 2063
1646 glDisable GL_TEXTURE_2D; 2064 $self->{layout}->draw;
1647} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1648 2074
1649############################################################################# 2075#############################################################################
1650 2076
1651package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1652 2078
1653our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1654 2080
1655use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1656 2082
1657sub new { 2083sub new {
1658 my $class = shift; 2084 my $class = shift;
1659 2085
1660 $class->SUPER::new ( 2086 $class->SUPER::new (
1661 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1662 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1663 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1664 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1665 can_hover => 1, 2093 can_hover => 1,
1666 can_focus => 1, 2094 can_focus => 1,
1667 valign => 0, 2095 valign => 0,
1668 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1669 #text => ... 2098 #text => ...
2099 #hidden => "*",
1670 @_ 2100 @_
1671 ) 2101 )
1672} 2102}
1673 2103
1674sub _set_text { 2104sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2112 $self->{text} = $text;
1683 2113
1684 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
2116 delete $self->{size_req};
1686 2117
1687 $self->_emit (changed => $self->{text}); 2118 $self->emit (changed => $self->{text});
2119
2120 $self->realloc;
1688 $self->update; 2121 $self->update;
1689} 2122}
1690 2123
1691sub set_text { 2124sub set_text {
1692 my ($self, $text) = @_; 2125 my ($self, $text) = @_;
1693 2126
1694 $self->{cursor} = length $text; 2127 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 2128 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 2129}
1699 2130
1700sub get_text { 2131sub get_text {
1701 $_[0]{text} 2132 $_[0]{text}
1702} 2133}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1708 2139
1709 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1710} 2141}
1711 2142
1712sub key_down { 2143sub invoke_key_down {
1713 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1714 2145
1715 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1718 2149
1719 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1720 2153
1721 if ($uni == 8) { 2154 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1730 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2178 $self->emit ('escape');
1735 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2183 } else {
1738 return 0; 2184 return 0;
1739 } 2185 }
1740 2186
1741 $self->_set_text ($text); 2187 $self->_set_text ($text);
1742 2188
1743 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1744 2191
1745 1 2192 1
1746} 2193}
1747 2194
1748sub focus_in { 2195sub invoke_focus_in {
1749 my ($self) = @_; 2196 my ($self) = @_;
1750 2197
1751 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1752 2199
1753 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1754} 2201}
1755 2202
1756sub button_down { 2203sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1758 2205
1759 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2207
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2209
1763 # byte-index to char-index 2210 # byte-index to char-index
1764 my $text = $self->{text}; 2211 my $text = $self->{text};
1765 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1767 2214
1768 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1769 $self->update; 2216 $self->update;
1770 2217
1771 1 2218 1
1772} 2219}
1773 2220
1774sub mouse_motion { 2221sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2223# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 2224
1778 0 2225 1
1779} 2226}
1780 2227
1781sub _draw { 2228sub _draw {
1782 my ($self) = @_; 2229 my ($self) = @_;
1783 2230
1784 local $self->{fg} = $self->{fg}; 2231 local $self->{fg} = $self->{fg};
1785 2232
1786 if ($FOCUS == $self) { 2233 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2234 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2235 $self->{fg} = $self->{active_fg};
1789 } else { 2236 } else {
1790 glColor @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1791 } 2238 }
1792 2239
1793 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS;
1796 glVertex 0 , 0;
1797 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0;
1800 glEnd;
1801 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1802 2244
1803 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1804 2246
1805 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1807 2249
1808 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1809 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1810 utf8::encode $text; 2252 utf8::encode $text;
1811 2253
1812 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1813 } 2255 }
1814 2256
1815 glColor @{$self->{fg}}; 2257 glColor_premultiply @{$self->{active_fg}};
1816 glBegin GL_LINES; 2258 glBegin GL_LINES;
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1818 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1819 glEnd; 2261 glEnd;
1820 }
1821}
1822 2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2275 glEnd;
2276 }
2277}
2278
2279#############################################################################
2280
1823package CFClient::UI::Entry; 2281package CFPlus::UI::Entry;
1824 2282
1825our @ISA = CFClient::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1826 2284
1827use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1828 2286
1829sub key_down { 2287sub invoke_key_down {
1830 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1831 2289
1832 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1833 2291
1834 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
2295
1837 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2298 $self->emit (activate => $txt);
1840 $self->update; 2299 $self->update;
1841 2300
1842 } elsif ($sym == CFClient::SDLK_UP) { 2301 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2302 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2303 $self->{history_saveback} = $self->get_text;
1845 } 2304 }
1846 if (@{$self->{history} || []} > 0) { 2305 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2306 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2308 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2309 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2311 }
1853 2312
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2313 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2314 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2316
1858 if ($self->{history_pointer} >= 0) { 2317 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2318 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2319 } else {
1861 $self->set_text ($self->{history_saveback}); 2320 $self->set_text ($self->{history_saveback});
1862 } 2321 }
1863 2322
1864 } else { 2323 } else {
1865 return $self->SUPER::key_down ($ev) 2324 return $self->SUPER::invoke_key_down ($ev)
1866 } 2325 }
1867 2326
1868 1 2327 1
1869} 2328}
1870 2329
1871############################################################################# 2330#############################################################################
1872 2331
2332package CFPlus::UI::TextEdit;
2333
2334our @ISA = CFPlus::UI::EntryBase::;
2335
2336use CFPlus::OpenGL;
2337
2338sub move_cursor_ver {
2339 my ($self, $dy) = @_;
2340
2341 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2342
2343 $y += $dy;
2344
2345 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2346 $self->{cursor} = $index;
2347 delete $self->{cur_h};
2348 $self->update;
2349 return;
2350 }
2351}
2352
2353sub invoke_key_down {
2354 my ($self, $ev) = @_;
2355
2356 my $sym = $ev->{sym};
2357
2358 if ($sym == CFPlus::SDLK_UP) {
2359 $self->move_cursor_ver (-1);
2360 } elsif ($sym == CFPlus::SDLK_DOWN) {
2361 $self->move_cursor_ver (+1);
2362 } else {
2363 return $self->SUPER::invoke_key_down ($ev)
2364 }
2365
2366 1
2367}
2368
2369#############################################################################
2370
1873package CFClient::UI::Button; 2371package CFPlus::UI::ButtonBin;
1874 2372
1875our @ISA = CFClient::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
1876 2374
1877use CFClient::OpenGL; 2375use CFPlus::OpenGL;
1878 2376
1879my @tex = 2377my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
1882 2380
1883sub new { 2381sub new {
1884 my $class = shift; 2382 my $class = shift;
1885 2383
1886 $class->SUPER::new ( 2384 $class->SUPER::new (
1887 padding_x => 4,
1888 padding_y => 4,
1889 fg => [1, 1, 1],
1890 active_fg => [0, 0, 1],
1891 can_hover => 1, 2385 can_hover => 1,
1892 align => 0, 2386 align => 0,
1893 valign => 0, 2387 valign => 0,
1894 can_events => 1, 2388 can_events => 1,
1895 @_ 2389 @_
1896 ) 2390 )
1897} 2391}
1898 2392
1899sub activate { }
1900
1901sub button_up { 2393sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2394 my ($self, $ev, $x, $y) = @_;
1903 2395
1904 $self->emit ("activate") 2396 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2397 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2398 && $y >= 0 && $y < $self->{h};
… …
1909} 2401}
1910 2402
1911sub _draw { 2403sub _draw {
1912 my ($self) = @_; 2404 my ($self) = @_;
1913 2405
1914 local $self->{fg} = $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919
1920 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
1923 2409
2410 my $tex = $tex[$GRAB == $self];
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 2412
1926 glDisable GL_TEXTURE_2D; 2413 glDisable GL_TEXTURE_2D;
1927 2414
1928 $self->SUPER::_draw; 2415 $self->SUPER::_draw;
1929} 2416}
1930 2417
1931############################################################################# 2418#############################################################################
1932 2419
1933package CFClient::UI::CheckBox; 2420package CFPlus::UI::Button;
1934 2421
1935our @ISA = CFClient::UI::DrawBG::; 2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
1936 2425
1937my @tex = 2426my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2467
2468 glDisable GL_TEXTURE_2D;
2469
2470 $self->SUPER::_draw;
2471}
2472
2473#############################################################################
2474
2475package CFPlus::UI::CheckBox;
2476
2477our @ISA = CFPlus::UI::DrawBG::;
2478
2479my @tex =
2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2481 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2482
1941use CFClient::OpenGL; 2483use CFPlus::OpenGL;
1942 2484
1943sub new { 2485sub new {
1944 my $class = shift; 2486 my $class = shift;
1945 2487
1946 $class->SUPER::new ( 2488 $class->SUPER::new (
… …
1960 my ($self) = @_; 2502 my ($self) = @_;
1961 2503
1962 (6) x 2 2504 (6) x 2
1963} 2505}
1964 2506
2507sub toggle {
2508 my ($self) = @_;
2509
2510 $self->{state} = !$self->{state};
2511 $self->emit (changed => $self->{state});
2512 $self->update;
2513}
2514
1965sub button_down { 2515sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
1967 2517
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2518 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2519 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2520 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2521 } else {
1973 return 0 2522 return 0
1974 } 2523 }
1975 2524
1976 1 2525 1
… …
1979sub _draw { 2528sub _draw {
1980 my ($self) = @_; 2529 my ($self) = @_;
1981 2530
1982 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
1983 2532
1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1985 2534
1986 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
1987 2536
1988 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1989 2538
… …
1996 glDisable GL_TEXTURE_2D; 2545 glDisable GL_TEXTURE_2D;
1997} 2546}
1998 2547
1999############################################################################# 2548#############################################################################
2000 2549
2001package CFClient::UI::Image; 2550package CFPlus::UI::Image;
2002 2551
2003our @ISA = CFClient::UI::Base::; 2552our @ISA = CFPlus::UI::Base::;
2004 2553
2005use CFClient::OpenGL; 2554use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2555
2008our %loaded_images; 2556our %texture_cache;
2009 2557
2010sub new { 2558sub new {
2011 my $class = shift; 2559 my $class = shift;
2012 2560
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2561 my $self = $class->SUPER::new (
2562 can_events => 0,
2563 scale => 1,
2564 @_,
2565 );
2014 2566
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2567 $self->{path} || $self->{tex}
2568 or Carp::croak "'path' or 'tex' attributes required";
2016 2569
2017 $loaded_images{$self->{image}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2571 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2019 2572
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2021 2574
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2576
2026 $self 2577 $self
2027} 2578}
2028 2579
2580sub STORABLE_freeze {
2581 my ($self, $cloning) = @_;
2582
2583 $self->{path}
2584 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2585
2586 $self->{path}
2587}
2588
2589sub STORABLE_attach {
2590 my ($self, $cloning, $path) = @_;
2591
2592 $self->new (path => $path)
2593}
2594
2029sub size_request { 2595sub size_request {
2030 my ($self) = @_; 2596 my ($self) = @_;
2031 2597
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2033} 2599}
2034 2600
2035sub _draw { 2601sub _draw {
2036 my ($self) = @_; 2602 my ($self) = @_;
2037 2603
… …
2054 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2055} 2621}
2056 2622
2057############################################################################# 2623#############################################################################
2058 2624
2625package CFPlus::UI::ImageButton;
2626
2627our @ISA = CFPlus::UI::Image::;
2628
2629use CFPlus::OpenGL;
2630
2631my %textures;
2632
2633sub new {
2634 my $class = shift;
2635
2636 my $self = $class->SUPER::new (
2637 padding_x => 4,
2638 padding_y => 4,
2639 fg => [1, 1, 1],
2640 active_fg => [0, 0, 1],
2641 can_hover => 1,
2642 align => 0,
2643 valign => 0,
2644 can_events => 1,
2645 @_
2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2653}
2654
2655sub invoke_button_up {
2656 my ($self, $ev, $x, $y) = @_;
2657
2658 $self->emit ("activate")
2659 if $x >= 0 && $x < $self->{w}
2660 && $y >= 0 && $y < $self->{h};
2661
2662 1
2663}
2664
2665#############################################################################
2666
2059package CFClient::UI::VGauge; 2667package CFPlus::UI::VGauge;
2060 2668
2061our @ISA = CFClient::UI::Base::; 2669our @ISA = CFPlus::UI::Base::;
2062 2670
2063use List::Util qw(min max); 2671use List::Util qw(min max);
2064 2672
2065use CFClient::OpenGL; 2673use CFPlus::OpenGL;
2066 2674
2067my %tex = ( 2675my %tex = (
2068 food => [ 2676 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2679 ],
2072 grace => [ 2680 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2682 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2075 ], 2683 ],
2076 hp => [ 2684 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2687 ],
2080 mana => [ 2688 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2690 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2083 ], 2691 ],
2084); 2692);
2085 2693
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2694# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2754 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2755 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2756
2149 my $h1 = $self->{h} * (1 - $ycut1); 2757 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2758 my $h2 = $self->{h} * (1 - $ycut2);
2759 my $h3 = $self->{h};
2760
2761 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2762
2152 glEnable GL_BLEND; 2763 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2764 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2765 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2768
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2769 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2770 glBegin GL_QUADS;
… …
2173 2785
2174 if ($t3) { 2786 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2787 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2788 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2789 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2790 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2791 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2792 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2793 glEnd;
2182 } 2794 }
2183 2795
2184 glDisable GL_BLEND; 2796 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2186} 2798}
2187 2799
2188############################################################################# 2800#############################################################################
2189 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2190package CFClient::UI::Gauge; 2940package CFPlus::UI::Gauge;
2191 2941
2192our @ISA = CFClient::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2193 2943
2194sub new { 2944sub new {
2195 my ($class, %arg) = @_; 2945 my ($class, %arg) = @_;
2196 2946
2197 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2949 can_hover => 1,
2200 can_events => 1, 2950 can_events => 1,
2201 %arg, 2951 %arg,
2202 ); 2952 );
2203 2953
2204 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2954 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2205 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2955 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2206 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2956 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2207 2957
2208 $self 2958 $self
2209} 2959}
2210 2960
2211sub set_fontsize { 2961sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2982 $self->{value}->set_text ($val);
2233} 2983}
2234 2984
2235############################################################################# 2985#############################################################################
2236 2986
2237package CFClient::UI::Slider; 2987package CFPlus::UI::Slider;
2238 2988
2239use strict; 2989use strict;
2240 2990
2241use CFClient::OpenGL; 2991use CFPlus::OpenGL;
2242 2992
2243our @ISA = CFClient::UI::DrawBG::; 2993our @ISA = CFPlus::UI::DrawBG::;
2244 2994
2245my @tex = 2995my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2997 qw(s1_slider.png s1_slider_bg.png);
2248 2998
2249sub new { 2999sub new {
2250 my $class = shift; 3000 my $class = shift;
2251 3001
… …
2272 $self->update; 3022 $self->update;
2273 3023
2274 $self 3024 $self
2275} 3025}
2276 3026
2277sub changed { }
2278
2279sub set_range { 3027sub set_range {
2280 my ($self, $range) = @_; 3028 my ($self, $range) = @_;
2281 3029
2282 ($range, $self->{range}) = ($self->{range}, $range); 3030 ($range, $self->{range}) = ($self->{range}, $range);
2283 3031
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 3032 if ("@$range" ne "@{$self->{range}}") {
3033 $self->update;
3034 $self->set_value ($self->{range}[0]);
3035 }
2286} 3036}
2287 3037
2288sub set_value { 3038sub set_value {
2289 my ($self, $value) = @_; 3039 my ($self, $value) = @_;
2290 3040
… …
2301 if $unit; 3051 if $unit;
2302 3052
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 3054
2305 if ($value != $old_value) { 3055 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 3056 $self->emit (changed => $value);
2307 $self->update; 3057 $self->update;
2308 } 3058 }
2309} 3059}
2310 3060
2311sub size_request { 3061sub size_request {
2312 my ($self) = @_; 3062 my ($self) = @_;
2313 3063
2314 ($self->{req_w}, $self->{req_h}) 3064 ($self->{req_w}, $self->{req_h})
2315} 3065}
2316 3066
2317sub button_down { 3067sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 3068 my ($self, $ev, $x, $y) = @_;
2319 3069
2320 $self->SUPER::button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 3071
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 3073
2324 $self->mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
2325}
2326 3075
3076 1
3077}
3078
2327sub mouse_motion { 3079sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2329 3081
2330 if ($GRAB == $self) { 3082 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3083 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 3084
… …
2336 3088
2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3089 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else { 3090 } else {
2339 return 0; 3091 return 0;
2340 } 3092 }
3093
3094 1
3095}
3096
3097sub invoke_mouse_wheel {
3098 my ($self, $ev) = @_;
3099
3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3101
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3103
3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2341 3105
2342 1 3106 1
2343} 3107}
2344 3108
2345sub update { 3109sub update {
… …
2396 glDisable GL_TEXTURE_2D; 3160 glDisable GL_TEXTURE_2D;
2397} 3161}
2398 3162
2399############################################################################# 3163#############################################################################
2400 3164
2401package CFClient::UI::ValSlider; 3165package CFPlus::UI::ValSlider;
2402 3166
2403our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
2404 3168
2405sub new { 3169sub new {
2406 my ($class, %arg) = @_; 3170 my ($class, %arg) = @_;
2407 3171
2408 my $range = delete $arg{range}; 3172 my $range = delete $arg{range};
2409 3173
2410 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3175 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3176 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 3177 to_value => sub { shift },
2414 from_value => sub { shift }, 3178 from_value => sub { shift },
2415 %arg, 3179 %arg,
2416 ); 3180 );
2417 3181
… …
2437sub set_range { shift->{slider}->set_range (@_) } 3201sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 3202sub set_value { shift->{slider}->set_value (@_) }
2439 3203
2440############################################################################# 3204#############################################################################
2441 3205
2442package CFClient::UI::TextView; 3206package CFPlus::UI::TextScroller;
2443 3207
2444our @ISA = CFClient::UI::HBox::; 3208our @ISA = CFPlus::UI::HBox::;
2445 3209
2446use CFClient::OpenGL; 3210use CFPlus::OpenGL;
2447 3211
2448sub new { 3212sub new {
2449 my $class = shift; 3213 my $class = shift;
2450 3214
2451 my $self = $class->SUPER::new ( 3215 my $self = $class->SUPER::new (
2452 fontsize => 1, 3216 fontsize => 1,
2453 can_events => 0, 3217 can_events => 1,
3218 indent => 0,
2454 #font => default_font 3219 #font => default_font
2455 @_, 3220 @_,
2456 3221
2457 layout => (new CFClient::Layout 1), 3222 layout => (new CFPlus::Layout),
2458 par => [], 3223 par => [],
3224 max_par => 0,
2459 height => 0, 3225 height => 0,
2460 children => [ 3226 children => [
2461 (new CFClient::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2463 ], 3229 ],
2464 ); 3230 );
2465 3231
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 3232 $self->{children}[1]->connect (changed => sub { $self->update });
2467 3233
… …
2473 3239
2474 $self->{fontsize} = $fontsize; 3240 $self->{fontsize} = $fontsize;
2475 $self->reflow; 3241 $self->reflow;
2476} 3242}
2477 3243
3244sub size_request {
3245 my ($self) = @_;
3246
3247 my ($empty, $slider) = $self->visible_children;
3248
3249 local $self->{children} = [$empty, $slider];
3250 $self->SUPER::size_request
3251}
3252
2478sub size_allocate { 3253sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 3254 my ($self, $w, $h) = @_;
2480 3255
2481 $self->SUPER::size_allocate ($w, $h); 3256 my ($empty, $slider, @other) = @{ $self->{children} };
3257 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 3258
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3259 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3260 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 3261 $self->{layout}->set_width ($empty->{w});
3262 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 3263
2487 $self->reflow; 3264 $self->reflow;
2488}
2489 3265
2490sub text_size { 3266 local $self->{children} = [$empty, $slider];
3267 $self->SUPER::invoke_size_allocate ($w, $h)
3268}
3269
3270sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 3271 my ($self, $ev) = @_;
3272
3273 return 0 unless $ev->{dy}; # only vertical movements
3274
3275 $self->{children}[1]->emit (mouse_wheel => $ev);
3276
3277 1
3278}
3279
3280sub get_layout {
3281 my ($self, $para) = @_;
2492 3282
2493 my $layout = $self->{layout}; 3283 my $layout = $self->{layout};
2494 3284
3285 $layout->set_font ($self->{font}) if $self->{font};
3286 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3287 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 3288 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3289 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 3290 $layout->set_markup ($para->{markup});
3291
3292 $layout->set_shapes (
3293 map
3294 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3295 @{$para->{widget}}
2498 3296 );
3297
2499 $layout->size 3298 $layout
2500} 3299}
2501 3300
2502sub reflow { 3301sub reflow {
2503 my ($self) = @_; 3302 my ($self) = @_;
2504 3303
… …
2511 3310
2512 # todo: base offset on lines or so, not on pixels 3311 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 3312 $self->{children}[1]->set_value ($offset);
2514} 3313}
2515 3314
3315sub current_paragraph {
3316 my ($self) = @_;
3317
3318 $self->{top_paragraph} - 1
3319}
3320
3321sub scroll_to {
3322 my ($self, $para) = @_;
3323
3324 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3325
3326 $self->{scroll_to} = $para;
3327 $self->update;
3328}
3329
2516sub clear { 3330sub clear {
2517 my ($self) = @_; 3331 my ($self) = @_;
3332
3333 my (undef, undef, @other) = @{ $self->{children} };
3334 $self->remove ($_) for @other;
2518 3335
2519 $self->{par} = []; 3336 $self->{par} = [];
2520 $self->{height} = 0; 3337 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 3339}
2523 3340
2524sub add_paragraph { 3341sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 3342 my $self = shift;
2526 3343
2527 for my $line (split /\n/, $text) { 3344 for my $para (@_) {
2528 my ($w, $h) = $self->text_size ($line); 3345 $para = {
3346 fg => [1, 1, 1, 1],
3347 indent => 0,
3348 markup => "",
3349 widget => [],
3350 ref $para ? %$para : (markup => $para),
3351 w => 1e10,
3352 wrapped => 1,
3353 };
3354
3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3356 push @{$self->{par}}, $para;
3357 }
3358
3359 if (my $max = $self->{max_par}) {
3360 shift @{$self->{par}} while @{$self->{par}} > $max;
3361 }
3362
3363 $self->{need_reflow}++;
3364 $self->update;
3365}
3366
3367sub scroll_to_bottom {
3368 my ($self) = @_;
3369
3370 $self->{scroll_to} = $#{$self->{par}};
3371 $self->update;
3372}
3373
3374sub force_uptodate {
3375 my ($self) = @_;
3376
3377 if (delete $self->{need_reflow}) {
3378 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3379
3380 my $height = 0;
3381
3382 for my $para (@{$self->{par}}) {
3383 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3384 my $layout = $self->get_layout ($para);
3385 my ($w, $h) = $layout->size;
3386
3387 $para->{w} = $w + $para->{indent};
3388 $para->{h} = $h;
3389 $para->{wrapped} = $layout->has_wrapped;
3390 }
3391
3392 $para->{y} = $height;
3393 $height += $para->{h};
3394 }
3395
2529 $self->{height} += $h; 3396 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3398
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3399 delete $self->{texture};
3400 }
3401
3402 if (my $paridx = delete $self->{scroll_to}) {
3403 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3404 }
2534} 3405}
2535 3406
2536sub update { 3407sub update {
2537 my ($self) = @_; 3408 my ($self) = @_;
2538 3409
… …
2540 3411
2541 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2542 3413
2543 delete $self->{texture}; 3414 delete $self->{texture};
2544 3415
2545 $ROOT->on_post_alloc ($self, sub { 3416 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate;
3418
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3420
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3422 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2577 3424
3425 package CFPlus::UI::Base;
3426 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3427 (0, 0, $self->{w}, $self->{h});
3428
3429 my $top = int $self->{children}[1]{range}[0];
3430
3431 my $paridx = 0;
3432 my $top_paragraph;
2578 my $top = int $self->{children}[1]{range}[0]; 3433 my $top = int $self->{children}[1]{range}[0];
2579 3434
2580 my $y0 = $top; 3435 my $y0 = $top;
2581 my $y1 = $top + $H; 3436 my $y1 = $top + $H;
2582 3437
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2595 3441
2596 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3443 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3444
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
2602 3447
2603 glRasterPos $par->[3], $y - $y0; 3448 if (my @w = @{ $para->{widget} }) {
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3449 my @s = $layout->get_shapes;
3450
3451 for (@w) {
3452 my ($dx, $dy) = splice @s, 0, 2, ();
3453
3454 $_->{x} = $dx + $para->{indent};
3455 $_->{y} = $dy + $y - $y0;
3456
3457 $_->draw;
3458 }
3459 }
2605 } 3460 }
2606 3461
2607 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3464 }
2609 3465
2610 glDisable GL_BLEND; 3466 $self->{top_paragraph} = $top_paragraph;
2611 }; 3467 };
2612 }); 3468 });
2613} 3469}
2614 3470
3471sub reconfigure {
3472 my ($self) = @_;
3473
3474 $self->SUPER::reconfigure;
3475
3476 $_->{w} = 1e10 for @{ $self->{par} };
3477 $self->reflow;
3478}
3479
2615sub _draw { 3480sub _draw {
2616 my ($self) = @_; 3481 my ($self) = @_;
2617 3482
2618 glEnable GL_TEXTURE_2D; 3483 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3485 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3486 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 3487 glDisable GL_TEXTURE_2D;
2623 3488
2624 $self->{children}[1]->draw; 3489 $self->{children}[1]->draw;
2625
2626} 3490}
2627 3491
2628############################################################################# 3492#############################################################################
2629 3493
2630package CFClient::UI::Animator; 3494package CFPlus::UI::Animator;
2631 3495
2632use CFClient::OpenGL; 3496use CFPlus::OpenGL;
2633 3497
2634our @ISA = CFClient::UI::Bin::; 3498our @ISA = CFPlus::UI::Bin::;
2635 3499
2636sub moveto { 3500sub moveto {
2637 my ($self, $x, $y) = @_; 3501 my ($self, $x, $y) = @_;
2638 3502
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3531 glPopMatrix;
2668} 3532}
2669 3533
2670############################################################################# 3534#############################################################################
2671 3535
2672package CFClient::UI::Flopper; 3536package CFPlus::UI::Flopper;
2673 3537
2674our @ISA = CFClient::UI::Button::; 3538our @ISA = CFPlus::UI::Button::;
2675 3539
2676sub new { 3540sub new {
2677 my $class = shift; 3541 my $class = shift;
2678 3542
2679 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3555 $self->{other}->toggle_visibility;
2692} 3556}
2693 3557
2694############################################################################# 3558#############################################################################
2695 3559
2696package CFClient::UI::Tooltip; 3560package CFPlus::UI::Tooltip;
2697 3561
2698our @ISA = CFClient::UI::Bin::; 3562our @ISA = CFPlus::UI::Bin::;
2699 3563
2700use CFClient::OpenGL; 3564use CFPlus::OpenGL;
2701 3565
2702sub new { 3566sub new {
2703 my $class = shift; 3567 my $class = shift;
2704 3568
2705 $class->SUPER::new ( 3569 $class->SUPER::new (
… …
2709} 3573}
2710 3574
2711sub set_tooltip_from { 3575sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
2713 3577
2714 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
2715 3583
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
2721 } 3589 }
2722 3590
3591 $tip =~ s/^\n+//;
3592 $tip =~ s/\n+$//;
3593
2723 $self->add (new CFClient::UI::Label 3594 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3595 markup => $tip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3597 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3598 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3599 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3601 );
2731} 3602}
2732 3603
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3607 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3608
2738 ($w + 4, $h + 4) 3609 ($w + 4, $h + 4)
2739} 3610}
2740 3611
2741sub size_allocate { 3612sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3613 my ($self, $w, $h) = @_;
2743 3614
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3615 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3616}
2746 3617
2747sub visibility_change { 3618sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3619 my ($self, $visible) = @_;
2749 3620
2750 return unless $visible; 3621 return unless $visible;
2751 3622
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3623 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3624 my $widget = $self->{owner}
2754 or return; 3625 or return;
2755 3626
3627 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3628 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3629
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3630 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3631 if $x + $self->{w} > $self->{root}{w};
2760 3632
2761 $self->move_abs ($x, $y); 3633 $self->move_abs ($x, $y);
3634 } else {
3635 $self->hide;
3636 }
2762 }); 3637 });
2763} 3638}
2764 3639
2765sub _draw { 3640sub _draw {
2766 my ($self) = @_; 3641 my ($self) = @_;
2767 3642
2768 glTranslate 0.375, 0.375;
2769
2770 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
2771 3644
2772 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
2773 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
2774 glVertex 0 , 0;
2775 glVertex 0 , $h;
2776 glVertex $w, $h;
2777 glVertex $w, 0;
2778 glEnd;
2779 3647
2780 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
2781 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
2782 glVertex 0 , 0;
2783 glVertex 0 , $h;
2784 glVertex $w, $h;
2785 glVertex $w, 0;
2786 glEnd;
2787 3650
2788 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
2789 3652
2790 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
2791} 3654}
2792 3655
2793############################################################################# 3656#############################################################################
2794 3657
2795package CFClient::UI::Face; 3658package CFPlus::UI::Face;
2796 3659
2797our @ISA = CFClient::UI::Base::; 3660our @ISA = CFPlus::UI::DrawBG::;
2798 3661
2799use CFClient::OpenGL; 3662use CFPlus::OpenGL;
2800 3663
2801sub new { 3664sub new {
2802 my $class = shift; 3665 my $class = shift;
2803 3666
2804 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
2805 aspect => 1, 3670 aspect => 1,
2806 can_events => 0, 3671 can_events => 0,
2807 @_, 3672 @_,
2808 ); 3673 );
2809 3674
2810 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
2812 3677
2813 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
2815 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
2816 interval => $self->{animspeed}, 3681 return unless $::CONN;
2817 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
2818 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
2819 $widget->update; 3690 $w->update;
2820 }, 3691 $w->update_timer;
2821 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
2822 } 3696 }
2823 3697
2824 $self 3698 $self
2825} 3699}
2826 3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 if ($self->{visible}) {
3707 $self->{timer}->set (
3708 $self->{anim_start}
3709 + $self->{animspeed}
3710 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3711 );
3712 $self->{timer}->start;
3713 } else {
3714 $self->{timer}->stop;
3715 }
3716}
3717
3718sub update_face {
3719 my ($self) = @_;
3720
3721 if ($::CONN) {
3722 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3723 if ($anim && @$anim) {
3724 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3725 delete $self->{face_change_cb};
3726
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3728 unless ($tex->{name} || $tex->{loading}) {
3729 $tex->upload (sub { $self->reconfigure });
3730 }
3731 }
3732 }
3733 }
3734 }
3735}
3736
2827sub size_request { 3737sub size_request {
2828 (32, 8) 3738 my ($self) = @_;
3739
3740 if ($::CONN) {
3741 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3742 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3743 if ($tex->{name}) {
3744 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3745 } elsif (!$tex->{loading}) {
3746 $tex->upload (sub { $self->reconfigure });
3747 }
3748 }
3749
3750 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3751 }
3752 }
3753
3754 ($self->{size_w} || 8, $self->{size_h} || 8)
2829} 3755}
2830 3756
2831sub update { 3757sub update {
2832 my ($self) = @_; 3758 my ($self) = @_;
2833 3759
2834 return unless $self->{visible}; 3760 return unless $self->{visible};
2835 3761
2836 $self->SUPER::update; 3762 $self->SUPER::update;
2837} 3763}
2838 3764
3765sub invoke_visibility_change {
3766 my ($self) = @_;
3767
3768 $self->update_timer;
3769
3770 0
3771}
3772
2839sub _draw { 3773sub _draw {
2840 my ($self) = @_; 3774 my ($self) = @_;
2841 3775
2842 return unless $::CONN; 3776 $self->SUPER::_draw;
2843 3777
2844 my $face; 3778 if (my $tex = $self->{tex}) {
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854
2855 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3779 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3781 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3782 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3783 glDisable GL_TEXTURE_2D;
2861 } 3784 }
2862} 3785}
2863 3786
2864sub DESTROY { 3787sub destroy {
2865 my ($self) = @_; 3788 my ($self) = @_;
2866 3789
2867 $self->{timer}->cancel 3790 (delete $self->{timer})->cancel
2868 if $self->{timer}; 3791 if $self->{timer};
2869 3792
2870 $self->SUPER::DESTROY; 3793 $self->SUPER::destroy;
2871} 3794}
2872 3795
2873############################################################################# 3796#############################################################################
2874 3797
2875package CFClient::UI::Buttonbar; 3798package CFPlus::UI::Buttonbar;
2876 3799
2877our @ISA = CFClient::UI::HBox::; 3800our @ISA = CFPlus::UI::HBox::;
2878 3801
2879# TODO: should actualyl wrap buttons and other goodies. 3802# TODO: should actually wrap buttons and other goodies.
2880 3803
2881############################################################################# 3804#############################################################################
2882 3805
2883package CFClient::UI::Menu; 3806package CFPlus::UI::Menu;
2884 3807
2885our @ISA = CFClient::UI::FancyFrame::; 3808our @ISA = CFPlus::UI::Toplevel::;
2886 3809
2887use CFClient::OpenGL; 3810use CFPlus::OpenGL;
2888 3811
2889sub new { 3812sub new {
2890 my $class = shift; 3813 my $class = shift;
2891 3814
2892 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
2893 items => [], 3816 items => [],
2894 z => 100, 3817 z => 100,
2895 @_, 3818 @_,
2896 ); 3819 );
2897 3820
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3821 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3822
2900 for my $item (@{ $self->{items} }) { 3823 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3824 my ($widget, $cb, $tooltip) = @$item;
2902 3825
2903 # handle various types of items, only text for now 3826 # handle various types of items, only text for now
2904 if (!ref $widget) { 3827 if (!ref $widget) {
3828 if ($widget =~ /\t/) {
3829 my ($left, $right) = split /\t/, $widget, 2;
3830
2905 $widget = new CFClient::UI::Label 3831 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3832 can_hover => 1,
2907 can_events => 1, 3833 can_events => 1,
3834 tooltip => $tooltip,
3835 children => [
3836 (new CFPlus::UI::Label markup => $left, expand => 1),
3837 (new CFPlus::UI::Label markup => $right, align => +1),
3838 ],
3839 ;
3840
3841 } else {
3842 $widget = new CFPlus::UI::Label
3843 can_hover => 1,
3844 can_events => 1,
2908 text => $widget; 3845 markup => $widget,
3846 tooltip => $tooltip;
3847 }
2909 } 3848 }
2910 3849
2911 $self->{item}{$widget} = $item; 3850 $self->{item}{$widget} = $item;
2912 3851
2913 $self->{vbox}->add ($widget); 3852 $self->{vbox}->add ($widget);
… …
2918 3857
2919# popup given the event (must be a mouse button down event currently) 3858# popup given the event (must be a mouse button down event currently)
2920sub popup { 3859sub popup {
2921 my ($self, $ev) = @_; 3860 my ($self, $ev) = @_;
2922 3861
2923 $self->_emit ("popdown"); 3862 $self->emit ("popdown");
2924 3863
2925 # maybe save $GRAB? must be careful about events... 3864 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3865 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3866 $self->{button} = $ev->{button};
2928 3867
2929 $self->show; 3868 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3869 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3870}
2932 3871
2933sub mouse_motion { 3872sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3873 my ($self, $ev, $x, $y) = @_;
2935 3874
2936 # TODO: should use vbox->find_widget or so 3875 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3876 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3877 $self->{hover} = $self->{item}{$HOVER};
2939 3878
2940 0 3879 0
2941} 3880}
2942 3881
2943sub button_up { 3882sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3883 my ($self, $ev, $x, $y) = @_;
2945 3884
2946 if ($ev->{button} == $self->{button}) { 3885 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3886 undef $GRAB;
2948 $self->hide; 3887 $self->hide;
2949 3888
2950 $self->_emit ("popdown"); 3889 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3890 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3891 } else {
2953 return 0 3892 return 0
2954 } 3893 }
2955 3894
2956 1 3895 1
2957} 3896}
2958 3897
2959############################################################################# 3898#############################################################################
2960 3899
2961package CFClient::UI::Multiplexer; 3900package CFPlus::UI::Multiplexer;
2962 3901
2963our @ISA = CFClient::UI::Container::; 3902our @ISA = CFPlus::UI::Container::;
2964 3903
2965sub new { 3904sub new {
2966 my $class = shift; 3905 my $class = shift;
2967 3906
2968 my $self = $class->SUPER::new ( 3907 my $self = $class->SUPER::new (
… …
2982 3921
2983 $self->{current} = $self->{children}[0] 3922 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3923 if @{ $self->{children} };
2985} 3924}
2986 3925
3926sub get_current_page {
3927 my ($self) = @_;
3928
3929 $self->{current}
3930}
3931
2987sub set_current_page { 3932sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3933 my ($self, $page_or_widget) = @_;
2989 3934
2990 my $widget = ref $page_or_widget 3935 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3936 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3937 : $self->{children}[$page_or_widget];
2993 3938
2994 $self->{current} = $widget; 3939 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3940 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3941
2997 $self->_emit (page_changed => $self->{current}); 3942 $self->emit (page_changed => $self->{current});
2998 3943
2999 $self->realloc; 3944 $self->realloc;
3000} 3945}
3001 3946
3002sub visible_children { 3947sub visible_children {
… …
3007 my ($self) = @_; 3952 my ($self) = @_;
3008 3953
3009 $self->{current}->size_request 3954 $self->{current}->size_request
3010} 3955}
3011 3956
3012sub size_allocate { 3957sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3958 my ($self, $w, $h) = @_;
3014 3959
3015 $self->{current}->configure (0, 0, $w, $h); 3960 $self->{current}->configure (0, 0, $w, $h);
3961
3962 1
3016} 3963}
3017 3964
3018sub _draw { 3965sub _draw {
3019 my ($self) = @_; 3966 my ($self) = @_;
3020 3967
3021 $self->{current}->draw; 3968 $self->{current}->draw;
3022} 3969}
3023 3970
3024############################################################################# 3971#############################################################################
3025 3972
3026package CFClient::UI::Notebook; 3973package CFPlus::UI::Notebook;
3027 3974
3975use CFPlus::OpenGL;
3976
3028our @ISA = CFClient::UI::VBox::; 3977our @ISA = CFPlus::UI::VBox::;
3029 3978
3030sub new { 3979sub new {
3031 my $class = shift; 3980 my $class = shift;
3032 3981
3033 my $self = $class->SUPER::new ( 3982 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3983 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3984 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3985 active_outline => [.7, .7, 0.2],
3036 # filter => # will be put between multiplexer and $self 3986 # filter => # will be put between multiplexer and $self
3037 @_, 3987 @_,
3038 ); 3988 );
3039 3989
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3990 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3991 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042 3992
3993 {
3994 Scalar::Util::weaken (my $wself = $self);
3995
3996 $self->{multiplexer}->connect (c_add => sub {
3997 my ($mplex, $widgets) = @_;
3998
3999 for my $child (@$widgets) {
4000 Scalar::Util::weaken $child;
4001 $child->{c_tab_} ||= do {
4002 my $tab =
4003 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4004 ? $child->{c_tab}
4005 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4006
4007 $tab->connect (activate => sub {
4008 $wself->set_current_page ($child);
4009 });
4010
4011 $tab
4012 };
4013
4014 $self->{buttonbar}->add ($child->{c_tab_});
4015 }
4016 });
4017
4018 $self->{multiplexer}->connect (c_remove => sub {
4019 my ($mplex, $widgets) = @_;
4020
4021 for my $child (@$widgets) {
4022 $wself->{buttonbar}->remove ($child->{c_tab_});
4023 }
4024 });
4025 }
4026
3043 $self 4027 $self
3044} 4028}
3045 4029
3046sub add { 4030sub add {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->add (@widgets)
4034}
4035
4036sub remove {
4037 my ($self, @widgets) = @_;
4038
4039 $self->{multiplexer}->remove (@widgets)
4040}
4041
4042sub pages {
4043 my ($self) = @_;
4044 $self->{multiplexer}->children
4045}
4046
4047sub add_tab {
3047 my ($self, $title, $widget, $tooltip) = @_; 4048 my ($self, $title, $widget, $tooltip) = @_;
3048 4049
3049 Scalar::Util::weaken $self; 4050 $title = [$title, $tooltip] unless ref $title;
4051 $widget->{c_tab} = $title;
3050 4052
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget); 4053 $self->add ($widget);
4054}
4055
4056sub get_current_page {
4057 my ($self) = @_;
4058
4059 $self->{multiplexer}->get_current_page
3058} 4060}
3059 4061
3060sub set_current_page { 4062sub set_current_page {
3061 my ($self, $page) = @_; 4063 my ($self, $page) = @_;
3062 4064
3063 $self->{multiplexer}->set_current_page ($page); 4065 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 4066 $self->emit (page_changed => $self->{multiplexer}{current});
4067}
4068
4069sub _draw {
4070 my ($self) = @_;
4071
4072 $self->SUPER::_draw ();
4073
4074 if (my $cur = $self->{multiplexer}{current}) {
4075 if ($cur = $cur->{c_tab_}) {
4076 glTranslate $self->{buttonbar}{x} + $cur->{x},
4077 $self->{buttonbar}{y} + $cur->{y};
4078 glLineWidth 3;
4079 #glEnable GL_BLEND;
4080 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4081 glColor @{$self->{active_outline}};
4082 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4083 glLineWidth 1;
4084 #glDisable GL_BLEND;
4085 }
4086 }
3065} 4087}
3066 4088
3067############################################################################# 4089#############################################################################
3068 4090
3069package CFClient::UI::Statusbox; 4091package CFPlus::UI::Selector;
3070 4092
4093use utf8;
4094
3071our @ISA = CFClient::UI::VBox::; 4095our @ISA = CFPlus::UI::Button::;
3072 4096
3073sub new { 4097sub new {
3074 my $class = shift; 4098 my $class = shift;
3075 4099
3076 $class->SUPER::new ( 4100 my $self = $class->SUPER::new (
4101 options => [], # [value, title, longdesc], ...
4102 value => undef,
4103 @_,
4104 );
4105
4106 $self->_set_value ($self->{value});
4107
4108 $self
4109}
4110
4111sub invoke_button_down {
4112 my ($self, $ev) = @_;
4113
4114 my @menu_items;
4115
4116 for (@{ $self->{options} }) {
4117 my ($value, $title, $tooltip) = @$_;
4118
4119 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4120 }
4121
4122 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4123}
4124
4125sub _set_value {
4126 my ($self, $value) = @_;
4127
4128 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4129 $item ||= $self->{options}[0]
4130 or return;
4131
4132 $self->{value} = $item->[0];
4133 $self->set_markup ("$item->[1] ⇓");
4134# $self->set_tooltip ($item->[2]);
4135}
4136
4137sub set_value {
4138 my ($self, $value) = @_;
4139
4140 return unless $self->{value} ne $value;
4141
4142 $self->_set_value ($value);
4143 $self->emit (changed => $value);
4144}
4145
4146sub set_options {
4147 my ($self, $options) = @_;
4148
4149 $self->{options} = $options;
4150 $self->_set_value ($self->{value});
4151}
4152
4153#############################################################################
4154
4155package CFPlus::UI::Statusbox;
4156
4157our @ISA = CFPlus::UI::VBox::;
4158
4159sub new {
4160 my $class = shift;
4161
4162 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 4163 fontsize => 0.8,
3078 @_, 4164 @_,
3079 ) 4165 );
4166
4167 CFPlus::weaken (my $this = $self);
4168
4169 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4170
4171 $self
3080} 4172}
3081 4173
3082sub reorder { 4174sub reorder {
3083 my ($self) = @_; 4175 my ($self) = @_;
3084 my $NOW = time; 4176 my $NOW = Time::HiRes::time;
4177
4178 # freeze display when hovering over any label
4179 return if $CFPlus::UI::TOOLTIP->{owner}
4180 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4181 values %{ $self->{item} };
3085 4182
3086 while (my ($k, $v) = each %{ $self->{item} }) { 4183 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 4185 }
4186
4187 $self->{timer}->set (1, 1);
3089 4188
3090 my @widgets; 4189 my @widgets;
3091 4190
3092 my @items = sort { 4191 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
… …
3096 4195
3097 my $count = 10 + 1; 4196 my $count = 10 + 1;
3098 for my $item (@items) { 4197 for my $item (@items) {
3099 last unless --$count; 4198 last unless --$count;
3100 4199
3101 push @widgets, $item->{label} ||= do { 4200 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 4201 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 4202 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 4203 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 4204 : $item->{text};
3106 4205
3107 for ($short) { 4206 for ($short) {
3108 s/^\s+//; 4207 s/^\s+//;
3109 s/\s+/ /g; 4208 s/\s+/ /g;
3110 } 4209 }
3111 4210
3112 new CFClient::UI::Label 4211 new CFPlus::UI::Label
3113 markup => $short, 4212 markup => $short,
3114 tooltip => $item->{tooltip}, 4213 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 4214 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 4215 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 4216 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 4217 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 4218 fg => [@{ $item->{fg} }],
3120 can_events => 1, 4219 can_events => 1,
3121 can_hover => 1 4220 can_hover => 1
3122 }; 4221 };
4222
4223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4225 $label->update;
4226 $label->set_max_size (undef, $label->{req_h} * $diff)
4227 if $diff < 1;
4228 $self->{timer}->set (1/30, 1/30);
4229 } else {
4230 $label->{fg}[3] = $item->{fg}[3] || 1;
4231 }
4232
4233 push @widgets, $label;
3123 } 4234 }
3124 4235
3125 $self->clear; 4236 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 4237 $self->SUPER::add (reverse @widgets);
3127} 4238}
… …
3132 $text =~ s/^\s+//; 4243 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 4244 $text =~ s/\s+$//;
3134 4245
3135 return unless $text; 4246 return unless $text;
3136 4247
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 4248 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 4249
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4250 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 4251
3141 if (my $item = $self->{item}{$group}) { 4252 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 4253 if ($item->{text} eq $text) {
3143 $item->{count}++; 4254 $item->{count}++;
3144 } else { 4255 } else {
3145 $item->{count} = 1; 4256 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 4257 $item->{text} = $item->{tooltip} = $text;
3147 } 4258 }
3148 $item->{id} = ++$self->{id}; 4259 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 4260 $item->{timeout} = $timeout;
3150 delete $item->{label}; 4261 delete $item->{label};
3151 } else { 4262 } else {
3152 $self->{item}{$group} = { 4263 $self->{item}{$group} = {
3153 id => ++$self->{id}, 4264 id => ++$self->{id},
… …
3159 count => 1, 4270 count => 1,
3160 %arg, 4271 %arg,
3161 }; 4272 };
3162 } 4273 }
3163 4274
4275 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 4276 $self->reorder;
4277 });
3165} 4278}
3166 4279
3167sub reconfigure { 4280sub reconfigure {
3168 my ($self) = @_; 4281 my ($self) = @_;
3169 4282
… …
3172 4285
3173 $self->reorder; 4286 $self->reorder;
3174 $self->SUPER::reconfigure; 4287 $self->SUPER::reconfigure;
3175} 4288}
3176 4289
4290sub destroy {
4291 my ($self) = @_;
4292
4293 $self->{timer}->cancel;
4294
4295 $self->SUPER::destroy;
4296}
4297
3177############################################################################# 4298#############################################################################
3178 4299
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 4300package CFPlus::UI::Root;
3475 4301
3476our @ISA = CFClient::UI::Container::; 4302our @ISA = CFPlus::UI::Container::;
3477 4303
4304use List::Util qw(min max);
4305
3478use CFClient::OpenGL; 4306use CFPlus::OpenGL;
3479 4307
3480sub new { 4308sub new {
3481 my $class = shift; 4309 my $class = shift;
3482 4310
3483 my $self = $class->SUPER::new ( 4311 my $self = $class->SUPER::new (
3484 visible => 1, 4312 visible => 1,
3485 @_, 4313 @_,
3486 ); 4314 );
3487 4315
3488 Scalar::Util::weaken ($self->{root} = $self); 4316 CFPlus::weaken ($self->{root} = $self);
3489 4317
3490 $self 4318 $self
3491} 4319}
3492 4320
3493sub size_request { 4321sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 4336 $coord = $max - $size if $coord > $max - $size;
3509 4337
3510 int $coord + 0.5 4338 int $coord + 0.5
3511} 4339}
3512 4340
3513sub size_allocate { 4341sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 4342 my ($self, $w, $h) = @_;
3515 4343
3516 for my $child ($self->children) { 4344 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4345 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 4346
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 4350 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 4351 $Y = _to_pixel $Y, $H, $self->{h};
3524 4352
3525 $child->configure ($X, $Y, $W, $H); 4353 $child->configure ($X, $Y, $W, $H);
3526 } 4354 }
4355
4356 1
3527} 4357}
3528 4358
3529sub coord2local { 4359sub coord2local {
3530 my ($self, $x, $y) = @_; 4360 my ($self, $x, $y) = @_;
3531 4361
… …
3539} 4369}
3540 4370
3541sub update { 4371sub update {
3542 my ($self) = @_; 4372 my ($self) = @_;
3543 4373
3544 $::WANT_REFRESH++; 4374 $::WANT_REFRESH->start;
3545} 4375}
3546 4376
3547sub add { 4377sub add {
3548 my ($self, @children) = @_; 4378 my ($self, @children) = @_;
3549 4379
… …
3586 while ($self->{refresh_hook}) { 4416 while ($self->{refresh_hook}) {
3587 $_->() 4417 $_->()
3588 for values %{delete $self->{refresh_hook}}; 4418 for values %{delete $self->{refresh_hook}};
3589 } 4419 }
3590 4420
3591 if ($self->{realloc}) { 4421 while ($self->{realloc}) {
3592 my %queue; 4422 my %queue;
3593 my @queue; 4423 my @queue;
3594 my $widget; 4424 my $widget;
3595 4425
3596 outer: 4426 outer:
… …
3616 4446
3617 delete $queue{$widget+0}; 4447 delete $queue{$widget+0};
3618 4448
3619 my ($w, $h) = $widget->size_request; 4449 my ($w, $h) = $widget->size_request;
3620 4450
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4451 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4452 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4453
4454 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4455 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4456
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4457 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4458 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4459
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4460 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3640 } 4473 }
3641 } 4474 }
3642 4475
3643 delete $self->{realloc}{$widget+0}; 4476 delete $self->{realloc}{$widget+0};
3644 } 4477 }
3645 }
3646 4478
3647 while (my $size_alloc = delete $self->{size_alloc}) { 4479 while (my $size_alloc = delete $self->{size_alloc}) {
3648 my @queue = sort { $b->{visible} <=> $a->{visible} } 4480 my @queue = sort { $a->{visible} <=> $b->{visible} }
3649 values %$size_alloc; 4481 values %$size_alloc;
3650 4482
3651 while () { 4483 while () {
3652 my $widget = pop @queue || last; 4484 my $widget = pop @queue || last;
3653 4485
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4486 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4487
3656 $w = 0 if $w < 0; 4488 $w = max $widget->{min_w}, $w;
3657 $h = 0 if $h < 0; 4489 $h = max $widget->{min_h}, $h;
3658 4490
4491# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4492# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4493
4494 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4495 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4496
3659 $w = int $w + 0.5; 4497 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4498 $h = int $h + 0.5;
3661 4499
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4500 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w}; 4501 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h}; 4502 $widget->{old_h} = $widget->{h};
3665 4503
3666 $widget->{w} = $w; 4504 $widget->{w} = $w;
3667 $widget->{h} = $h; 4505 $widget->{h} = $h;
3668 4506
3669 $widget->emit (size_allocate => $w, $h); 4507 $widget->emit (size_allocate => $w, $h);
4508 }
3670 } 4509 }
3671 } 4510 }
3672 } 4511 }
3673 4512
3674 while ($self->{post_alloc_hook}) { 4513 while ($self->{post_alloc_hook}) {
3675 $_->() 4514 $_->()
3676 for values %{delete $self->{post_alloc_hook}}; 4515 for values %{delete $self->{post_alloc_hook}};
3677 } 4516 }
3678
3679 4517
3680 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4518 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4519 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3682 glClear GL_COLOR_BUFFER_BIT; 4520 glClear GL_COLOR_BUFFER_BIT;
3683 4521
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4524 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4525 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4526 glLoadIdentity;
3689 4527
3690 { 4528 {
3691 package CFClient::UI::Base; 4529 package CFPlus::UI::Base;
3692 4530
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4531 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4532 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4533
3697 $self->_draw; 4534 $self->_draw;
4535 }
3698} 4536}
3699 4537
3700############################################################################# 4538#############################################################################
3701 4539
3702package CFClient::UI; 4540package CFPlus::UI;
3703 4541
3704$ROOT = new CFClient::UI::Root; 4542$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4543$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4544
37071 45451
3708 4546

Diff Legend

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