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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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