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.262 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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