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.399 by root, Sat Jul 21 16:07:53 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 && @$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
673 $_->set_parent ($self) 762 $_->set_parent ($self)
674 for @widgets; 763 for @widgets;
675 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
676 use sort 'stable'; 766 use sort 'stable';
677 767
678 $self->{children} = [ 768 $self->{children} = [
679 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
680 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
681 ]; 771 ];
682 772
683 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
684} 776}
685 777
686sub children { 778sub children {
687 @{ $_[0]{children} } 779 @{ $_[0]{children} }
688} 780}
… …
699} 791}
700 792
701sub clear { 793sub clear {
702 my ($self) = @_; 794 my ($self) = @_;
703 795
704 my $children = delete $self->{children}; 796 my $children = $self->{children};
705 $self->{children} = []; 797 $self->{children} = [];
706 798
707 for (@$children) { 799 for (@$children) {
708 delete $_->{parent}; 800 delete $_->{parent};
709 $_->hide; 801 $_->hide;
… …
718 $x -= $self->{x}; 810 $x -= $self->{x};
719 $y -= $self->{y}; 811 $y -= $self->{y};
720 812
721 my $res; 813 my $res;
722 814
723 for (reverse @{ $self->{children} }) { 815 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 816 $res = $_->find_widget ($x, $y)
725 and return $res; 817 and return $res;
726 } 818 }
727 819
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 820 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
734 $_->draw for @{$self->{children}}; 826 $_->draw for @{$self->{children}};
735} 827}
736 828
737############################################################################# 829#############################################################################
738 830
739package CFClient::UI::Bin; 831package CFPlus::UI::Bin;
740 832
741our @ISA = CFClient::UI::Container::; 833our @ISA = CFPlus::UI::Container::;
742 834
743sub new { 835sub new {
744 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
745 837
746 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 838 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
747 839
748 $class->SUPER::new (children => [$child], %arg) 840 $class->SUPER::new (children => [$child], %arg)
749} 841}
750 842
751sub add { 843sub add {
752 my ($self, $child) = @_; 844 my ($self, $child) = @_;
753 845
754 $self->{children} = []; 846 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 847 $self->SUPER::add ($child);
757} 848}
758 849
759sub remove { 850sub remove {
760 my ($self, $widget) = @_; 851 my ($self, $widget) = @_;
761 852
762 $self->SUPER::remove ($widget); 853 $self->SUPER::remove ($widget);
763 854
764 $self->{children} = [new CFClient::UI::Empty] 855 $self->{children} = [new CFPlus::UI::Empty]
765 unless @{$self->{children}}; 856 unless @{$self->{children}};
766} 857}
767 858
768sub child { $_[0]->{children}[0] } 859sub child { $_[0]->{children}[0] }
769 860
770sub size_request { 861sub size_request {
771 $_[0]{children}[0]->size_request 862 $_[0]{children}[0]->size_request
772} 863}
773 864
774sub size_allocate { 865sub invoke_size_allocate {
775 my ($self, $w, $h) = @_; 866 my ($self, $w, $h) = @_;
776 867
777 $self->{children}[0]->configure (0, 0, $w, $h); 868 $self->{children}[0]->configure (0, 0, $w, $h);
869
870 1
778} 871}
779 872
780############################################################################# 873#############################################################################
781 874
875# back-buffered drawing area
876
782package CFClient::UI::Window; 877package CFPlus::UI::Window;
783 878
784our @ISA = CFClient::UI::Bin::; 879our @ISA = CFPlus::UI::Bin::;
785 880
786use CFClient::OpenGL; 881use CFPlus::OpenGL;
787 882
788sub new { 883sub new {
789 my ($class, %arg) = @_; 884 my ($class, %arg) = @_;
790 885
791 my $self = $class->SUPER::new (%arg); 886 my $self = $class->SUPER::new (%arg);
… …
796 891
797 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 892 $ROOT->on_post_alloc ($self => sub { $self->render_child });
798 $self->SUPER::update; 893 $self->SUPER::update;
799} 894}
800 895
801sub size_allocate { 896sub invoke_size_allocate {
802 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
803 898
804 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 899 $self->update;
900
901 $self->SUPER::invoke_size_allocate ($w, $h)
806} 902}
807 903
808sub _render { 904sub _render {
905 my ($self) = @_;
906
809 $_[0]{children}[0]->draw; 907 $self->{children}[0]->draw;
810} 908}
811 909
812sub render_child { 910sub render_child {
813 my ($self) = @_; 911 my ($self) = @_;
814 912
815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 913 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
816 glClearColor 0, 0, 0, 0; 914 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 915 glClear GL_COLOR_BUFFER_BIT;
818 916
917 {
918 package CFPlus::UI::Base;
919
920 local ($draw_x, $draw_y, $draw_w, $draw_h) =
921 (0, 0, $self->{w}, $self->{h});
922
819 $self->_render; 923 $self->_render;
924 }
820 }; 925 };
821} 926}
822 927
823sub _draw { 928sub _draw {
824 my ($self) = @_; 929 my ($self) = @_;
825
826 my ($w, $h) = ($self->w, $self->h);
827 930
828 my $tex = $self->{texture} 931 my $tex = $self->{texture}
829 or return; 932 or return;
830 933
831 glEnable GL_TEXTURE_2D; 934 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 936 glColor 0, 0, 0, 1;
834 937
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 938 $tex->draw_quad_alpha_premultiplied (0, 0);
836 939
837 glDisable GL_TEXTURE_2D; 940 glDisable GL_TEXTURE_2D;
838} 941}
839 942
840############################################################################# 943#############################################################################
841 944
842package CFClient::UI::ViewPort; 945package CFPlus::UI::ViewPort;
843 946
947use List::Util qw(min max);
948
844our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
845 950
846sub new { 951sub new {
847 my $class = shift; 952 my $class = shift;
848 953
849 $class->SUPER::new ( 954 $class->SUPER::new (
… …
856sub size_request { 961sub size_request {
857 my ($self) = @_; 962 my ($self) = @_;
858 963
859 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
860 965
861 $w = 10 if $self->{scroll_x}; 966 $w = 1 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y}; 967 $h = 1 if $self->{scroll_y};
863 968
864 ($w, $h) 969 ($w, $h)
865} 970}
866 971
867sub size_allocate { 972sub invoke_size_allocate {
868 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
869 974
870 my $child = $self->child; 975 my $child = $self->child;
871 976
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874 979
875 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
876 $self->update; 981 $self->update;
982
983 1
877} 984}
878 985
879sub set_offset { 986sub set_offset {
880 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
881 988
989 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
990 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
991
992 if ($x != $self->{view_x} or $y != $self->{view_y}) {
882 $self->{view_x} = int $x; 993 $self->{view_x} = $x;
883 $self->{view_y} = int $y; 994 $self->{view_y} = $y;
884 995
996 $self->emit (changed => $x, $y);
885 $self->update; 997 $self->update;
998 }
886} 999}
887 1000
888# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
889sub coord2local { 1002sub coord2local {
890 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
905 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
906 1019
907 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
908 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
909 ) { 1022 ) {
910 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
911 } else { 1024 } else {
912 $self->CFClient::UI::Base::find_widget ($x, $y) 1025 $self->CFPlus::UI::Base::find_widget ($x, $y)
913 } 1026 }
914} 1027}
915 1028
916sub _render { 1029sub _render {
917 my ($self) = @_; 1030 my ($self) = @_;
918 1031
1032 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1033 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1034
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 1036
921 $self->SUPER::_render; 1037 $self->SUPER::_render;
922} 1038}
923 1039
924############################################################################# 1040#############################################################################
925 1041
926package CFClient::UI::ScrolledWindow; 1042package CFPlus::UI::ScrolledWindow;
927 1043
928our @ISA = CFClient::UI::HBox::; 1044our @ISA = CFPlus::UI::Table::;
929 1045
930sub new { 1046sub new {
931 my $class = shift; 1047 my ($class, %arg) = @_;
1048
1049 my $child = delete $arg{child};
932 1050
933 my $self; 1051 my $self;
934 1052
935 my $slider = new CFClient::UI::Slider 1053 my $hslider = new CFPlus::UI::Slider
1054 col => 0,
1055 row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 col => 1,
1066 row => 0,
936 vertical => 1, 1067 vertical => 1,
937 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
938 on_changed => sub { 1069 on_changed => sub {
939 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
940 }, 1072 },
941 ; 1073 ;
942 1074
943 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1078 can_events => 1,
945 slider => $slider, 1079 hslider => $hslider,
946 @_, 1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
1083 %arg,
947 ); 1084 );
948 1085
949 $self->{vp}->add ($self->{scrolled}); 1086 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0,
1088 row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 ;
1101
950 $self->add ($self->{vp}); 1102 $self->SUPER::add ($self->{vp});
951 $self->add ($self->{slider}); 1103
1104 $self->add ($child) if $child;
952 1105
953 $self 1106 $self
954} 1107}
955 1108
1109sub add {
1110 my ($self, $widget) = @_;
1111
1112 $self->{vp}->add ($self->{child} = $widget);
1113}
1114
956sub update { 1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub start_dragging {
957 my ($self) = @_; 1142 my ($self, $ev) = @_;
958 1143
959 $self->SUPER::update; 1144 $self->grab_focus;
960 1145
961 # todo: overwrite size_allocate of child 1146 my $ox = $self->{vp}{view_x};
962 my $child = $self->{vp}->child; 1147 my $oy = $self->{vp}{view_y};
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1148
964} 1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
965 1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1159sub invoke_mouse_wheel {
1160 my ($self, $ev) = @_;
1161
1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1164
1165 1
1166}
1167
1168sub invoke_button_down {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1181
1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1198}
1199
966sub size_allocate { 1200sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
968 1202
1203 $self->update_slider;
969 $self->SUPER::size_allocate ($w, $h); 1204 $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} 1205}
974
975#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll
977 1206
978############################################################################# 1207#############################################################################
979 1208
980package CFClient::UI::Frame; 1209package CFPlus::UI::Frame;
981 1210
982our @ISA = CFClient::UI::Bin::; 1211our @ISA = CFPlus::UI::Bin::;
983 1212
984use CFClient::OpenGL; 1213use CFPlus::OpenGL;
985 1214
986sub new { 1215sub new {
987 my $class = shift; 1216 my $class = shift;
988 1217
989 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
997 1226
998 if ($self->{bg}) { 1227 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1000 1229
1001 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1004 1233
1005 glBegin GL_QUADS; 1234 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1235 glVertex 0 , 0;
1007 glVertex 0 , $h; 1236 glVertex 0 , $h;
1008 glVertex $w, $h; 1237 glVertex $w, $h;
… …
1015 $self->SUPER::_draw; 1244 $self->SUPER::_draw;
1016} 1245}
1017 1246
1018############################################################################# 1247#############################################################################
1019 1248
1020package CFClient::UI::FancyFrame; 1249package CFPlus::UI::FancyFrame;
1021 1250
1022our @ISA = CFClient::UI::Bin::; 1251our @ISA = CFPlus::UI::Bin::;
1023 1252
1024use CFClient::OpenGL; 1253use CFPlus::OpenGL;
1254
1255sub new {
1256 my ($class, %arg) = @_;
1257
1258 if ((exists $arg{label}) && !ref $arg{label}) {
1259 $arg{label} = new CFPlus::UI::Label
1260 align => 1,
1261 valign => 0,
1262 text => $arg{label},
1263 fontsize => ($arg{border} || 0.8) * 0.75;
1264 }
1265
1266 my $self = $class->SUPER::new (
1267 # label => "",
1268 fg => [0.6, 0.3, 0.1],
1269 border => 0.8,
1270 style => 'single',
1271 %arg,
1272 );
1273
1274 $self
1275}
1276
1277sub add {
1278 my ($self, @widgets) = @_;
1279
1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1282}
1283
1284sub border {
1285 int $_[0]{border} * $::FONTSIZE
1286}
1287
1288sub size_request {
1289 my ($self) = @_;
1290
1291 ($self->{label_w}, undef) = $self->{label}->size_request
1292 if $self->{label};
1293
1294 my ($w, $h) = $self->SUPER::size_request;
1295
1296 (
1297 $w + $self->border * 2,
1298 $h + $self->border * 2,
1299 )
1300}
1301
1302sub invoke_size_allocate {
1303 my ($self, $w, $h) = @_;
1304
1305 my $border = $self->border;
1306
1307 $w -= List::Util::max 0, $border * 2;
1308 $h -= List::Util::max 0, $border * 2;
1309
1310 if (my $label = $self->{label}) {
1311 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1312 $label->{h} = List::Util::min $h, $border;
1313 $label->invoke_size_allocate ($label->{w}, $label->{h});
1314 }
1315
1316 $self->child->configure ($border, $border, $w, $h);
1317
1318 1
1319}
1320
1321sub _draw {
1322 my ($self) = @_;
1323
1324 my $child = $self->{children}[0];
1325
1326 my $border = $self->border;
1327 my ($w, $h) = ($self->{w}, $self->{h});
1328
1329 $child->draw;
1330
1331 glColor @{$self->{fg}};
1332 glBegin GL_LINE_STRIP;
1333 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1339 glEnd;
1340
1341 if ($self->{label}) {
1342 glTranslate $border * 2, 0;
1343 $self->{label}->_draw;
1344 }
1345}
1346
1347#############################################################################
1348
1349package CFPlus::UI::Toplevel;
1350
1351our @ISA = CFPlus::UI::Bin::;
1352
1353use CFPlus::OpenGL;
1025 1354
1026my $bg = 1355my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1356 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1; 1357 mipmap => 1, wrap => 1;
1029 1358
1030my @border = 1359my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1360 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); 1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1033 1362
1363my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png);
1366
1034sub new { 1367sub new {
1035 my $class = shift; 1368 my ($class, %arg) = @_;
1036 1369
1037 my $self = $class->SUPER::new ( 1370 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1371 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1372 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1373 border => 0.6,
1041 can_events => 1, 1374 can_events => 1,
1042 min_w => 16, 1375 min_w => 64,
1043 min_h => 16, 1376 min_h => 32,
1044 @_ 1377 %arg,
1045 ); 1378 );
1046 1379
1047 $self->{title} &&= new CFClient::UI::Label 1380 $self->{title_widget} = new CFPlus::UI::Label
1048 align => 0, 1381 align => 0,
1049 valign => 1, 1382 valign => 1,
1050 text => $self->{title}, 1383 text => $self->{title},
1051 fontsize => $self->{border}; 1384 fontsize => $self->{border},
1385 if exists $self->{title};
1386
1387 if ($self->{has_close_button}) {
1388 $self->{close_button} =
1389 new CFPlus::UI::ImageButton
1390 path => 'x1_close.png',
1391 on_activate => sub { $self->emit ("delete") };
1392
1393 $self->CFPlus::UI::Container::add ($self->{close_button});
1394 }
1052 1395
1053 $self 1396 $self
1397}
1398
1399sub add {
1400 my ($self, @widgets) = @_;
1401
1402 $self->SUPER::add (@widgets);
1403 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1404 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1054} 1405}
1055 1406
1056sub border { 1407sub border {
1057 int $_[0]{border} * $::FONTSIZE 1408 int $_[0]{border} * $::FONTSIZE
1058} 1409}
1059 1410
1060sub size_request { 1411sub size_request {
1061 my ($self) = @_; 1412 my ($self) = @_;
1413
1414 $self->{title_widget}->size_request
1415 if $self->{title_widget};
1416
1417 $self->{close_button}->size_request
1418 if $self->{close_button};
1062 1419
1063 my ($w, $h) = $self->SUPER::size_request; 1420 my ($w, $h) = $self->SUPER::size_request;
1064 1421
1065 ( 1422 (
1066 $w + $self->border * 2, 1423 $w + $self->border * 2,
1067 $h + $self->border * 2, 1424 $h + $self->border * 2,
1068 ) 1425 )
1069} 1426}
1070 1427
1071sub size_allocate { 1428sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1429 my ($self, $w, $h) = @_;
1073 1430
1431 if ($self->{title_widget}) {
1432 $self->{title_widget}{w} = $w;
1433 $self->{title_widget}{h} = $h;
1434 $self->{title_widget}->invoke_size_allocate ($w, $h);
1435 }
1436
1437 my $border = $self->border;
1438
1074 $h -= List::Util::max 0, $self->border * 2; 1439 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1440 $w -= List::Util::max 0, $border * 2;
1076 1441
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); 1442 $self->child->configure ($border, $border, $w, $h);
1081}
1082 1443
1444 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1445 if $self->{close_button};
1446
1447 1
1448}
1449
1450sub invoke_delete {
1451 my ($self) = @_;
1452
1453 $self->hide;
1454
1455 1
1456}
1457
1083sub button_down { 1458sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1459 my ($self, $ev, $x, $y) = @_;
1085 1460
1086 my ($w, $h) = @$self{qw(w h)}; 1461 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1462 my $border = $self->border;
1088 1463
… …
1104 my $dy = $ev->{y} - $oy; 1479 my $dy = $ev->{y} - $oy;
1105 1480
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1481 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1482 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1483
1484 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1485 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1486 };
1112 1487
1113 } elsif ($lr ^ $td) { 1488 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1489 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1490 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1493 my ($ev, $x, $y) = @_;
1119 1494
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1495 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1496
1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1497 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1498 # HACK: the next line is required to enforce placement
1499 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1123 }; 1500 };
1501 } else {
1502 return 0;
1503 }
1504
1124 } 1505 1
1125} 1506}
1126 1507
1127sub button_up { 1508sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1129 1510
1130 delete $self->{motion}; 1511 ! ! delete $self->{motion}
1131} 1512}
1132 1513
1133sub mouse_motion { 1514sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1515 my ($self, $ev, $x, $y) = @_;
1135 1516
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1517 $self->{motion}->($ev, $x, $y) if $self->{motion};
1518
1519 ! ! $self->{motion}
1520}
1521
1522sub invoke_visibility_change {
1523 my ($self, $visible) = @_;
1524
1525 delete $self->{motion} unless $visible;
1526
1527 0
1137} 1528}
1138 1529
1139sub _draw { 1530sub _draw {
1140 my ($self) = @_; 1531 my ($self) = @_;
1141 1532
1533 my $child = $self->{children}[0];
1534
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1535 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1536 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1537
1145 glEnable GL_TEXTURE_2D; 1538 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1540
1148 my $border = $self->border; 1541 my $border = $self->border;
1149 1542
1150 glColor @{ $self->{border_bg} }; 1543 glColor @{ $self->{border_bg} };
1151 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548
1549 # move
1550 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555
1556 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1155 1562
1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1157 glColor @{ $self->{bg} }; 1564 glColor @{ $self->{bg} };
1158 1565
1159 # TODO: repeat texture not scale 1566 # TODO: repeat texture not scale
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1570 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1571 }
1165 1572
1166 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1167 1574
1168 $self->{title}->draw if $self->{title};
1169
1170 $self->child->draw; 1575 $child->draw;
1576
1577 if ($self->{title_widget}) {
1578 glTranslate 0, $border - $self->{h};
1579 $self->{title_widget}->_draw;
1580
1581 glTranslate 0, - ($border - $self->{h});
1582 }
1583
1584 $self->{close_button}->draw
1585 if $self->{close_button};
1171} 1586}
1172 1587
1173############################################################################# 1588#############################################################################
1174 1589
1175package CFClient::UI::Table; 1590package CFPlus::UI::Table;
1176 1591
1177our @ISA = CFClient::UI::Base::; 1592our @ISA = CFPlus::UI::Container::;
1178 1593
1179use List::Util qw(max sum); 1594use List::Util qw(max sum);
1180 1595
1181use CFClient::OpenGL; 1596use CFPlus::OpenGL;
1182 1597
1183sub new { 1598sub new {
1184 my $class = shift; 1599 my $class = shift;
1185 1600
1186 $class->SUPER::new ( 1601 $class->SUPER::new (
1187 col_expand => [], 1602 col_expand => [],
1603 row_expand => [],
1188 @_, 1604 @_,
1189 ) 1605 )
1190} 1606}
1191 1607
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1194}
1195
1196sub add { 1608sub add {
1197 my ($self, $x, $y, $child) = @_;
1198
1199 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child;
1201
1202 $self->realloc;
1203}
1204
1205# TODO: move to container class maybe? send children a signal on removal?
1206sub clear {
1207 my ($self) = @_; 1609 my ($self, @widgets) = @_;
1610
1611 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1;
1613 $child->{colspan} ||= 1;
1614 }
1615
1616 $self->SUPER::add (@widgets);
1617}
1618
1619sub add_at {
1620 my $self = shift;
1621
1622 my @widgets;
1623
1624 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, ();
1626
1627 $child->{row} = $row;
1628 $child->{col} = $col;
1629
1630 push @widgets, $child;
1631 }
1632
1633 $self->add (@widgets);
1634}
1635
1636sub get_wh {
1637 my ($self) = @_;
1638
1639 my (@w, @h);
1208 1640
1209 my @children = $self->children; 1641 my @children = $self->children;
1210 delete $self->{children}; 1642
1643 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646
1647 my $sw = sum @w[$c .. $c + $cs - 1];
1648
1649 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 }
1211 1652 }
1212 for (@children) {
1213 delete $_->{parent};
1214 $_->hide;
1215 }
1216 1653
1217 $self->realloc; 1654 # second pass, rows
1218} 1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1219
1220sub get_wh {
1221 my ($self) = @_;
1222
1223 my (@w, @h);
1224
1225 for my $y (0 .. $#{$self->{children}}) {
1226 my $row = $self->{children}[$y]
1227 or next;
1228
1229 for my $x (0 .. $#$row) {
1230 my $widget = $row->[$x]
1231 or next;
1232 my ($w, $h) = @$widget{qw(req_w req_h)}; 1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1233 1657
1234 $w[$x] = max $w[$x], $w; 1658 my $sh = sum @h[$r .. $r + $rs - 1];
1235 $h[$y] = max $h[$y], $h; 1659
1660 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1236 } 1662 }
1237 } 1663 }
1238 1664
1239 (\@w, \@h) 1665 (\@w, \@h)
1240} 1666}
… …
1248 (sum @$ws), 1674 (sum @$ws),
1249 (sum @$hs), 1675 (sum @$hs),
1250 ) 1676 )
1251} 1677}
1252 1678
1253sub size_allocate { 1679sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1255 1681
1256 my ($ws, $hs) = $self->get_wh; 1682 my ($ws, $hs) = $self->get_wh;
1257 1683
1258 my $req_w = (sum @$ws) || 1; 1684 my $req_w = (sum @$ws) || 1;
1259 my $req_h = (sum @$hs) || 1; 1685 my $req_h = (sum @$hs) || 1;
1260 1686
1261 # TODO: nicer code && do row_expand 1687 # now linearly scale the rows/columns to the allocated size
1262 my @col_expand = @{$self->{col_expand}}; 1688 my @col_expand = @{$self->{col_expand}};
1263 @col_expand = (1) x @$ws unless @col_expand; 1689 @col_expand = (1) x @$ws unless @col_expand;
1264 my $col_expand = (sum @col_expand) || 1; 1690 my $col_expand = (sum @col_expand) || 1;
1265 1691
1266 # linearly scale sizes
1267 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1268 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1269 1693
1270 CFClient::UI::harmonize $ws; 1694 CFPlus::UI::harmonize $ws;
1695
1696 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1;
1699
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701
1271 CFClient::UI::harmonize $hs; 1702 CFPlus::UI::harmonize $hs;
1272 1703
1273 my $y; 1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1274 1706
1275 for my $r (0 .. $#{$self->{children}}) { 1707 for my $widget ($self->children) {
1276 my $row = $self->{children}[$r] 1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1277 or next;
1278 1709
1279 my $x = 0; 1710 $widget->configure (
1280 my $row_h = $hs->[$r]; 1711 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1281 1713 );
1282 for my $c (0 .. $#$row) { 1714 }
1283 my $col_w = $ws->[$c];
1284 1715
1285 if (my $widget = $row->[$c]) { 1716 1
1286 $widget->configure ($x, $y, $col_w, $row_h); 1717}
1287 }
1288 1718
1289 $x += $col_w; 1719#############################################################################
1720
1721package CFPlus::UI::Fixed;
1722
1723use List::Util qw(min max);
1724
1725our @ISA = CFPlus::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) {
1735 my ($mode, $val, $max) = @_;
1736
1737 $mode eq "abs" ? $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1290 } 1757 }
1291
1292 $y += $row_h;
1293 } 1758 }
1294 1759
1295} 1760 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1;
1296 1762
1297sub find_widget { 1763 # now layout remaining widgets
1764 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1766
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1775 }
1776 }
1777
1778 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1;
1780
1781 ($W, $H)
1782}
1783
1784sub invoke_size_allocate {
1298 my ($self, $x, $y) = @_; 1785 my ($self, $W, $H) = @_;
1299 1786
1300 $x -= $self->{x}; 1787 for my $child ($self->visible_children) {
1301 $y -= $self->{y}; 1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1302 1789
1303 my $res; 1790 $x = _scale $pos, $x, $W;
1791 $y = _scale $pos, $x, $H;
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1304 1794
1305 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1795 $child->configure ($x, $y, $w, $h);
1306 $res = $_->find_widget ($x, $y) 1796 }
1307 and return $res; 1797
1308 } 1798 1
1309
1310 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1311}
1312
1313sub _draw {
1314 my ($self) = @_;
1315
1316 for (grep $_, @{$self->{children}}) {
1317 $_->draw for grep $_, @$_;
1318 }
1319} 1799}
1320 1800
1321############################################################################# 1801#############################################################################
1322 1802
1323package CFClient::UI::Box; 1803package CFPlus::UI::Box;
1324 1804
1325our @ISA = CFClient::UI::Container::; 1805our @ISA = CFPlus::UI::Container::;
1326 1806
1327sub size_request { 1807sub size_request {
1328 my ($self) = @_; 1808 my ($self) = @_;
1329 1809
1330 $self->{vertical} 1810 $self->{vertical}
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1818 )
1339} 1819}
1340 1820
1341sub size_allocate { 1821sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1822 my ($self, $w, $h) = @_;
1343 1823
1344 my $space = $self->{vertical} ? $h : $w; 1824 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1825 my @children = $self->visible_children;
1346 1826
1347 my @req; 1827 my @req;
1348 1828
1349 if ($self->{homogeneous}) { 1829 if ($self->{homogeneous}) {
1350 @req = ($space / (@$children || 1)) x @$children; 1830 @req = ($space / (@children || 1)) x @children;
1351 } else { 1831 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1832 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1353 my $req = List::Util::sum @req; 1833 my $req = List::Util::sum @req;
1354 1834
1355 if ($req > $space) { 1835 if ($req > $space) {
1356 # ah well, not enough space 1836 # ah well, not enough space
1357 $_ *= $space / $req for @req; 1837 $_ *= $space / $req for @req;
1358 } else { 1838 } else {
1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1839 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1360 1840
1361 $space = ($space - $req) / $expand; # remaining space to give away 1841 $space = ($space - $req) / $expand; # remaining space to give away
1362 1842
1363 $req[$_] += $space * $children->[$_]{expand} 1843 $req[$_] += $space * $children[$_]{expand}
1364 for 0 .. $#$children; 1844 for 0 .. $#children;
1365 } 1845 }
1366 } 1846 }
1367 1847
1368 CFClient::UI::harmonize \@req; 1848 CFPlus::UI::harmonize \@req;
1369 1849
1370 my $pos = 0; 1850 my $pos = 0;
1371 for (0 .. $#$children) { 1851 for (0 .. $#children) {
1372 my $alloc = $req[$_]; 1852 my $alloc = $req[$_];
1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1853 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1374 1854
1375 $pos += $alloc; 1855 $pos += $alloc;
1376 } 1856 }
1377 1857
1378 1 1858 1
1379} 1859}
1380 1860
1381############################################################################# 1861#############################################################################
1382 1862
1383package CFClient::UI::HBox; 1863package CFPlus::UI::HBox;
1384 1864
1385our @ISA = CFClient::UI::Box::; 1865our @ISA = CFPlus::UI::Box::;
1386 1866
1387sub new { 1867sub new {
1388 my $class = shift; 1868 my $class = shift;
1389 1869
1390 $class->SUPER::new ( 1870 $class->SUPER::new (
… …
1393 ) 1873 )
1394} 1874}
1395 1875
1396############################################################################# 1876#############################################################################
1397 1877
1398package CFClient::UI::VBox; 1878package CFPlus::UI::VBox;
1399 1879
1400our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1401 1881
1402sub new { 1882sub new {
1403 my $class = shift; 1883 my $class = shift;
1404 1884
1405 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1408 ) 1888 )
1409} 1889}
1410 1890
1411############################################################################# 1891#############################################################################
1412 1892
1413package CFClient::UI::Label; 1893package CFPlus::UI::Label;
1414 1894
1415our @ISA = CFClient::UI::DrawBG::; 1895our @ISA = CFPlus::UI::DrawBG::;
1416 1896
1417use CFClient::OpenGL; 1897use CFPlus::OpenGL;
1418 1898
1419sub new { 1899sub new {
1420 my ($class, %arg) = @_; 1900 my ($class, %arg) = @_;
1421 1901
1422 my $self = $class->SUPER::new ( 1902 my $self = $class->SUPER::new (
… …
1425 #active_bg => none 1905 #active_bg => none
1426 #font => default_font 1906 #font => default_font
1427 #text => initial text 1907 #text => initial text
1428 #markup => initial narkup 1908 #markup => initial narkup
1429 #max_w => maximum pixel width 1909 #max_w => maximum pixel width
1910 #style => 0, # render flags
1430 ellipsise => 3, # end 1911 ellipsise => 3, # end
1431 layout => (new CFClient::Layout), 1912 layout => (new CFPlus::Layout),
1432 fontsize => 1, 1913 fontsize => 1,
1433 align => -1, 1914 align => -1,
1434 valign => -1, 1915 valign => -1,
1435 padding_x => 2, 1916 padding_x => 2,
1436 padding_y => 2, 1917 padding_y => 2,
1437 can_events => 0, 1918 can_events => 0,
1438 %arg 1919 %arg
1439 ); 1920 );
1440 1921
1441 if (exists $self->{template}) { 1922 if (exists $self->{template}) {
1442 my $layout = new CFClient::Layout; 1923 my $layout = new CFPlus::Layout;
1443 $layout->set_text (delete $self->{template}); 1924 $layout->set_text (delete $self->{template});
1444 $self->{template} = $layout; 1925 $self->{template} = $layout;
1445 } 1926 }
1446 1927
1447 if (exists $self->{markup}) { 1928 if (exists $self->{markup}) {
… …
1451 } 1932 }
1452 1933
1453 $self 1934 $self
1454} 1935}
1455 1936
1456sub escape($) {
1457 local $_ = $_[0];
1458
1459 s/&/&amp;/g;
1460 s/>/&gt;/g;
1461 s/</&lt;/g;
1462
1463 $_
1464}
1465
1466sub update { 1937sub update {
1467 my ($self) = @_; 1938 my ($self) = @_;
1468 1939
1469 delete $self->{texture}; 1940 delete $self->{texture};
1470 $self->SUPER::update; 1941 $self->SUPER::update;
1471} 1942}
1472 1943
1944sub realloc {
1945 my ($self) = @_;
1946
1947 delete $self->{ox};
1948 $self->SUPER::realloc;
1949}
1950
1473sub set_text { 1951sub set_text {
1474 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1475 1953
1476 return if $self->{text} eq "T$text"; 1954 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1955 $self->{text} = "T$text";
1478 1956
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1957 $self->{layout}->set_text ($text);
1481 1958
1959 delete $self->{size_req};
1482 $self->realloc; 1960 $self->realloc;
1483 $self->update; 1961 $self->update;
1484} 1962}
1485 1963
1486sub set_markup { 1964sub set_markup {
… …
1489 return if $self->{text} eq "M$markup"; 1967 return if $self->{text} eq "M$markup";
1490 $self->{text} = "M$markup"; 1968 $self->{text} = "M$markup";
1491 1969
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1970 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1971
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1972 $self->{layout}->set_markup ($markup);
1496 1973
1974 delete $self->{size_req};
1497 $self->realloc; 1975 $self->realloc;
1498 $self->update; 1976 $self->update;
1499} 1977}
1500 1978
1501sub size_request { 1979sub size_request {
1502 my ($self) = @_; 1980 my ($self) = @_;
1503 1981
1982 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1983 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1984 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1985 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1986 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1987 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1988
1510 my ($w, $h) = $self->{layout}->size; 1989 my ($w, $h) = $self->{layout}->size;
1511 1990
1512 if (exists $self->{template}) { 1991 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1992 $self->{template}->set_font ($self->{font}) if $self->{font};
1993 $self->{template}->set_width ($self->{max_w} || -1);
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1994 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1995
1516 my ($w2, $h2) = $self->{template}->size; 1996 my ($w2, $h2) = $self->{template}->size;
1517 1997
1518 $w = List::Util::max $w, $w2; 1998 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1999 $h = List::Util::max $h, $h2;
2000 }
2001
2002 [$w, $h]
1520 } 2003 };
1521 2004
1522 ($w, $h) 2005 @{ $self->{size_req} }
1523} 2006}
1524 2007
2008sub baseline_shift {
2009 $_[0]{layout}->descent
2010}
2011
1525sub size_allocate { 2012sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 2013 my ($self, $w, $h) = @_;
2014
2015 delete $self->{ox};
1527 2016
1528 delete $self->{texture} 2017 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2018 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2019
2020 1
1530} 2021}
1531 2022
1532sub set_fontsize { 2023sub set_fontsize {
1533 my ($self, $fontsize) = @_; 2024 my ($self, $fontsize) = @_;
1534 2025
1535 $self->{fontsize} = $fontsize; 2026 $self->{fontsize} = $fontsize;
2027 delete $self->{size_req};
1536 delete $self->{texture}; 2028 delete $self->{texture};
1537 2029
1538 $self->realloc; 2030 $self->realloc;
1539} 2031}
1540 2032
2033sub reconfigure {
2034 my ($self) = @_;
2035
2036 delete $self->{size_req};
2037 delete $self->{texture};
2038
2039 $self->SUPER::reconfigure;
2040}
2041
1541sub _draw { 2042sub _draw {
1542 my ($self) = @_; 2043 my ($self) = @_;
1543 2044
1544 $self->SUPER::_draw; # draw background, if applicable 2045 $self->SUPER::_draw; # draw background, if applicable
1545 2046
1546 my $tex = $self->{texture} ||= do { 2047 my $size = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}}); 2048 $self->{layout}->set_foreground (@{$self->{fg}});
1548 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2049 $self->{layout}->set_font ($self->{font}) if $self->{font};
1549 $self->{layout}->set_width ($self->{w}); 2050 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2051 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2052 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2053 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 2054
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2055 [$self->{layout}->size]
2056 };
1555 2057
2058 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2059 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2060 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 2061 : ($self->{w} - $size->[0]) * 0.5);
1559 2062
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 2065 : ($self->{h} - $size->[1]) * 0.5);
1563
1564 $tex
1565 }; 2066 };
1566 2067
1567 glEnable GL_TEXTURE_2D; 2068 my $w = List::Util::min $self->{w} + 4, $size->[0];
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2069 my $h = List::Util::min $self->{h} + 2, $size->[1];
1569 2070
1570 if ($tex->{format} == GL_ALPHA) { 2071 $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} 2072}
1579 2073
1580############################################################################# 2074#############################################################################
1581 2075
1582package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1583 2077
1584our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1585 2079
1586use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1587 2081
1588sub new { 2082sub new {
1589 my $class = shift; 2083 my $class = shift;
1590 2084
1591 $class->SUPER::new ( 2085 $class->SUPER::new (
… …
1595 active_fg => [0, 0, 0], 2089 active_fg => [0, 0, 0],
1596 can_hover => 1, 2090 can_hover => 1,
1597 can_focus => 1, 2091 can_focus => 1,
1598 valign => 0, 2092 valign => 0,
1599 can_events => 1, 2093 can_events => 1,
2094 ellipsise => 0,
1600 #text => ... 2095 #text => ...
2096 #hidden => "*",
1601 @_ 2097 @_
1602 ) 2098 )
1603} 2099}
1604 2100
1605sub _set_text { 2101sub _set_text {
… …
1607 2103
1608 delete $self->{cur_h}; 2104 delete $self->{cur_h};
1609 2105
1610 return if $self->{text} eq $text; 2106 return if $self->{text} eq $text;
1611 2107
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 2108 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 2109 $self->{text} = $text;
1616 2110
1617 $text =~ s/./*/g if $self->{hidden}; 2111 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 2112 $self->{layout}->set_text ("$text ");
2113 delete $self->{size_req};
1619 2114
1620 $self->_emit (changed => $self->{text}); 2115 $self->emit (changed => $self->{text});
2116
2117 $self->realloc;
2118 $self->update;
1621} 2119}
1622 2120
1623sub set_text { 2121sub set_text {
1624 my ($self, $text) = @_; 2122 my ($self, $text) = @_;
1625 2123
1626 $self->{cursor} = length $text; 2124 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 2125 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 2126}
1631 2127
1632sub get_text { 2128sub get_text {
1633 $_[0]{text} 2129 $_[0]{text}
1634} 2130}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 2135 my ($w, $h) = $self->SUPER::size_request;
1640 2136
1641 ($w + 1, $h) # add 1 for cursor 2137 ($w + 1, $h) # add 1 for cursor
1642} 2138}
1643 2139
1644sub key_down { 2140sub invoke_key_down {
1645 my ($self, $ev) = @_; 2141 my ($self, $ev) = @_;
1646 2142
1647 my $mod = $ev->{mod}; 2143 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 2144 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 2145 my $uni = $ev->{unicode};
1650 2146
1651 my $text = $self->get_text; 2147 my $text = $self->get_text;
2148
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1652 2150
1653 if ($uni == 8) { 2151 if ($uni == 8) {
1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1655 } elsif ($uni == 127) { 2153 } elsif ($uni == 127) {
1656 substr $text, $self->{cursor}, 1, ""; 2154 substr $text, $self->{cursor}, 1, "";
1657 } elsif ($sym == CFClient::SDLK_LEFT) { 2155 } elsif ($sym == CFPlus::SDLK_LEFT) {
1658 --$self->{cursor} if $self->{cursor}; 2156 --$self->{cursor} if $self->{cursor};
1659 } elsif ($sym == CFClient::SDLK_RIGHT) { 2157 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1660 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2158 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1661 } elsif ($sym == CFClient::SDLK_HOME) { 2159 } elsif ($sym == CFPlus::SDLK_HOME) {
2160 # what a hack
2161 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1
2164 : 0;
2165 } elsif ($sym == CFPlus::SDLK_END) {
2166 # uh, again
2167 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2169 ? $self->{cursor} + length $1
2170 : length $self->{text};
2171 } elsif ($uni == 21) { # ctrl-u
2172 $text = "";
1662 $self->{cursor} = 0; 2173 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 2174 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 2175 $self->emit ('escape');
1667 } elsif ($uni) { 2176 } elsif ($uni == 0x0d) {
2177 substr $text, $self->{cursor}++, 0, "\012";
2178 } elsif ($uni >= 0x20) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 2179 substr $text, $self->{cursor}++, 0, chr $uni;
2180 } else {
2181 return 0;
1669 } 2182 }
1670 2183
1671 $self->_set_text ($text); 2184 $self->_set_text ($text);
1672 2185
1673 $self->realloc; 2186 $self->realloc;
1674} 2187 $self->update;
1675 2188
2189 1
2190}
2191
1676sub focus_in { 2192sub invoke_focus_in {
1677 my ($self) = @_; 2193 my ($self) = @_;
1678 2194
1679 $self->{last_activity} = $::NOW; 2195 $self->{last_activity} = $::NOW;
1680 2196
1681 $self->SUPER::focus_in; 2197 $self->SUPER::invoke_focus_in
1682} 2198}
1683 2199
1684sub button_down { 2200sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1686 2202
1687 $self->SUPER::button_down ($ev, $x, $y); 2203 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 2204
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 2205 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 2206
1691 # byte-index to char-index 2207 # byte-index to char-index
1692 my $text = $self->{text}; 2208 my $text = $self->{text};
1693 utf8::encode $text; 2209 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 2210 $self->{cursor} = length $text;
1695 2211
1696 $self->_set_text ($self->{text}); 2212 $self->_set_text ($self->{text});
1697 $self->update; 2213 $self->update;
2214
2215 1
1698} 2216}
1699 2217
1700sub mouse_motion { 2218sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 2219 my ($self, $ev, $x, $y) = @_;
1702# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2220# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2221
2222 1
1703} 2223}
1704 2224
1705sub _draw { 2225sub _draw {
1706 my ($self) = @_; 2226 my ($self) = @_;
1707 2227
1708 local $self->{fg} = $self->{fg}; 2228 local $self->{fg} = $self->{fg};
1709 2229
1710 if ($FOCUS == $self) { 2230 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 2231 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 2232 $self->{fg} = $self->{active_fg};
1713 } else { 2233 } else {
1714 glColor @{$self->{bg}}; 2234 glColor_premultiply @{$self->{bg}};
1715 } 2235 }
1716 2236
1717 glEnable GL_BLEND; 2237 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2238 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 2239 glBegin GL_QUADS;
1720 glVertex 0 , 0; 2240 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 2241 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 2242 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 2243 glVertex $self->{w}, 0;
… …
1734 utf8::encode $text; 2254 utf8::encode $text;
1735 2255
1736 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1737 } 2257 }
1738 2258
1739 glColor @{$self->{fg}};
1740 glBegin GL_LINES; 2259 glBegin GL_LINES;
1741 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 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}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1743 glEnd; 2262 glEnd;
1744 } 2263 }
1745} 2264}
1746 2265
2266#############################################################################
2267
1747package CFClient::UI::Entry; 2268package CFPlus::UI::Entry;
1748 2269
1749our @ISA = CFClient::UI::EntryBase::; 2270our @ISA = CFPlus::UI::EntryBase::;
1750 2271
1751use CFClient::OpenGL; 2272use CFPlus::OpenGL;
1752 2273
1753sub key_down { 2274sub invoke_key_down {
1754 my ($self, $ev) = @_; 2275 my ($self, $ev) = @_;
1755 2276
1756 my $sym = $ev->{sym}; 2277 my $sym = $ev->{sym};
1757 2278
1758 if ($sym == 13) { 2279 if ($ev->{uni} == 0x0d || $sym == 13) {
1759 unshift @{$self->{history}}, 2280 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 2281 my $txt = $self->get_text;
2282
1761 $self->{history_pointer} = -1; 2283 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 2284 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 2285 $self->emit (activate => $txt);
1764 $self->update; 2286 $self->update;
1765 2287
1766 } elsif ($sym == CFClient::SDLK_UP) { 2288 } elsif ($sym == CFPlus::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 2289 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 2290 $self->{history_saveback} = $self->get_text;
1769 } 2291 }
1770 if (@{$self->{history} || []} > 0) { 2292 if (@{$self->{history} || []} > 0) {
1771 $self->{history_pointer}++; 2293 $self->{history_pointer}++;
… …
1773 $self->{history_pointer} = @{$self->{history} || []} - 1; 2295 $self->{history_pointer} = @{$self->{history} || []} - 1;
1774 } 2296 }
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2297 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } 2298 }
1777 2299
1778 } elsif ($sym == CFClient::SDLK_DOWN) { 2300 } elsif ($sym == CFPlus::SDLK_DOWN) {
1779 $self->{history_pointer}--; 2301 $self->{history_pointer}--;
1780 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2302 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1781 2303
1782 if ($self->{history_pointer} >= 0) { 2304 if ($self->{history_pointer} >= 0) {
1783 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1784 } else { 2306 } else {
1785 $self->set_text ($self->{history_saveback}); 2307 $self->set_text ($self->{history_saveback});
1786 } 2308 }
1787 2309
1788 } else { 2310 } else {
1789 $self->SUPER::key_down ($ev); 2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
1790 } 2314 1
1791
1792} 2315}
1793 2316
1794############################################################################# 2317#############################################################################
1795 2318
2319package CFPlus::UI::TextEdit;
2320
2321our @ISA = CFPlus::UI::EntryBase::;
2322
2323use CFPlus::OpenGL;
2324
2325sub move_cursor_ver {
2326 my ($self, $dy) = @_;
2327
2328 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2329
2330 $y += $dy;
2331
2332 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2333 $self->{cursor} = $index;
2334 delete $self->{cur_h};
2335 $self->update;
2336 return;
2337 }
2338}
2339
2340sub invoke_key_down {
2341 my ($self, $ev) = @_;
2342
2343 my $sym = $ev->{sym};
2344
2345 if ($sym == CFPlus::SDLK_UP) {
2346 $self->move_cursor_ver (-1);
2347 } elsif ($sym == CFPlus::SDLK_DOWN) {
2348 $self->move_cursor_ver (+1);
2349 } else {
2350 return $self->SUPER::invoke_key_down ($ev)
2351 }
2352
2353 1
2354}
2355
2356#############################################################################
2357
1796package CFClient::UI::Button; 2358package CFPlus::UI::Button;
1797 2359
1798our @ISA = CFClient::UI::Label::; 2360our @ISA = CFPlus::UI::Label::;
1799 2361
1800use CFClient::OpenGL; 2362use CFPlus::OpenGL;
1801 2363
1802my @tex = 2364my @tex =
1803 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1804 qw(b1_button_active.png); 2366 qw(b1_button_inactive.png b1_button_active.png);
1805 2367
1806sub new { 2368sub new {
1807 my $class = shift; 2369 my $class = shift;
1808 2370
1809 $class->SUPER::new ( 2371 $class->SUPER::new (
1810 padding_x => 4, 2372 padding_x => 4,
1811 padding_y => 4, 2373 padding_y => 4,
1812 fg => [1, 1, 1], 2374 fg => [1.0, 1.0, 1.0],
1813 active_fg => [0, 0, 1], 2375 active_fg => [0.8, 0.8, 0.8],
1814 can_hover => 1, 2376 can_hover => 1,
1815 align => 0, 2377 align => 0,
1816 valign => 0, 2378 valign => 0,
1817 can_events => 1, 2379 can_events => 1,
1818 @_ 2380 @_
1819 ) 2381 )
1820} 2382}
1821 2383
1822sub activate { }
1823
1824sub button_up { 2384sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 2385 my ($self, $ev, $x, $y) = @_;
1826 2386
1827 $self->emit ("activate") 2387 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 2388 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 2389 && $y >= 0 && $y < $self->{h};
2390
2391 1
1830} 2392}
1831 2393
1832sub _draw { 2394sub _draw {
1833 my ($self) = @_; 2395 my ($self) = @_;
1834 2396
1835 local $self->{fg} = $self->{fg}; 2397 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 2398
1841 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1844 2402
2403 my $tex = $tex[$GRAB == $self];
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 2405
1847 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1848 2407
1849 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1850} 2409}
1851 2410
1852############################################################################# 2411#############################################################################
1853 2412
1854package CFClient::UI::CheckBox; 2413package CFPlus::UI::CheckBox;
1855 2414
1856our @ISA = CFClient::UI::DrawBG::; 2415our @ISA = CFPlus::UI::DrawBG::;
1857 2416
1858my @tex = 2417my @tex =
1859 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1860 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2419 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1861 2420
1862use CFClient::OpenGL; 2421use CFPlus::OpenGL;
1863 2422
1864sub new { 2423sub new {
1865 my $class = shift; 2424 my $class = shift;
1866 2425
1867 $class->SUPER::new ( 2426 $class->SUPER::new (
… …
1881 my ($self) = @_; 2440 my ($self) = @_;
1882 2441
1883 (6) x 2 2442 (6) x 2
1884} 2443}
1885 2444
2445sub toggle {
2446 my ($self) = @_;
2447
2448 $self->{state} = !$self->{state};
2449 $self->emit (changed => $self->{state});
2450 $self->update;
2451}
2452
1886sub button_down { 2453sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2454 my ($self, $ev, $x, $y) = @_;
1888 2455
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2456 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2457 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2458 $self->toggle;
1892 $self->_emit (changed => $self->{state}); 2459 } else {
2460 return 0
2461 }
2462
1893 } 2463 1
1894} 2464}
1895 2465
1896sub _draw { 2466sub _draw {
1897 my ($self) = @_; 2467 my ($self) = @_;
1898 2468
… …
1913 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
1914} 2484}
1915 2485
1916############################################################################# 2486#############################################################################
1917 2487
1918package CFClient::UI::Image; 2488package CFPlus::UI::Image;
1919 2489
1920our @ISA = CFClient::UI::Base::; 2490our @ISA = CFPlus::UI::Base::;
1921 2491
1922use CFClient::OpenGL; 2492use CFPlus::OpenGL;
1923use Carp qw/confess/;
1924 2493
1925our %loaded_images; 2494our %texture_cache;
1926 2495
1927sub new { 2496sub new {
1928 my $class = shift; 2497 my $class = shift;
1929 2498
1930 my $self = $class->SUPER::new (can_events => 0, @_); 2499 my $self = $class->SUPER::new (
2500 can_events => 0,
2501 @_,
2502 );
1931 2503
1932 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2504 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required";
1933 2506
1934 $loaded_images{$self->{image}} ||= 2507 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1935 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2508 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1936 2509
1937 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2510 CFPlus::weaken $texture_cache{$self->{path}};
1938 2511
1939 Scalar::Util::weaken $loaded_images{$self->{image}}; 2512 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1940
1941 $self->{aspect} = $tex->{w} / $tex->{h};
1942 2513
1943 $self 2514 $self
1944} 2515}
1945 2516
2517sub STORABLE_freeze {
2518 my ($self, $cloning) = @_;
2519
2520 $self->{path}
2521 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2522
2523 $self->{path}
2524}
2525
2526sub STORABLE_attach {
2527 my ($self, $cloning, $path) = @_;
2528
2529 $self->new (path => $path)
2530}
2531
1946sub size_request { 2532sub size_request {
1947 my ($self) = @_; 2533 my ($self) = @_;
1948 2534
1949 ($self->{tex}->{w}, $self->{tex}->{h}) 2535 ($self->{tex}{w}, $self->{tex}{h})
1950} 2536}
1951 2537
1952sub _draw { 2538sub _draw {
1953 my ($self) = @_; 2539 my ($self) = @_;
1954 2540
… …
1964 } 2550 }
1965 2551
1966 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1968 2554
1969 $tex->draw_quad_alpha (0, 0, $w, $h); 2555 $tex->draw_quad (0, 0, $w, $h);
1970 2556
1971 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
1972} 2558}
1973 2559
1974############################################################################# 2560#############################################################################
1975 2561
2562package CFPlus::UI::ImageButton;
2563
2564our @ISA = CFPlus::UI::Image::;
2565
2566use CFPlus::OpenGL;
2567
2568my %textures;
2569
2570sub new {
2571 my $class = shift;
2572
2573 my $self = $class->SUPER::new (
2574 padding_x => 4,
2575 padding_y => 4,
2576 fg => [1, 1, 1],
2577 active_fg => [0, 0, 1],
2578 can_hover => 1,
2579 align => 0,
2580 valign => 0,
2581 can_events => 1,
2582 @_
2583 );
2584}
2585
2586sub invoke_button_up {
2587 my ($self, $ev, $x, $y) = @_;
2588
2589 $self->emit ("activate")
2590 if $x >= 0 && $x < $self->{w}
2591 && $y >= 0 && $y < $self->{h};
2592
2593 1
2594}
2595
2596#############################################################################
2597
1976package CFClient::UI::VGauge; 2598package CFPlus::UI::VGauge;
1977 2599
1978our @ISA = CFClient::UI::Base::; 2600our @ISA = CFPlus::UI::Base::;
1979 2601
1980use List::Util qw(min max); 2602use List::Util qw(min max);
1981 2603
1982use CFClient::OpenGL; 2604use CFPlus::OpenGL;
1983 2605
1984my %tex = ( 2606my %tex = (
1985 food => [ 2607 food => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2609 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1988 ], 2610 ],
1989 grace => [ 2611 grace => [
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 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/ 2613 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1992 ], 2614 ],
1993 hp => [ 2615 hp => [
1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1995 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2617 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1996 ], 2618 ],
1997 mana => [ 2619 mana => [
1998 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 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/ 2621 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2000 ], 2622 ],
2001); 2623);
2002 2624
2003# eg. VGauge->new (gauge => 'food'), default gauge: food 2625# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2063 my $ycut1 = max 0, min 1, $ycut; 2685 my $ycut1 = max 0, min 1, $ycut;
2064 my $ycut2 = max 0, min 1, $ycut - 1; 2686 my $ycut2 = max 0, min 1, $ycut - 1;
2065 2687
2066 my $h1 = $self->{h} * (1 - $ycut1); 2688 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2689 my $h2 = $self->{h} * (1 - $ycut2);
2690 my $h3 = $self->{h};
2691
2692 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2068 2693
2069 glEnable GL_BLEND; 2694 glEnable GL_BLEND;
2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2695 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2696 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071 glEnable GL_TEXTURE_2D; 2697 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2699
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2700 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2701 glBegin GL_QUADS;
… …
2090 2716
2091 if ($t3) { 2717 if ($t3) {
2092 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2718 glBindTexture GL_TEXTURE_2D, $t3->{name};
2093 glBegin GL_QUADS; 2719 glBegin GL_QUADS;
2094 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2720 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2095 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2721 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2096 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2722 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2097 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2723 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2098 glEnd; 2724 glEnd;
2099 } 2725 }
2100 2726
2101 glDisable GL_BLEND; 2727 glDisable GL_BLEND;
2102 glDisable GL_TEXTURE_2D; 2728 glDisable GL_TEXTURE_2D;
2103} 2729}
2104 2730
2105############################################################################# 2731#############################################################################
2106 2732
2107package CFClient::UI::Gauge; 2733package CFPlus::UI::Gauge;
2108 2734
2109our @ISA = CFClient::UI::VBox::; 2735our @ISA = CFPlus::UI::VBox::;
2110 2736
2111sub new { 2737sub new {
2112 my ($class, %arg) = @_; 2738 my ($class, %arg) = @_;
2113 2739
2114 my $self = $class->SUPER::new ( 2740 my $self = $class->SUPER::new (
… …
2116 can_hover => 1, 2742 can_hover => 1,
2117 can_events => 1, 2743 can_events => 1,
2118 %arg, 2744 %arg,
2119 ); 2745 );
2120 2746
2121 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2747 $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); 2748 $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"); 2749 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2124 2750
2125 $self 2751 $self
2126} 2752}
2127 2753
2128sub set_fontsize { 2754sub set_fontsize {
… …
2149 $self->{value}->set_text ($val); 2775 $self->{value}->set_text ($val);
2150} 2776}
2151 2777
2152############################################################################# 2778#############################################################################
2153 2779
2154package CFClient::UI::Slider; 2780package CFPlus::UI::Slider;
2155 2781
2156use strict; 2782use strict;
2157 2783
2158use CFClient::OpenGL; 2784use CFPlus::OpenGL;
2159 2785
2160our @ISA = CFClient::UI::DrawBG::; 2786our @ISA = CFPlus::UI::DrawBG::;
2161 2787
2162my @tex = 2788my @tex =
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2789 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2164 qw(s1_slider.png s1_slider_bg.png); 2790 qw(s1_slider.png s1_slider_bg.png);
2165 2791
2166sub new { 2792sub new {
2167 my $class = shift; 2793 my $class = shift;
2168 2794
… …
2189 $self->update; 2815 $self->update;
2190 2816
2191 $self 2817 $self
2192} 2818}
2193 2819
2194sub changed { }
2195
2196sub set_range { 2820sub set_range {
2197 my ($self, $range) = @_; 2821 my ($self, $range) = @_;
2198 2822
2199 ($range, $self->{range}) = ($self->{range}, $range); 2823 ($range, $self->{range}) = ($self->{range}, $range);
2200 2824
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2825 if ("@$range" ne "@{$self->{range}}") {
2826 $self->update;
2827 $self->set_value ($self->{range}[0]);
2828 }
2203} 2829}
2204 2830
2205sub set_value { 2831sub set_value {
2206 my ($self, $value) = @_; 2832 my ($self, $value) = @_;
2207 2833
… …
2218 if $unit; 2844 if $unit;
2219 2845
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2846 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2847
2222 if ($value != $old_value) { 2848 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2849 $self->emit (changed => $value);
2224 $self->update; 2850 $self->update;
2225 } 2851 }
2226} 2852}
2227 2853
2228sub size_request { 2854sub size_request {
2229 my ($self) = @_; 2855 my ($self) = @_;
2230 2856
2231 ($self->{req_w}, $self->{req_h}) 2857 ($self->{req_w}, $self->{req_h})
2232} 2858}
2233 2859
2234sub button_down { 2860sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2861 my ($self, $ev, $x, $y) = @_;
2236 2862
2237 $self->SUPER::button_down ($ev, $x, $y); 2863 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2864
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2865 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2866
2241 $self->mouse_motion ($ev, $x, $y); 2867 $self->invoke_mouse_motion ($ev, $x, $y)
2242} 2868}
2243 2869
2244sub mouse_motion { 2870sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2246 2872
2247 if ($GRAB == $self) { 2873 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2875
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2876 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2877
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2878 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2879
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2880 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2881 } else {
2882 return 0;
2883 }
2884
2255 } 2885 1
2886}
2887
2888sub invoke_mouse_wheel {
2889 my ($self, $ev) = @_;
2890
2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2892
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896
2897 ! ! $delta
2256} 2898}
2257 2899
2258sub update { 2900sub update {
2259 my ($self) = @_; 2901 my ($self) = @_;
2260 2902
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2903 delete $self->{knob_w};
2904 $self->SUPER::update;
2905}
2906
2907sub _draw {
2908 my ($self) = @_;
2909
2910 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2911 $self->set_value ($self->{range}[0]);
2263 2912
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2913 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2914 my $range = ($hi - $page - $lo) || 1e-100;
2266 2915
… …
2272 $value = ($value - $lo) / $range; 2921 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2922 $value = $value * $self->{scale} + $self->{offset};
2274 2923
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2924 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2925 $self->{knob_w} = $knob_w;
2277 }); 2926 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2927
2285 $self->SUPER::_draw (); 2928 $self->SUPER::_draw ();
2286 2929
2287 glScale $self->{w}, $self->{h}; 2930 glScale $self->{w}, $self->{h};
2288 2931
… …
2308 glDisable GL_TEXTURE_2D; 2951 glDisable GL_TEXTURE_2D;
2309} 2952}
2310 2953
2311############################################################################# 2954#############################################################################
2312 2955
2313package CFClient::UI::ValSlider; 2956package CFPlus::UI::ValSlider;
2314 2957
2315our @ISA = CFClient::UI::HBox::; 2958our @ISA = CFPlus::UI::HBox::;
2316 2959
2317sub new { 2960sub new {
2318 my ($class, %arg) = @_; 2961 my ($class, %arg) = @_;
2319 2962
2320 my $range = delete $arg{range}; 2963 my $range = delete $arg{range};
2321 2964
2322 my $self = $class->SUPER::new ( 2965 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2966 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2967 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift }, 2968 to_value => sub { shift },
2326 from_value => sub { shift }, 2969 from_value => sub { shift },
2327 %arg, 2970 %arg,
2328 ); 2971 );
2329 2972
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2992sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2993sub set_value { shift->{slider}->set_value (@_) }
2351 2994
2352############################################################################# 2995#############################################################################
2353 2996
2354package CFClient::UI::TextView; 2997package CFPlus::UI::TextScroller;
2355 2998
2356our @ISA = CFClient::UI::HBox::; 2999our @ISA = CFPlus::UI::HBox::;
2357 3000
2358use CFClient::OpenGL; 3001use CFPlus::OpenGL;
2359 3002
2360sub new { 3003sub new {
2361 my $class = shift; 3004 my $class = shift;
2362 3005
2363 my $self = $class->SUPER::new ( 3006 my $self = $class->SUPER::new (
2364 fontsize => 1, 3007 fontsize => 1,
2365 can_events => 0, 3008 can_events => 1,
3009 indent => 0,
2366 #font => default_font 3010 #font => default_font
2367 @_, 3011 @_,
2368 3012
2369 layout => (new CFClient::Layout 1), 3013 layout => (new CFPlus::Layout),
2370 par => [], 3014 par => [],
3015 max_par => 0,
2371 height => 0, 3016 height => 0,
2372 children => [ 3017 children => [
2373 (new CFClient::UI::Empty expand => 1), 3018 (new CFPlus::UI::Empty expand => 1),
2374 (new CFClient::UI::Slider vertical => 1), 3019 (new CFPlus::UI::Slider vertical => 1),
2375 ], 3020 ],
2376 ); 3021 );
2377 3022
2378 $self->{children}[1]->connect (changed => sub { $self->update }); 3023 $self->{children}[1]->connect (changed => sub { $self->update });
2379 3024
… …
2385 3030
2386 $self->{fontsize} = $fontsize; 3031 $self->{fontsize} = $fontsize;
2387 $self->reflow; 3032 $self->reflow;
2388} 3033}
2389 3034
3035sub size_request {
3036 my ($self) = @_;
3037
3038 my ($empty, $slider) = @{ $self->{children} };
3039
3040 local $self->{children} = [$empty, $slider];
3041 $self->SUPER::size_request
3042}
3043
2390sub size_allocate { 3044sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 3045 my ($self, $w, $h) = @_;
2392 3046
2393 $self->SUPER::size_allocate ($w, $h); 3047 my ($empty, $slider, @other) = @{ $self->{children} };
3048 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2394 3049
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3050 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3051 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 3052 $self->{layout}->set_width ($empty->{w});
3053 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 3054
2399 $self->reflow; 3055 $self->reflow;
2400}
2401 3056
2402sub text_size { 3057 local $self->{children} = [$empty, $slider];
3058 $self->SUPER::invoke_size_allocate ($w, $h)
3059}
3060
3061sub invoke_mouse_wheel {
2403 my ($self, $text, $indent) = @_; 3062 my ($self, $ev) = @_;
3063
3064 return 0 unless $ev->{dy}; # only vertical movements
3065
3066 $self->{children}[1]->emit (mouse_wheel => $ev);
3067
3068 1
3069}
3070
3071sub get_layout {
3072 my ($self, $para) = @_;
2404 3073
2405 my $layout = $self->{layout}; 3074 my $layout = $self->{layout};
2406 3075
3076 $layout->set_font ($self->{font}) if $self->{font};
3077 $layout->set_foreground (@{$para->{fg}});
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3078 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 3079 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3080 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 3081 $layout->set_markup ($para->{markup});
3082
3083 $layout->set_shapes (
3084 map
3085 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3086 @{$para->{widget}}
2410 3087 );
3088
2411 $layout->size 3089 $layout
2412} 3090}
2413 3091
2414sub reflow { 3092sub reflow {
2415 my ($self) = @_; 3093 my ($self) = @_;
2416 3094
… …
2423 3101
2424 # todo: base offset on lines or so, not on pixels 3102 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset); 3103 $self->{children}[1]->set_value ($offset);
2426} 3104}
2427 3105
3106sub current_paragraph {
3107 my ($self) = @_;
3108
3109 $self->{top_paragraph} - 1
3110}
3111
3112sub scroll_to {
3113 my ($self, $para) = @_;
3114
3115 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3116
3117 $self->{scroll_to} = $para;
3118 $self->update;
3119}
3120
2428sub clear { 3121sub clear {
2429 my ($self) = @_; 3122 my ($self) = @_;
3123
3124 my (undef, undef, @other) = @{ $self->{children} };
3125 $self->remove ($_) for @other;
2430 3126
2431 $self->{par} = []; 3127 $self->{par} = [];
2432 $self->{height} = 0; 3128 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3129 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434} 3130}
2435 3131
2436sub add_paragraph { 3132sub add_paragraph {
2437 my ($self, $color, $text, $indent) = @_; 3133 my $self = shift;
2438 3134
2439 for my $line (split /\n/, $text) { 3135 for my $para (@_) {
2440 my ($w, $h) = $self->text_size ($line); 3136 $para = {
3137 fg => [1, 1, 1, 1],
3138 indent => 0,
3139 markup => "",
3140 widget => [],
3141 ref $para ? %$para : (markup => $para),
3142 w => 1e10,
3143 wrapped => 1,
3144 };
3145
3146 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3147 push @{$self->{par}}, $para;
3148 }
3149
3150 if (my $max = $self->{max_par}) {
3151 shift @{$self->{par}} while @{$self->{par}} > $max;
3152 }
3153
3154 $self->{need_reflow}++;
3155 $self->update;
3156}
3157
3158sub scroll_to_bottom {
3159 my ($self) = @_;
3160
3161 $self->{scroll_to} = $#{$self->{par}};
3162 $self->update;
3163}
3164
3165sub force_uptodate {
3166 my ($self) = @_;
3167
3168 if (delete $self->{need_reflow}) {
3169 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3170
3171 my $height = 0;
3172
3173 for my $para (@{$self->{par}}) {
3174 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3175 my $layout = $self->get_layout ($para);
3176 my ($w, $h) = $layout->size;
3177
3178 $para->{w} = $w + $para->{indent};
3179 $para->{h} = $h;
3180 $para->{wrapped} = $layout->has_wrapped;
3181 }
3182
3183 $para->{y} = $height;
3184 $height += $para->{h};
3185 }
3186
2441 $self->{height} += $h; 3187 $self->{height} = $height;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3188 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2443 }
2444 3189
2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3190 delete $self->{texture};
3191 }
3192
3193 if (my $paridx = delete $self->{scroll_to}) {
3194 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3195 }
2446} 3196}
2447 3197
2448sub update { 3198sub update {
2449 my ($self) = @_; 3199 my ($self) = @_;
2450 3200
… …
2452 3202
2453 return unless $self->{h} > 0; 3203 return unless $self->{h} > 0;
2454 3204
2455 delete $self->{texture}; 3205 delete $self->{texture};
2456 3206
2457 $ROOT->on_post_alloc ($self, sub { 3207 $ROOT->on_post_alloc ($self => sub {
3208 $self->force_uptodate;
3209
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3210 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 3211
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 { 3212 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 3213 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 3214 glClear GL_COLOR_BUFFER_BIT;
2489 3215
3216 package CFPlus::UI::Base;
3217 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3218 (0, 0, $self->{w}, $self->{h});
3219
3220 my $top = int $self->{children}[1]{range}[0];
3221
3222 my $paridx = 0;
3223 my $top_paragraph;
2490 my $top = int $self->{children}[1]{range}[0]; 3224 my $top = int $self->{children}[1]{range}[0];
2491 3225
2492 my $y0 = $top; 3226 my $y0 = $top;
2493 my $y1 = $top + $H; 3227 my $y1 = $top + $H;
2494 3228
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}}) { 3229 for my $para (@{$self->{par}}) {
2506 my $h = $par->[1]; 3230 my $h = $para->{h};
3231 my $y = $para->{y};
2507 3232
2508 if ($y0 < $y + $h && $y < $y1) { 3233 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 3234 my $layout = $self->get_layout ($para);
2510 $layout->set_width ($W - $par->[3]);
2511 $layout->set_markup ($par->[4]);
2512 3235
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3236 $layout->render ($para->{indent}, $y - $y0);
2514 3237
2515 glRasterPos $par->[3], $y - $y0; 3238 if (my @w = @{ $para->{widget} }) {
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3239 my @s = $layout->get_shapes;
3240
3241 for (@w) {
3242 my ($dx, $dy) = splice @s, 0, 2, ();
3243
3244 $_->{x} = $dx + $para->{indent};
3245 $_->{y} = $dy + $y - $y0;
3246
3247 $_->draw;
3248 }
3249 }
2517 } 3250 }
2518 3251
2519 $y += $h; 3252 $paridx++;
3253 $top_paragraph ||= $paridx if $y >= $top;
2520 } 3254 }
2521 3255
2522 glDisable GL_BLEND; 3256 $self->{top_paragraph} = $top_paragraph;
2523 }; 3257 };
2524 }); 3258 });
2525} 3259}
2526 3260
3261sub reconfigure {
3262 my ($self) = @_;
3263
3264 $self->SUPER::reconfigure;
3265
3266 $_->{w} = 1e10 for @{ $self->{par} };
3267 $self->reflow;
3268}
3269
2527sub _draw { 3270sub _draw {
2528 my ($self) = @_; 3271 my ($self) = @_;
2529 3272
2530 glEnable GL_TEXTURE_2D; 3273 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3274 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 3275 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3276 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 3277 glDisable GL_TEXTURE_2D;
2535 3278
2536 $self->{children}[1]->draw; 3279 $self->{children}[1]->draw;
2537
2538} 3280}
2539 3281
2540############################################################################# 3282#############################################################################
2541 3283
2542package CFClient::UI::Animator; 3284package CFPlus::UI::Animator;
2543 3285
2544use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2545 3287
2546our @ISA = CFClient::UI::Bin::; 3288our @ISA = CFPlus::UI::Bin::;
2547 3289
2548sub moveto { 3290sub moveto {
2549 my ($self, $x, $y) = @_; 3291 my ($self, $x, $y) = @_;
2550 3292
2551 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3293 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2579 glPopMatrix; 3321 glPopMatrix;
2580} 3322}
2581 3323
2582############################################################################# 3324#############################################################################
2583 3325
2584package CFClient::UI::Flopper; 3326package CFPlus::UI::Flopper;
2585 3327
2586our @ISA = CFClient::UI::Button::; 3328our @ISA = CFPlus::UI::Button::;
2587 3329
2588sub new { 3330sub new {
2589 my $class = shift; 3331 my $class = shift;
2590 3332
2591 my $self = $class->SUPER::new ( 3333 my $self = $class->SUPER::new (
… …
2603 $self->{other}->toggle_visibility; 3345 $self->{other}->toggle_visibility;
2604} 3346}
2605 3347
2606############################################################################# 3348#############################################################################
2607 3349
2608package CFClient::UI::Tooltip; 3350package CFPlus::UI::Tooltip;
2609 3351
2610our @ISA = CFClient::UI::Bin::; 3352our @ISA = CFPlus::UI::Bin::;
2611 3353
2612use CFClient::OpenGL; 3354use CFPlus::OpenGL;
2613 3355
2614sub new { 3356sub new {
2615 my $class = shift; 3357 my $class = shift;
2616 3358
2617 $class->SUPER::new ( 3359 $class->SUPER::new (
… …
2620 ) 3362 )
2621} 3363}
2622 3364
2623sub set_tooltip_from { 3365sub set_tooltip_from {
2624 my ($self, $widget) = @_; 3366 my ($self, $widget) = @_;
3367
3368 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3369 if $widget->{tooltip} =~ /^#(.*)$/;
2625 3370
2626 my $tooltip = $widget->{tooltip}; 3371 my $tooltip = $widget->{tooltip};
2627 3372
2628 if ($ENV{CFPLUS_DEBUG} & 2) { 3373 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 3374 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3375 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 3376 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 3377 . "visible $widget->{visible}";
2633 } 3378 }
2634 3379
3380 $tooltip =~ s/^\n+//;
3381 $tooltip =~ s/\n+$//;
3382
2635 $self->add (new CFClient::UI::Label 3383 $self->add (new CFPlus::UI::Label
2636 markup => $tooltip, 3384 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3385 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 3386 fontsize => 0.8,
2639 fg => [0, 0, 0, 1], 3387 style => 1, # FLAG_INVERSE
2640 ellipsise => 0, 3388 ellipsise => 0,
2641 font => ($widget->{tooltip_font} || $::FONT_PROP), 3389 font => ($widget->{tooltip_font} || $::FONT_PROP),
2642 ); 3390 );
2643} 3391}
2644 3392
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 3397
2650 ($w + 4, $h + 4) 3398 ($w + 4, $h + 4)
2651} 3399}
2652 3400
2653sub size_allocate { 3401sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 3402 my ($self, $w, $h) = @_;
2655 3403
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 3404 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 3405}
2658 3406
2659sub visibility_change { 3407sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 3408 my ($self, $visible) = @_;
2661 3409
2662 return unless $visible; 3410 return unless $visible;
2663 3411
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 3412 $self->{root}->on_post_alloc ("move_$self" => sub {
2665 my $widget = $self->{owner} 3413 my $widget = $self->{owner}
2666 or return; 3414 or return;
2667 3415
3416 if ($widget->{visible}) {
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3417 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 3418
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3419 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 3420 if $x + $self->{w} > $self->{root}{w};
2672 3421
2673 $self->move_abs ($x, $y); 3422 $self->move_abs ($x, $y);
3423 } else {
3424 $self->hide;
3425 }
2674 }); 3426 });
2675} 3427}
2676 3428
2677sub _draw { 3429sub _draw {
2678 my ($self) = @_; 3430 my ($self) = @_;
… …
2702 $self->SUPER::_draw; 3454 $self->SUPER::_draw;
2703} 3455}
2704 3456
2705############################################################################# 3457#############################################################################
2706 3458
2707package CFClient::UI::Face; 3459package CFPlus::UI::Face;
2708 3460
2709our @ISA = CFClient::UI::Base::; 3461our @ISA = CFPlus::UI::DrawBG::;
2710 3462
2711use CFClient::OpenGL; 3463use CFPlus::OpenGL;
2712 3464
2713sub new { 3465sub new {
2714 my $class = shift; 3466 my $class = shift;
2715 3467
2716 my $self = $class->SUPER::new ( 3468 my $self = $class->SUPER::new (
3469 size_w => 32,
3470 size_h => 8,
2717 aspect => 1, 3471 aspect => 1,
2718 can_events => 0, 3472 can_events => 0,
2719 @_, 3473 @_,
2720 ); 3474 );
2721 3475
2722 if ($self->{anim} && $self->{animspeed}) { 3476 if ($self->{anim} && $self->{animspeed}) {
2723 Scalar::Util::weaken (my $widget = $self); 3477 CFPlus::weaken (my $widget = $self);
2724 3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2725 $self->{timer} = Event->timer ( 3481 $self->{timer} = Event->timer (
2726 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2727 hard => 1, 3482 parked => 1,
2728 interval => $self->{animspeed},
2729 cb => sub { 3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
2730 ++$widget->{frame}; 3486 ++$widget->{frame};
3487 $widget->update_face;
2731 $widget->update; 3488 $widget->update;
3489
3490 $widget->update_timer;
2732 }, 3491 },
2733 ); 3492 );
3493
3494 $self->update_face;
3495 $self->update_timer;
2734 } 3496 }
2735 3497
2736 $self 3498 $self
2737} 3499}
2738 3500
3501sub update_timer {
3502 my ($self) = @_;
3503
3504 return unless $self->{timer};
3505
3506 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start;
3513 } else {
3514 $self->{timer}->stop;
3515 }
3516}
3517
3518sub update_face {
3519 my ($self) = @_;
3520
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
2739sub size_request { 3531sub size_request {
2740 (32, 8) 3532 my ($self) = @_;
3533
3534 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc;
3541 });
3542 }
3543 }
3544 }
3545
3546 ($self->{size_w} || 8, $self->{size_h} || 8)
2741} 3547}
2742 3548
2743sub update { 3549sub update {
2744 my ($self) = @_; 3550 my ($self) = @_;
2745 3551
2746 return unless $self->{visible}; 3552 return unless $self->{visible};
2747 3553
2748 $self->SUPER::update; 3554 $self->SUPER::update;
2749} 3555}
2750 3556
3557sub invoke_visibility_change {
3558 my ($self) = @_;
3559
3560 $self->update_timer;
3561
3562 0
3563}
3564
2751sub _draw { 3565sub _draw {
2752 my ($self) = @_; 3566 my ($self) = @_;
2753 3567
2754 return unless $::CONN; 3568 return unless $::CONN;
2755 3569
2756 my $face; 3570 $self->SUPER::_draw;
2757 3571
2758 if ($self->{frame}) {
2759 my $anim = $::CONN->{anim}[$self->{anim}]; 3572 my $faceid = $::CONN->{faceid}[$self->{face}]
2760 3573 or return;
2761 $face = $anim->[ $self->{frame} % @$anim ]
2762 if $anim && @$anim;
2763 }
2764 3574
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3575 my $tex = $::CONN->{texture}[$faceid];
2766 3576
2767 if ($tex) { 3577 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 3578 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 3580 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3581 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 3582 glDisable GL_TEXTURE_2D;
2773 } 3583 }
2774} 3584}
2775 3585
2776sub DESTROY { 3586sub destroy {
2777 my ($self) = @_; 3587 my ($self) = @_;
2778 3588
2779 $self->{timer}->cancel 3589 (delete $self->{timer})->cancel
2780 if $self->{timer}; 3590 if $self->{timer};
2781 3591
2782 $self->SUPER::DESTROY; 3592 $self->SUPER::destroy;
2783} 3593}
2784 3594
2785############################################################################# 3595#############################################################################
2786 3596
3597package CFPlus::UI::Buttonbar;
3598
3599our @ISA = CFPlus::UI::HBox::;
3600
3601# TODO: should actually wrap buttons and other goodies.
3602
3603#############################################################################
3604
2787package CFClient::UI::Menu; 3605package CFPlus::UI::Menu;
2788 3606
2789our @ISA = CFClient::UI::FancyFrame::; 3607our @ISA = CFPlus::UI::Toplevel::;
2790 3608
2791use CFClient::OpenGL; 3609use CFPlus::OpenGL;
2792 3610
2793sub new { 3611sub new {
2794 my $class = shift; 3612 my $class = shift;
2795 3613
2796 my $self = $class->SUPER::new ( 3614 my $self = $class->SUPER::new (
2797 items => [], 3615 items => [],
2798 z => 100, 3616 z => 100,
2799 @_, 3617 @_,
2800 ); 3618 );
2801 3619
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3620 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2803 3621
2804 for my $item (@{ $self->{items} }) { 3622 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3623 my ($widget, $cb, $tooltip) = @$item;
2806 3624
2807 # handle various types of items, only text for now 3625 # handle various types of items, only text for now
2808 if (!ref $widget) { 3626 if (!ref $widget) {
3627 if ($widget =~ /\t/) {
3628 my ($left, $right) = split /\t/, $widget, 2;
3629
2809 $widget = new CFClient::UI::Label 3630 $widget = new CFPlus::UI::HBox
2810 can_hover => 1, 3631 can_hover => 1,
2811 can_events => 1, 3632 can_events => 1,
3633 tooltip => $tooltip,
3634 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1),
3637 ],
3638 ;
3639
3640 } else {
3641 $widget = new CFPlus::UI::Label
3642 can_hover => 1,
3643 can_events => 1,
2812 text => $widget; 3644 markup => $widget,
3645 tooltip => $tooltip;
3646 }
2813 } 3647 }
2814 3648
2815 $self->{item}{$widget} = $item; 3649 $self->{item}{$widget} = $item;
2816 3650
2817 $self->{vbox}->add ($widget); 3651 $self->{vbox}->add ($widget);
… …
2822 3656
2823# popup given the event (must be a mouse button down event currently) 3657# popup given the event (must be a mouse button down event currently)
2824sub popup { 3658sub popup {
2825 my ($self, $ev) = @_; 3659 my ($self, $ev) = @_;
2826 3660
2827 $self->_emit ("popdown"); 3661 $self->emit ("popdown");
2828 3662
2829 # maybe save $GRAB? must be careful about events... 3663 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3664 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3665 $self->{button} = $ev->{button};
2832 3666
2833 $self->show; 3667 $self->show;
2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3668 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2835} 3669}
2836 3670
2837sub mouse_motion { 3671sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3672 my ($self, $ev, $x, $y) = @_;
2839 3673
2840 # TODO: should use vbox->find_widget or so 3674 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3675 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3676 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3677
3678 0
3679}
3680
2845sub button_up { 3681sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3682 my ($self, $ev, $x, $y) = @_;
2847 3683
2848 if ($ev->{button} == $self->{button}) { 3684 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3685 undef $GRAB;
2850 $self->hide; 3686 $self->hide;
2851 3687
2852 $self->_emit ("popdown"); 3688 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3689 $self->{hover}[1]->() if $self->{hover};
3690 } else {
3691 return 0
3692 }
3693
2854 } 3694 1
2855} 3695}
2856 3696
2857############################################################################# 3697#############################################################################
2858 3698
2859package CFClient::UI::Statusbox; 3699package CFPlus::UI::Multiplexer;
2860 3700
2861our @ISA = CFClient::UI::VBox::; 3701our @ISA = CFPlus::UI::Container::;
2862 3702
2863sub new { 3703sub new {
2864 my $class = shift; 3704 my $class = shift;
2865 3705
2866 $class->SUPER::new ( 3706 my $self = $class->SUPER::new (
3707 @_,
3708 );
3709
3710 $self->{current} = $self->{children}[0]
3711 if @{ $self->{children} };
3712
3713 $self
3714}
3715
3716sub add {
3717 my ($self, @widgets) = @_;
3718
3719 $self->SUPER::add (@widgets);
3720
3721 $self->{current} = $self->{children}[0]
3722 if @{ $self->{children} };
3723}
3724
3725sub get_current_page {
3726 my ($self) = @_;
3727
3728 $self->{current}
3729}
3730
3731sub set_current_page {
3732 my ($self, $page_or_widget) = @_;
3733
3734 my $widget = ref $page_or_widget
3735 ? $page_or_widget
3736 : $self->{children}[$page_or_widget];
3737
3738 $self->{current} = $widget;
3739 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3740
3741 $self->emit (page_changed => $self->{current});
3742
3743 $self->realloc;
3744}
3745
3746sub visible_children {
3747 $_[0]{current}
3748}
3749
3750sub size_request {
3751 my ($self) = @_;
3752
3753 $self->{current}->size_request
3754}
3755
3756sub invoke_size_allocate {
3757 my ($self, $w, $h) = @_;
3758
3759 $self->{current}->configure (0, 0, $w, $h);
3760
3761 1
3762}
3763
3764sub _draw {
3765 my ($self) = @_;
3766
3767 $self->{current}->draw;
3768}
3769
3770#############################################################################
3771
3772package CFPlus::UI::Notebook;
3773
3774our @ISA = CFPlus::UI::VBox::;
3775
3776sub new {
3777 my $class = shift;
3778
3779 my $self = $class->SUPER::new (
3780 buttonbar => (new CFPlus::UI::Buttonbar),
3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3782 # filter => # will be put between multiplexer and $self
3783 @_,
3784 );
3785
3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3787 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3788
3789 $self
3790}
3791
3792sub add {
3793 my ($self, $title, $widget, $tooltip) = @_;
3794
3795 CFPlus::weaken $self;
3796
3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3798 markup => $title,
3799 tooltip => $tooltip,
3800 on_activate => sub { $self->set_current_page ($widget) },
3801 );
3802
3803 $self->{multiplexer}->add ($widget);
3804}
3805
3806sub get_current_page {
3807 my ($self) = @_;
3808
3809 $self->{multiplexer}->get_current_page
3810}
3811
3812sub set_current_page {
3813 my ($self, $page) = @_;
3814
3815 $self->{multiplexer}->set_current_page ($page);
3816 $self->emit (page_changed => $self->{multiplexer}{current});
3817}
3818
3819#############################################################################
3820
3821package CFPlus::UI::Selector;
3822
3823use utf8;
3824
3825our @ISA = CFPlus::UI::Button::;
3826
3827sub new {
3828 my $class = shift;
3829
3830 my $self = $class->SUPER::new (
3831 options => [], # [value, title, longdesc], ...
3832 value => undef,
3833 @_,
3834 );
3835
3836 $self->_set_value ($self->{value});
3837
3838 $self
3839}
3840
3841sub invoke_button_down {
3842 my ($self, $ev) = @_;
3843
3844 my @menu_items;
3845
3846 for (@{ $self->{options} }) {
3847 my ($value, $title, $tooltip) = @$_;
3848
3849 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3850 }
3851
3852 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3853}
3854
3855sub _set_value {
3856 my ($self, $value) = @_;
3857
3858 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3859 or return;
3860
3861 $self->{value} = $item->[0];
3862 $self->set_markup ("$item->[1] ⇓");
3863 $self->set_tooltip ($item->[2]);
3864}
3865
3866sub set_value {
3867 my ($self, $value) = @_;
3868
3869 return unless $self->{value} ne $value;
3870
3871 $self->_set_value ($value);
3872 $self->emit (changed => $value);
3873}
3874
3875#############################################################################
3876
3877package CFPlus::UI::Statusbox;
3878
3879our @ISA = CFPlus::UI::VBox::;
3880
3881sub new {
3882 my $class = shift;
3883
3884 my $self = $class->SUPER::new (
2867 fontsize => 0.8, 3885 fontsize => 0.8,
2868 @_, 3886 @_,
2869 ) 3887 );
3888
3889 CFPlus::weaken (my $this = $self);
3890
3891 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3892
3893 $self
2870} 3894}
2871 3895
2872sub reorder { 3896sub reorder {
2873 my ($self) = @_; 3897 my ($self) = @_;
2874 my $NOW = time; 3898 my $NOW = Time::HiRes::time;
3899
3900 # freeze display when hovering over any label
3901 return if $CFPlus::UI::TOOLTIP->{owner}
3902 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3903 values %{ $self->{item} };
2875 3904
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3905 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3907 }
2879 3908
… …
2882 my @items = sort { 3911 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3912 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3913 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3914 } values %{ $self->{item} };
2886 3915
3916 $self->{timer}->interval (1);
3917
2887 my $count = 10 + 1; 3918 my $count = 10 + 1;
2888 for my $item (@items) { 3919 for my $item (@items) {
2889 last unless --$count; 3920 last unless --$count;
2890 3921
2891 push @widgets, $item->{label} ||= do { 3922 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3923 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3924 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3925 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3926 : $item->{text};
2896 3927
2897 for ($short) { 3928 for ($short) {
2898 s/^\s+//; 3929 s/^\s+//;
2899 s/\s+/ /g; 3930 s/\s+/ /g;
2900 } 3931 }
2901 3932
2902 new CFClient::UI::Label 3933 new CFPlus::UI::Label
2903 markup => $short, 3934 markup => $short,
2904 tooltip => $item->{tooltip}, 3935 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3936 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3937 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3938 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3939 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3940 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3941 can_events => 1,
2911 can_hover => 1 3942 can_hover => 1
2912 }; 3943 };
3944
3945 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3946 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3947 $label->update;
3948 $label->set_max_size (undef, $label->{req_h} * $diff)
3949 if $diff < 1;
3950 $self->{timer}->interval (1/30);
3951 } else {
3952 $label->{fg}[3] = $item->{fg}[3] || 1;
3953 }
3954
3955 push @widgets, $label;
2913 } 3956 }
2914 3957
2915 $self->clear; 3958 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3959 $self->SUPER::add (reverse @widgets);
2917} 3960}
… …
2922 $text =~ s/^\s+//; 3965 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3966 $text =~ s/\s+$//;
2924 3967
2925 return unless $text; 3968 return unless $text;
2926 3969
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3970 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3971
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3973
2931 if (my $item = $self->{item}{$group}) { 3974 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3975 if ($item->{text} eq $text) {
2933 $item->{count}++; 3976 $item->{count}++;
2934 } else { 3977 } else {
2935 $item->{count} = 1; 3978 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3979 $item->{text} = $item->{tooltip} = $text;
2937 } 3980 }
2938 $item->{id} = ++$self->{id}; 3981 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3982 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3983 delete $item->{label};
2941 } else { 3984 } else {
2942 $self->{item}{$group} = { 3985 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3986 id => ++$self->{id},
… …
2949 count => 1, 3992 count => 1,
2950 %arg, 3993 %arg,
2951 }; 3994 };
2952 } 3995 }
2953 3996
3997 $ROOT->on_refresh (reorder => sub {
2954 $self->reorder; 3998 $self->reorder;
3999 });
2955} 4000}
2956 4001
2957sub reconfigure { 4002sub reconfigure {
2958 my ($self) = @_; 4003 my ($self) = @_;
2959 4004
… …
2962 4007
2963 $self->reorder; 4008 $self->reorder;
2964 $self->SUPER::reconfigure; 4009 $self->SUPER::reconfigure;
2965} 4010}
2966 4011
4012sub destroy {
4013 my ($self) = @_;
4014
4015 $self->{timer}->cancel;
4016
4017 $self->SUPER::destroy;
4018}
4019
2967############################################################################# 4020#############################################################################
2968 4021
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; 4022package CFPlus::UI::Root;
3261 4023
3262our @ISA = CFClient::UI::Container::; 4024our @ISA = CFPlus::UI::Container::;
3263 4025
4026use List::Util qw(min max);
4027
3264use CFClient::OpenGL; 4028use CFPlus::OpenGL;
3265 4029
3266sub new { 4030sub new {
3267 my $class = shift; 4031 my $class = shift;
3268 4032
3269 my $self = $class->SUPER::new ( 4033 my $self = $class->SUPER::new (
3270 visible => 1, 4034 visible => 1,
3271 @_, 4035 @_,
3272 ); 4036 );
3273 4037
3274 Scalar::Util::weaken ($self->{root} = $self); 4038 CFPlus::weaken ($self->{root} = $self);
3275 4039
3276 $self 4040 $self
3277} 4041}
3278 4042
3279sub size_request { 4043sub size_request {
… …
3294 $coord = $max - $size if $coord > $max - $size; 4058 $coord = $max - $size if $coord > $max - $size;
3295 4059
3296 int $coord + 0.5 4060 int $coord + 0.5
3297} 4061}
3298 4062
3299sub size_allocate { 4063sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 4064 my ($self, $w, $h) = @_;
3301 4065
3302 for my $child ($self->children) { 4066 for my $child ($self->children) {
3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4067 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3304 4068
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 4072 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 4073 $Y = _to_pixel $Y, $H, $self->{h};
3310 4074
3311 $child->configure ($X, $Y, $W, $H); 4075 $child->configure ($X, $Y, $W, $H);
3312 } 4076 }
4077
4078 1
3313} 4079}
3314 4080
3315sub coord2local { 4081sub coord2local {
3316 my ($self, $x, $y) = @_; 4082 my ($self, $x, $y) = @_;
3317 4083
… …
3402 4168
3403 delete $queue{$widget+0}; 4169 delete $queue{$widget+0};
3404 4170
3405 my ($w, $h) = $widget->size_request; 4171 my ($w, $h) = $widget->size_request;
3406 4172
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4173 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4174 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4175
4176 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4177 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409 4178
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 4179 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 4180 $h = $widget->{force_h} if exists $widget->{force_h};
3412 4181
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4182 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3441 4210
3442 $w = 0 if $w < 0; 4211 $w = 0 if $w < 0;
3443 $h = 0 if $h < 0; 4212 $h = 0 if $h < 0;
3444 4213
4214 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h;
4216
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
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};
4222
3445 $w = int $w + 0.5; 4223 $w = int $w + 0.5;
3446 $h = int $h + 0.5; 4224 $h = int $h + 0.5;
3447 4225
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w}; 4227 $widget->{old_w} = $widget->{w};
… …
3459 4237
3460 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3461 $_->() 4239 $_->()
3462 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3463 } 4241 }
3464
3465 4242
3466 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3468 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3469 4246
… …
3471 glLoadIdentity; 4248 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 4251 glLoadIdentity;
3475 4252
4253 {
4254 package CFPlus::UI::Base;
4255
4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4257 (0, 0, $self->{w}, $self->{h});
4258
3476 $self->_draw; 4259 $self->_draw;
4260 }
3477} 4261}
3478 4262
3479############################################################################# 4263#############################################################################
3480 4264
3481package CFClient::UI; 4265package CFPlus::UI;
3482 4266
3483$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3484$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3485 4269
34861 42701
3487 4271

Diff Legend

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