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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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