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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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