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.159 by root, Mon Apr 24 03:19:42 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 (exists $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_text ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 38 $TOOLTIP->show;
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
36 } 44 }
37 45
38 $TOOLTIP->hide; 46 $TOOLTIP->hide;
39 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;
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
57 90
58 $GRAB = $widget; 91 $GRAB = $widget;
59 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
60 93
61 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
83 118
84 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
85 } 120 }
86} 121}
87 122
88sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
89 my ($ev) = @_; 124 my ($ev) = @_;
… …
95 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
96 131
97 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 $TOOLTIP_WATCHER->start;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 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
119############################################################################# 196#############################################################################
120 197
121package CFClient::UI::Base; 198package CFClient::UI::Base;
122 199
123use strict; 200use strict;
… …
126 203
127sub new { 204sub new {
128 my $class = shift; 205 my $class = shift;
129 206
130 my $self = bless { 207 my $self = bless {
131 x => 0, 208 x => "center",
132 y => 0, 209 y => "center",
133 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
134 can_events => 1, 213 can_events => 1,
135 @_ 214 @_
136 }, $class; 215 }, $class;
137 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
138 for (keys %$self) { 219 for (keys %$self) {
139 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
141 } 222 }
142 } 223 }
143 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
144 $self 237 $self
145} 238}
146 239
147sub destroy { 240sub destroy {
148 my ($self) = @_; 241 my ($self) = @_;
… …
157 return if $self->{parent}; 250 return if $self->{parent};
158 251
159 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
160} 253}
161 254
255sub set_visible {
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};
279
280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self;
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
162sub hide { 308sub hide {
163 my ($self) = @_; 309 my ($self) = @_;
164 310
165 return unless $self->{parent}; 311 $self->set_invisible;
166 312
167 $self->{parent}->remove ($self); 313 $self->{parent}->remove ($self)
314 if $self->{parent};
168} 315}
169 316
170sub move { 317sub move_abs {
171 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
172 319
173 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
176 323
177 $self->update; 324 $self->update;
178} 325}
179 326
180sub set_size { 327sub set_size {
181 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
182 329
183 $self->{user_w} = $w; 330 $self->{force_w} = $w;
184 $self->{user_h} = $h; 331 $self->{force_h} = $h;
185 332
186 $self->check_size; 333 $self->realloc;
187} 334}
188 335
189sub size_request { 336sub size_request {
190 require Carp; 337 require Carp;
191 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
193 340
194sub configure { 341sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
196 343
197 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
200 349
201 # use alignment to adjust x, y 350 # use alignment to adjust x, y
202 351
203 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 354 }
208 355
209 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 357 $self->{x} = $x;
211 $self->{y} = $y; 358 $self->{y} = $y;
212 $self->update; 359 $self->update;
213 } 360 }
214 361
215 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
216 $self->{w} = $w; 365 $self->{alloc_w} = $w;
217 $self->{h} = $h; 366 $self->{alloc_h} = $h;
218 367
219 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 369 }
222} 370}
223 371
224sub size_allocate { 372sub size_allocate {
225 # nothing to be done 373 # nothing to be done
226} 374}
227 375
376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
228sub set_max_size { 384sub set_max_size {
229 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
230 386
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
233}
234 389
235# return top left coordinates 390 $self->realloc;
236sub _topleft { 391}
392
393sub set_tooltip {
237 my ($self, $x, $y) = @_; 394 my ($self, $tooltip) = @_;
238 395
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
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 }
240} 407}
241 408
242# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
243sub coord2local { 410sub coord2local {
244 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
245 412
246 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 414}
249 415
250# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
251sub coord2global { 417sub coord2global {
252 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
253 419
254 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 421}
257 422
258sub focus_in { 423sub focus_in {
259 my ($self) = @_; 424 my ($self) = @_;
260 425
261 return if $FOCUS == $self; 426 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
263 428
264 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
265 430
266 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
267 432
268 $focus->update if $focus; 433 $focus->update if $focus;
269 $FOCUS->update; 434 $FOCUS->update;
270} 435}
271 436
… …
274 439
275 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
276 441
277 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
278 443
279 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
280 445
281 $focus->update if $focus; #? 446 $focus->update if $focus; #?
282}
283 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
284sub mouse_motion { } 452sub mouse_motion { 0 }
285sub button_up { } 453sub button_up { 0 }
286sub key_down { } 454sub key_down { 0 }
287sub key_up { } 455sub key_up { 0 }
288 456
289sub button_down { 457sub button_down {
290 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
291 459
292 $self->focus_in; 460 $self->focus_in;
293}
294 461
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
299sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
300
301sub draw {
302 my ($self) = @_;
303
304 return unless $self->{h} && $self->{w};
305
306 glPushMatrix;
307 glTranslate $self->{x}, $self->{y}, 0;
308 $self->_draw;
309 glPopMatrix;
310
311 if ($self == $HOVER && $self->{can_hover}) {
312 my ($x, $y) = @$self{qw(x y)};
313
314 glColor 1, 0.8, 0.5, 0.2;
315 glEnable GL_BLEND;
316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
317 glBegin GL_QUADS;
318 glVertex $x , $y;
319 glVertex $x + $self->{w}, $y;
320 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h};
322 glEnd;
323 glDisable GL_BLEND;
324 } 462 0
325}
326
327sub _draw {
328 my ($self) = @_;
329
330 warn "no draw defined for $self\n";
331} 463}
332 464
333sub find_widget { 465sub find_widget {
334 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
335 467
… …
344 476
345sub set_parent { 477sub set_parent {
346 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
347 479
348 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
349} 482}
350 483
351sub check_size { 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 {
352 my ($self) = @_; 504 #my ($self, $visible) = @_;
505}
353 506
354 $self->{parent} 507sub realloc {
355 or return 1; 508 my ($self) = @_;
356 509
357 my ($w, $h) = $self->{user_w} && $self->{user_h} 510 if ($self->{visible}) {
358 ? @$self{qw(user_w user_h)} 511 return if $self->{root}{realloc}{$self+0};
359 : $self->size_request;
360 512
361 if ($w != $self->{req_w} || $h != $self->{req_h}) { 513 $self->{root}{realloc}{$self+0} = $self;
362 $self->{req_w} = $w; 514 $self->{root}->update;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else { 515 } else {
373 0 516 delete $self->{req_w};
517 delete $self->{req_h};
374 } 518 }
375} 519}
376 520
377sub update { 521sub update {
378 my ($self) = @_; 522 my ($self) = @_;
379 523
380 $self->{parent}->update 524 $self->{parent}->update
381 if $self->{parent}; 525 if $self->{parent};
382} 526}
383 527
384sub connect { 528sub reconfigure {
385 my ($self, $signal, $cb) = @_; 529 my ($self) = @_;
386 530
387 push @{ $self->{signal_cb}{$signal} }, $cb; 531 # some widgets cache req_w and req_h
388} 532 delete $self->{req_w};
533 delete $self->{req_h};
389 534
390sub emit { 535 $self->realloc;
391 my ($self, $signal, @args) = @_; 536 $self->update;
537}
392 538
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 539# using global variables seems a bit hacky, but passing through all drawing
394 $cb->($self, @args); 540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
542
543sub draw {
544 my ($self) = @_;
545
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);
557
558 glPushMatrix;
559 glTranslate $self->{x}, $self->{y}, 0;
560
561 if ($self == $HOVER && $self->{can_hover}) {
562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
563 glEnable GL_BLEND;
564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
565 glBegin GL_QUADS;
566 glVertex 0 , 0;
567 glVertex $self->{w}, 0;
568 glVertex $self->{w}, $self->{h};
569 glVertex 0 , $self->{h};
570 glEnd;
571 glDisable GL_BLEND;
395 } 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;
584 glPopMatrix;
585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
586 }
587
588 $self->_draw;
589 glPopMatrix;
590}
591
592sub _draw {
593 my ($self) = @_;
594
595 warn "no draw defined for $self\n";
396} 596}
397 597
398sub DESTROY { 598sub DESTROY {
399 my ($self) = @_; 599 my ($self) = @_;
400 600
601 delete $WIDGET{$self+0};
401 #$self->deactivate; 602 #$self->deactivate;
402} 603}
403 604
404############################################################################# 605#############################################################################
405 606
… …
414 my $class = shift; 615 my $class = shift;
415 616
416 # range [value, low, high, page] 617 # range [value, low, high, page]
417 618
418 $class->SUPER::new ( 619 $class->SUPER::new (
419 bg => [0, 0, 0, 0.2], 620 #bg => [0, 0, 0, 0.2],
420 active_bg => [1, 1, 1, 0.5], 621 #active_bg => [1, 1, 1, 0.5],
421 @_ 622 @_
422 ) 623 )
423} 624}
424 625
425sub _draw { 626sub _draw {
426 my ($self) = @_; 627 my ($self) = @_;
427 628
629 my $color = $FOCUS == $self && $self->{active_bg}
630 ? $self->{active_bg}
631 : $self->{bg};
632
633 if ($color && (@$color < 4 || $color->[3])) {
428 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
429 635
430 glEnable GL_BLEND; 636 glEnable GL_BLEND;
431 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
432 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 638 glColor_premultiply @$color;
433 639
434 glBegin GL_QUADS; 640 glBegin GL_QUADS;
435 glVertex 0 , 0; 641 glVertex 0 , 0;
436 glVertex 0 , $h; 642 glVertex 0 , $h;
437 glVertex $w, $h; 643 glVertex $w, $h;
438 glVertex $w, 0; 644 glVertex $w, 0;
439 glEnd; 645 glEnd;
440 646
441 glDisable GL_BLEND; 647 glDisable GL_BLEND;
648 }
442} 649}
443 650
444############################################################################# 651#############################################################################
445 652
446package CFClient::UI::Empty; 653package CFClient::UI::Empty;
… …
451 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
452 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
453} 660}
454 661
455sub size_request { 662sub size_request {
456 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
457} 666}
458 667
459sub draw { } 668sub draw { }
460 669
461############################################################################# 670#############################################################################
… …
465our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
466 675
467sub new { 676sub new {
468 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
469 678
470 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
471 680
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 681 my $self = $class->SUPER::new (
682 children => [],
683 can_events => 0,
684 %arg,
685 );
686
473 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
474 689
475 $self 690 $self
476} 691}
477 692
478sub add { 693sub add {
479 my ($self, $child) = @_; 694 my ($self, @widgets) = @_;
480 695
481 $child->set_parent ($self); 696 $_->set_parent ($self)
697 for @widgets;
482 698
483 use sort 'stable'; 699 use sort 'stable';
484 700
485 $self->{children} = [ 701 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 703 @{$self->{children}}, @widgets
488 ]; 704 ];
489 705
490 $child->check_size; 706 $self->realloc;
707}
708
709sub children {
710 @{ $_[0]{children} }
491} 711}
492 712
493sub remove { 713sub remove {
494 my ($self, $child) = @_; 714 my ($self, $child) = @_;
495 715
496 delete $child->{parent}; 716 delete $child->{parent};
717 $child->hide;
497 718
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 720
500 $self->check_size; 721 $self->realloc;
501 $self->update; 722}
723
724sub clear {
725 my ($self) = @_;
726
727 my $children = delete $self->{children};
728 $self->{children} = [];
729
730 for (@$children) {
731 delete $_->{parent};
732 $_->hide;
733 }
734
735 $self->realloc;
502} 736}
503 737
504sub find_widget { 738sub find_widget {
505 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
506 740
507 $x -= $self->{x}; 741 $x -= $self->{x};
508 $y -= $self->{y}; 742 $y -= $self->{y};
509 743
510 my $res; 744 my $res;
511 745
512 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
513 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
514 and return $res; 748 and return $res;
515 } 749 }
516 750
517 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
566 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
567} 801}
568 802
569############################################################################# 803#############################################################################
570 804
805# back-buffered drawing area
806
571package CFClient::UI::Window; 807package CFClient::UI::Window;
572 808
573our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
574 810
575use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
581} 817}
582 818
583sub update { 819sub update {
584 my ($self) = @_; 820 my ($self) = @_;
585 821
586 # we want to do this delayed... 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 823 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 824}
600 825
601sub size_allocate { 826sub size_allocate {
602 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
603 828
604 $self->child->configure (0, 0, $w, $h); 829 $self->SUPER::size_allocate ($w, $h);
830 $self->update;
831}
605 832
833sub _render {
834 my ($self) = @_;
835
836 $self->{children}[0]->draw;
837}
838
839sub render_child {
840 my ($self) = @_;
841
842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
843 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT;
845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
606 $self->render_chld; 853 $self->_render;
854 };
607} 855}
608 856
609sub _draw { 857sub _draw {
610 my ($self) = @_; 858 my ($self) = @_;
611 859
612 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
613 861
614 my $tex = $self->{texture} 862 my $tex = $self->{texture}
615 or return; 863 or return;
616 864
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1;
621 868
622 $tex->draw_quad (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 870
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
626} 872}
627 873
628############################################################################# 874#############################################################################
629 875
630package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
631 877
632our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
633
634sub new { die }
635
636sub size_request {
637 my ($self) = @_;
638
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
641
642 @$self{qw(child_w child_h)}
643}
644
645sub _draw {
646 my ($self) = @_;
647
648 $self->{children}[1]->draw;
649}
650
651
652#############################################################################
653
654package CFClient::UI::Frame;
655
656our @ISA = CFClient::UI::Bin::;
657
658use CFClient::OpenGL;
659 879
660sub new { 880sub new {
661 my $class = shift; 881 my $class = shift;
662 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
663 my $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 983 vp => (new CFClient::UI::ViewPort expand => 1),
665 border_bg => [1, 1, 1, 1], 984 slider => $slider,
666 border => 0.8, 985 %arg,
667 @_
668 ); 986 );
669 987
988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
990
670 $self 991 $self
671} 992}
672 993
673sub _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 {
674 my ($self) = @_; 1011 my ($self, $w, $h) = @_;
675 1012
676 my ($w, $h) = ($self->{w}, $self->{h}); 1013 $self->SUPER::size_allocate ($w, $h);
677 1014
678 glEnable GL_BLEND; 1015 my $child = $self->{vp}->child;
679 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]);
680 glEnable GL_TEXTURE_2D;
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682
683# glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0;
686# glVertex 0 , $h;
687# glVertex $w, $h;
688# glVertex $w, 0;
689# glEnd;
690
691
692 $self->child->draw;
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D;
695} 1017}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
696 1021
697############################################################################# 1022#############################################################################
698 1023
699package CFClient::UI::FancyFrame; 1024package CFClient::UI::Frame;
700 1025
701our @ISA = CFClient::UI::Bin::; 1026our @ISA = CFClient::UI::Bin::;
702 1027
703use CFClient::OpenGL; 1028use CFClient::OpenGL;
704
705my @tex =
706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
707 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
708 1029
709sub new { 1030sub new {
710 my $class = shift; 1031 my $class = shift;
711 1032
712 # 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};
713 1082
714 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
717 border => 0.8, 1086 border => 0.6,
718 can_events => 1, 1087 can_events => 1,
719 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
720 ); 1091 );
721 1092
722 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
723 align => 0, 1094 align => 0,
724 valign => 1, 1095 valign => 1,
725 text => $self->{title}, 1096 text => $title,
726 fontsize => 1; 1097 fontsize => $self->{border}
1098 if defined $title;
727 1099
728 $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};
729} 1108}
730 1109
731sub border { 1110sub border {
732 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
733} 1112}
734 1113
735sub size_request { 1114sub size_request {
736 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
737 1119
738 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
739 1121
740 ( 1122 (
741 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
744} 1126}
745 1127
746sub size_allocate { 1128sub size_allocate {
747 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
748 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
749 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
751 1141
752 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
753 if $self->{title};
754
755 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
756} 1143}
757 1144
758sub button_down { 1145sub button_down {
759 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
760 1147
1148 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 1149 my $border = $self->border;
762 1150
763 if ($x < $self->{w} && $x >= $self->{w} - $border 1151 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 1152 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 1153
1154 if ($lr & $td) {
1155 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1156 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 1157 my ($bw, $bh) = ($self->{w}, $self->{h});
768 1158
1159 my $mx = $x < $border;
1160 my $my = $y < $border;
1161
769 $self->{motion} = sub { 1162 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
771 1164
772 ($x, $y) = ($ev->{x}, $ev->{y}); 1165 my $dx = $ev->{x} - $ox;
1166 my $dy = $ev->{y} - $oy;
773 1167
774 $self->{user_w} = $bw + $x - $ox; 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
776 $self->check_size; 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1172 $self->realloc;
777 }; 1173 };
778 1174
779 } elsif ($x >= 0 && $x < $self->{w} 1175 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
784 1178
785 $self->{motion} = sub { 1179 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
787 1181
788 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
789 1183
790 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
791 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
792 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
793 } 1192 1
794} 1193}
795 1194
796sub button_up { 1195sub button_up {
797 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
798 1197
799 delete $self->{motion}; 1198 !!delete $self->{motion}
800} 1199}
801 1200
802sub mouse_motion { 1201sub mouse_motion {
803 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
804 1203
805 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
806} 1207}
807 1208
808sub _draw { 1209sub _draw {
809 my ($self) = @_; 1210 my ($self) = @_;
810 1211
1212 my $child = $self->{children}[0];
1213
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
813 1216
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1219
819 my $border = $self->border; 1220 my $border = $self->border;
820 1221
821 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1227
827 my $bg = $tex[0]; 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1229 glColor @{ $self->{bg} };
828 1230
829 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1232 # solve this better(?)
831 my $rep_y = $ch / $bg->{h}; 1233 $bg->{s} = $cw / $bg->{w};
832 1234 $bg->{t} = $ch / $bg->{h};
833 glColor @{ $self->{bg} };
834
835 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1236 }
839 1237
840 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1239
843 $self->{title}->draw if $self->{title};
844 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
845} 1246}
846 1247
847############################################################################# 1248#############################################################################
848 1249
849package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
857sub new { 1258sub new {
858 my $class = shift; 1259 my $class = shift;
859 1260
860 $class->SUPER::new ( 1261 $class->SUPER::new (
861 col_expand => [], 1262 col_expand => [],
862 @_ 1263 @_,
863 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
864} 1269}
865 1270
866sub add { 1271sub add {
867 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
868 1273
869 $child->set_parent ($self); 1274 $child->set_parent ($self);
870 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
871 1276
872 $child->check_size; 1277 $self->realloc;
873} 1278}
874 1279
875# 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?
876sub clear { 1281sub clear {
877 my ($self) = @_; 1282 my ($self) = @_;
878 1283
1284 my @children = $self->children;
879 delete $self->{children}; 1285 delete $self->{children};
880 $self->update; 1286
1287 for (@children) {
1288 delete $_->{parent};
1289 $_->hide;
1290 }
1291
1292 $self->realloc;
881} 1293}
882 1294
883sub get_wh { 1295sub get_wh {
884 my ($self) = @_; 1296 my ($self) = @_;
885 1297
… …
916sub size_allocate { 1328sub size_allocate {
917 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
918 1330
919 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
920 1332
921 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
922 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
923 1335
924 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
925 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
926 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
927 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
981 } 1393 }
982} 1394}
983 1395
984############################################################################# 1396#############################################################################
985 1397
986package CFClient::UI::HBox; 1398package CFClient::UI::Box;
987
988# TODO: wrap into common Box base class
989 1399
990our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
991 1401
992sub size_request { 1402sub size_request {
993 my ($self) = @_; 1403 my ($self) = @_;
994 1404
995 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
996 1406 ? (
997 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
998 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
999 (List::Util::max map $_->[1], @alloc), 1409 )
1000 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1001} 1414}
1002 1415
1003sub size_allocate { 1416sub size_allocate {
1004 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1005 1418
1006 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1007
1008 my $children = $self->{children}; 1420 my $children = $self->{children};
1009 1421
1010 my @h = map $_->{req_w}, @$children; 1422 my @req;
1011 1423
1012 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1013 1425 @req = ($space / (@$children || 1)) x @$children;
1014 if ($req_h > $h) {
1015 # ah well, not enough space
1016 $_ *= $h / $req_h for @h;
1017 } 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 {
1018 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1019 $exp ||= 1;
1020 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1021 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1022 my $child = $children->[$_];
1023
1024 my $alloc_h = $h[$_];
1025 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1026 $h[$_] = $alloc_h;
1027 } 1440 }
1028 } 1441 }
1029 1442
1030 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1031 1444
1032 my $y = 0; 1445 my $pos = 0;
1033 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1034 my $child = $children->[$_];
1035 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1036 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1037 1449
1038 $y += $h; 1450 $pos += $alloc;
1039 } 1451 }
1040 1452
1041 1 1453 1
1042} 1454}
1043 1455
1044############################################################################# 1456#############################################################################
1045 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
1046package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1047 1474
1048# TODO: wrap into common Box base class
1049
1050our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1051 1476
1052sub size_request { 1477sub new {
1053 my ($self) = @_; 1478 my $class = shift;
1054 1479
1055 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1056 1481 vertical => 1,
1057 ( 1482 @_,
1058 (List::Util::max map $_->[0], @alloc),
1059 (List::Util::sum map $_->[1], @alloc),
1060 ) 1483 )
1061} 1484}
1062 1485
1063sub size_allocate {
1064 my ($self, $w, $h) = @_;
1065
1066 my $children = $self->{children};
1067
1068 my @h = map $_->{req_h}, @$children;
1069
1070 my $req_h = List::Util::sum @h;
1071
1072 if ($req_h > $h) {
1073 # ah well, not enough space
1074 $_ *= $h / $req_h for @h;
1075 } else {
1076 my $exp = List::Util::sum map $_->{expand}, @$children;
1077 $exp ||= 1;
1078
1079 for (0 .. $#$children) {
1080 my $child = $children->[$_];
1081
1082 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1083 }
1084 }
1085
1086 CFClient::UI::harmonize \@h;
1087
1088 my $y = 0;
1089 for (0 .. $#$children) {
1090 my $child = $children->[$_];
1091 my $h = $h[$_];
1092 $child->configure (0, $y, $w, $h);
1093
1094 $y += $h;
1095 }
1096
1097 1
1098}
1099
1100############################################################################# 1486#############################################################################
1101 1487
1102package CFClient::UI::Label; 1488package CFClient::UI::Label;
1103 1489
1104our @ISA = CFClient::UI::Base::; 1490our @ISA = CFClient::UI::DrawBG::;
1105 1491
1106use CFClient::OpenGL; 1492use CFClient::OpenGL;
1107 1493
1108sub new { 1494sub new {
1109 my ($class, %arg) = @_; 1495 my ($class, %arg) = @_;
1110 1496
1111 my $self = $class->SUPER::new ( 1497 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1498 fg => [1, 1, 1],
1499 #bg => none
1500 #active_bg => none
1113 #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),
1114 fontsize => 1, 1507 fontsize => 1,
1115 text => "",
1116 align => -1, 1508 align => -1,
1117 valign => -1, 1509 valign => -1,
1118 padding => 2, 1510 padding_x => 2,
1119 layout => new CFClient::Layout, 1511 padding_y => 2,
1120 can_events => 0, 1512 can_events => 0,
1121 %arg 1513 %arg
1122 ); 1514 );
1123 1515
1124 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1517 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1518 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1519 $self->{template} = $layout;
1128 } 1520 }
1129 1521
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1522 if (exists $self->{markup}) {
1131 $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 }
1132 1527
1133 $self 1528 $self
1134} 1529}
1135 1530
1136sub escape_text { 1531sub escape($) {
1137 local $_ = $_[1]; 1532 local $_ = $_[0];
1138 1533
1139 s/&/&amp;/g; 1534 s/&/&amp;/g;
1140 s/>/&gt;/g; 1535 s/>/&gt;/g;
1141 s/</&lt;/g; 1536 s/</&lt;/g;
1142 1537
1143 $_[1] 1538 $_
1539}
1540
1541sub update {
1542 my ($self) = @_;
1543
1544 delete $self->{texture};
1545 $self->SUPER::update;
1546}
1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1144} 1553}
1145 1554
1146sub set_text { 1555sub set_text {
1147 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1148 1557
1558 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text";
1560
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1150 1563
1151 delete $self->{texture}; 1564 delete $self->{req_h};
1152 $self->check_size; 1565 $self->realloc;
1153 $self->update; 1566 $self->update;
1154} 1567}
1155 1568
1156sub set_markup { 1569sub set_markup {
1157 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1158 1571
1572 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup";
1574
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1160 1579
1161 delete $self->{texture}; 1580 delete $self->{req_h};
1162 $self->check_size; 1581 $self->realloc;
1163 $self->update; 1582 $self->update;
1164} 1583}
1165 1584
1166sub size_request { 1585sub size_request {
1167 my ($self) = @_; 1586 my ($self) = @_;
1168 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $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});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1596
1173 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1174 1598
1175 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1176 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1177 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1178 1602
1179 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1180 1604
1181 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1182 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1183 } 1607 }
1184 1608
1609 ($w, $h)
1185 ( 1610 }
1186 $w + $self->{padding} * 2,
1187 $h + $self->{padding} * 2,
1188 )
1189} 1611}
1190 1612
1191sub size_allocate { 1613sub size_allocate {
1192 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1193 1615
1616 delete $self->{ox};
1617
1194 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1195} 1620}
1196 1621
1197sub set_fontsize { 1622sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1199 1624
1200 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1626 delete $self->{texture};
1202 $self->check_size; 1627
1203 $self->update; 1628 $self->realloc;
1204} 1629}
1205 1630
1206sub _draw { 1631sub _draw {
1207 my ($self) = @_; 1632 my ($self) = @_;
1208 1633
1634 $self->SUPER::_draw; # draw background, if applicable
1635
1209 my $tex = $self->{texture} ||= do { 1636 my $tex = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1638 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $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});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643
1213 new_from_layout CFClient::Texture $self->{layout} 1644 new_from_layout CFClient::Texture $self->{layout}
1214 }; 1645 };
1215 1646
1216 glEnable GL_BLEND; 1647 unless (exists $self->{ox}) {
1217 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
1218 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 {
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220
1221 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1236 1667
1237 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1669}
1240 1670
1241############################################################################# 1671#############################################################################
1242 1672
1243package CFClient::UI::EntryBase; 1673package CFClient::UI::EntryBase;
… …
1248 1678
1249sub new { 1679sub new {
1250 my $class = shift; 1680 my $class = shift;
1251 1681
1252 $class->SUPER::new ( 1682 $class->SUPER::new (
1253 fg => [1, 1, 1], 1683 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1684 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1685 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1686 active_fg => [0, 0, 0],
1257 can_hover => 1, 1687 can_hover => 1,
1258 can_focus => 1, 1688 can_focus => 1,
1259 valign => 0, 1689 valign => 0,
1260 can_events => 1, 1690 can_events => 1,
1691 #text => ...
1261 @_ 1692 @_
1262 ) 1693 )
1263} 1694}
1264 1695
1265sub _set_text { 1696sub _set_text {
… …
1267 1698
1268 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1269 1700
1270 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1271 1702
1272 delete $self->{texture};
1273
1274 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1275 $self->{text} = $text; 1704 $self->{text} = $text;
1276 1705
1277 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1278 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1279 1709
1280 $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);
1281} 1721}
1282 1722
1283sub get_text { 1723sub get_text {
1284 $_[0]{text} 1724 $_[0]{text}
1285} 1725}
… …
1288 my ($self) = @_; 1728 my ($self) = @_;
1289 1729
1290 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1291 1731
1292 ($w + 1, $h) # add 1 for cursor 1732 ($w + 1, $h) # add 1 for cursor
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1733}
1308 1734
1309sub key_down { 1735sub key_down {
1310 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1311 1737
… …
1313 my $sym = $ev->{sym}; 1739 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1740 my $uni = $ev->{unicode};
1315 1741
1316 my $text = $self->get_text; 1742 my $text = $self->get_text;
1317 1743
1318 if ($sym == 8) { 1744 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1746 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1747 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1748 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1749 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1750 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1751 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1756 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1757 $self->_emit ('escape');
1332 } elsif ($uni) { 1758 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1334 } 1762 }
1335 1763
1336 $self->_set_text ($text); 1764 $self->_set_text ($text);
1337 $self->update; 1765
1766 $self->realloc;
1767
1768 1
1338} 1769}
1339 1770
1340sub focus_in { 1771sub focus_in {
1341 my ($self) = @_; 1772 my ($self) = @_;
1342 1773
… …
1357 utf8::encode $text; 1788 utf8::encode $text;
1358 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1359 1790
1360 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1361 $self->update; 1792 $self->update;
1793
1794 1
1362} 1795}
1363 1796
1364sub mouse_motion { 1797sub mouse_motion {
1365 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1366# 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
1367} 1802}
1368 1803
1369sub _draw { 1804sub _draw {
1370 my ($self) = @_; 1805 my ($self) = @_;
1371 1806
1372 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1373 1808
1374 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1375 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1376 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1377 } else { 1812 } else {
1378 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1379 } 1814 }
1380 1815
1381 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1382 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1383 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1384 glVertex 0 , 0; 1819 glVertex 0 , 0;
1385 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1386 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1387 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1418 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1419 1854
1420 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1421 1856
1422 if ($sym == 13) { 1857 if ($sym == 13) {
1858 unshift @{$self->{history}},
1859 my $txt = $self->get_text;
1860 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1862 $self->_emit (activate => $txt);
1424 $self->update; 1863 $self->update;
1425 1864
1865 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text;
1868 }
1869 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++;
1871 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1872 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 }
1876
1877 } elsif ($sym == CFClient::SDLK_DOWN) {
1878 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880
1881 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else {
1884 $self->set_text ($self->{history_saveback});
1885 }
1886
1426 } else { 1887 } else {
1427 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1428 } 1891 1
1429
1430} 1892}
1431 1893
1432############################################################################# 1894#############################################################################
1433 1895
1434package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1443 1905
1444sub new { 1906sub new {
1445 my $class = shift; 1907 my $class = shift;
1446 1908
1447 $class->SUPER::new ( 1909 $class->SUPER::new (
1448 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1449 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1452 can_hover => 1, 1914 can_hover => 1,
1453 align => 0, 1915 align => 0,
1454 valign => 0, 1916 valign => 0,
1455 can_events => 1, 1917 can_events => 1,
1456 @_ 1918 @_
1457 ) 1919 )
1458} 1920}
1459 1921
1922sub activate { }
1923
1460sub button_up { 1924sub button_up {
1461 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1462 1926
1927 $self->emit ("activate")
1463 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1464 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1465 $self->emit ("activate"); 1930
1466 } 1931 1
1467} 1932}
1468 1933
1469sub _draw { 1934sub _draw {
1470 my ($self) = @_; 1935 my ($self) = @_;
1471 1936
1472 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1473 1938
1474 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg};
1476 }
1477
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1483 1942
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1944
1486 glDisable GL_TEXTURE_2D; 1945 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1946
1489 $self->SUPER::_draw; 1947 $self->SUPER::_draw;
1490} 1948}
1491 1949
1492############################################################################# 1950#############################################################################
… …
1503 1961
1504sub new { 1962sub new {
1505 my $class = shift; 1963 my $class = shift;
1506 1964
1507 $class->SUPER::new ( 1965 $class->SUPER::new (
1508 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1509 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1510 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],
1511 state => 0, 1972 state => 0,
1512 can_hover => 1, 1973 can_hover => 1,
1513 @_ 1974 @_
1514 ) 1975 )
1515} 1976}
1516 1977
1517sub size_request { 1978sub size_request {
1518 my ($self) = @_; 1979 my ($self) = @_;
1519 1980
1520 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1521} 1982}
1522 1983
1523sub button_down { 1984sub button_down {
1524 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1525 1986
1526 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1527 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1528 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1529 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1530 } 1995 1
1531} 1996}
1532 1997
1533sub _draw { 1998sub _draw {
1534 my ($self) = @_; 1999 my ($self) = @_;
1535 2000
1536 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1537 2002
1538 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1539 2004
1540 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;
1541 2008
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 2010
1544 glEnable GL_BLEND; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
2012
1545 glEnable GL_TEXTURE_2D; 2013 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 2014 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 2015 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 2016}
1555 2017
1556############################################################################# 2018#############################################################################
1557 2019
1558package CFClient::UI::Image; 2020package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 2063 glTranslate 0, -$self->{w}, 0;
1602 2064
1603 ($w, $h) = ($h, $w); 2065 ($w, $h) = ($h, $w);
1604 } 2066 }
1605 2067
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 2068 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 2070
1611 $tex->draw_quad (0, 0, $w, $h); 2071 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 2072
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 2073 glDisable GL_TEXTURE_2D;
1615} 2074}
1616 2075
1617############################################################################# 2076#############################################################################
1618 2077
… …
1666} 2125}
1667 2126
1668sub set_max { 2127sub set_max {
1669 my ($self, $max) = @_; 2128 my ($self, $max) = @_;
1670 2129
2130 return if $self->{max_val} == $max;
2131
1671 $self->{max_val} = $max; 2132 $self->{max_val} = $max;
2133 $self->update;
1672} 2134}
1673 2135
1674sub set_value { 2136sub set_value {
1675 my ($self, $val, $max) = @_; 2137 my ($self, $val, $max) = @_;
1676 2138
1677 $self->set_max ($max) 2139 $self->set_max ($max)
1678 if defined $max; 2140 if defined $max;
1679 2141
1680 $max = $self->{max_val}; 2142 return if $self->{val} == $val;
2143
1681 $self->{val} = $val; 2144 $self->{val} = $val;
1682
1683 $self->update; 2145 $self->update;
1684} 2146}
1685 2147
1686sub _draw { 2148sub _draw {
1687 my ($self) = @_; 2149 my ($self) = @_;
… …
1705 2167
1706 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1707 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1708 2170
1709 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1710 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;
1711 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1713 2176
1714 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1715 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
1750 2213
1751sub new { 2214sub new {
1752 my ($class, %arg) = @_; 2215 my ($class, %arg) = @_;
1753 2216
1754 my $self = $class->SUPER::new ( 2217 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2218 tooltip => $arg{type},
2219 can_hover => 1,
2220 can_events => 1,
1756 %arg, 2221 %arg,
1757 ); 2222 );
1758 2223
1759 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1760 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2225 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1761 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2226 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1762 2227
1763 $self 2228 $self
1764} 2229}
1765 2230
1766sub set_fontsize { 2231sub set_fontsize {
… …
1768 2233
1769 $self->{value}->set_fontsize ($fsize); 2234 $self->{value}->set_fontsize ($fsize);
1770 $self->{max} ->set_fontsize ($fsize); 2235 $self->{max} ->set_fontsize ($fsize);
1771} 2236}
1772 2237
2238sub set_max {
2239 my ($self, $max) = @_;
2240
2241 $self->{gauge}->set_max ($max);
2242 $self->{max}->set_text ($max);
2243}
2244
1773sub set_value { 2245sub set_value {
1774 my ($self, $val, $max) = @_; 2246 my ($self, $val, $max) = @_;
1775 2247
1776 $self->set_max ($max) 2248 $self->set_max ($max)
1777 if defined $max; 2249 if defined $max;
1778 2250
1779 $self->{gauge}->set_value ($val, $max); 2251 $self->{gauge}->set_value ($val, $max);
1780 $self->{value}->set_text ($val); 2252 $self->{value}->set_text ($val);
1781}
1782
1783sub set_max {
1784 my ($self, $max) = @_;
1785
1786 $self->{gauge}->set_max ($max);
1787 $self->{max}->set_text ($max);
1788} 2253}
1789 2254
1790############################################################################# 2255#############################################################################
1791 2256
1792package CFClient::UI::Slider; 2257package CFClient::UI::Slider;
… …
1802 qw(s1_slider.png s1_slider_bg.png); 2267 qw(s1_slider.png s1_slider_bg.png);
1803 2268
1804sub new { 2269sub new {
1805 my $class = shift; 2270 my $class = shift;
1806 2271
1807 # range [value, low, high, page] 2272 # range [value, low, high, page, unit]
1808 2273
1809 # TODO: 0-width page 2274 # TODO: 0-width page
1810 # TODO: req_w/h are wrong with vertical 2275 # TODO: req_w/h are wrong with vertical
1811 # TODO: calculations are off 2276 # TODO: calculations are off
1812 my $self = $class->SUPER::new ( 2277 my $self = $class->SUPER::new (
1813 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
1814 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],
1815 range => [0, 0, 100, 10], 2282 range => [0, 0, 100, 10, 0],
1816 req_w => 20, 2283 min_w => $::WIDTH / 80,
1817 req_h => 20, 2284 min_h => $::WIDTH / 80,
1818 vertical => 0, 2285 vertical => 0,
1819 can_hover => 1, 2286 can_hover => 1,
1820 inner_pad => 5, 2287 inner_pad => 0.02,
1821 @_ 2288 @_
1822 ); 2289 );
1823 2290
2291 $self->set_value ($self->{range}[0]);
2292 $self->update;
2293
1824 $self 2294 $self
1825} 2295}
1826 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
1827sub size_request { 2331sub size_request {
1828 my ($self) = @_; 2332 my ($self) = @_;
1829 2333
1830 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
1831 my $h = $self->{req_h};
1832
1833 $self->{vertical} ? ($h, $w) : ($w, $h)
1834} 2335}
1835 2336
1836sub button_down { 2337sub button_down {
1837 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
1838 2339
1839 $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
1840 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
1841} 2345}
1842 2346
1843sub mouse_motion { 2347sub mouse_motion {
1844 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
1845 2349
1846 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
1847 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2379 my $range = ($hi - $page - $lo) || 1e-100;
1848 2380
1849 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2381 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1850 2382
1851 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2383 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1852 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2384 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1853 2385
1854 $x -= $inner_pad_px; # substract the padding 2386 $value = ($value - $lo) / $range;
1855 $x = $x * ($hi - $lo) / $inner_w + $lo; 2387 $value = $value * $self->{scale} + $self->{offset};
1856 $x = $lo if $x < $lo;
1857 $x = $hi - $page if $x > $hi - $page;
1858 $self->{range}[0] = $x;
1859 2388
1860 $self->emit (changed => $x); 2389 $self->{knob_x} = $value - $knob_w * 0.5;
1861 $self->update; 2390 $self->{knob_w} = $knob_w;
1862 } 2391 }
1863}
1864
1865# the inner_* stuff is for generating a padding for the slider handle,
1866# so that the handle doesn't leave the texture. This calculation isn't 100%
1867# correct propably, but it does the job for now
1868sub _calc_inner_pad_px {
1869 my ($self, $w) = @_;
1870 ($w / 100) * $self->{inner_pad} # % to pixels
1871}
1872
1873sub _draw {
1874 my ($self) = @_;
1875 2392
1876 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
1877 2394
1878 my ($w, $h) = @$self{qw(w h)}; 2395 glScale $self->{w}, $self->{h};
1879 2396
1880 if ($self->{vertical}) { 2397 if ($self->{vertical}) {
1881 # draw a vertical slider like a rotated horizontal slider 2398 # draw a vertical slider like a rotated horizontal slider
1882 2399
2400 glTranslate 1, 0, 0;
1883 glRotate 90, 0, 0, 1; 2401 glRotate 90, 0, 0, 1;
1884 glTranslate 0, -$self->{w}, 0;
1885
1886 ($w, $h) = ($h, $w);
1887 } 2402 }
1888 2403
1889 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2404 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1890 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2405 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1891 2406
1892 my ($value, $lo, $hi, $page) = @{$self->{range}};
1893
1894 $hi = $value + 1 if $lo == $hi;
1895
1896 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1897 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1898
1899 $page = int $page * $inner_w / ($hi - $lo);
1900 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1901
1902 $w -= $page;
1903 $page &= ~1;
1904 glTranslate $page * 0.5, 0, 0;
1905 $page ||= 2;
1906
1907 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1908 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1909
1910 glEnable GL_BLEND;
1911 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1912 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 2409
1915 # draw background 2410 # draw background
1916 $tex[1]->draw_quad (0, 0, $w, $h); 2411 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1917 2412
1918 # draw handle 2413 # draw handle
1919 $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);
1920 2415
1921 glDisable GL_BLEND;
1922 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
1923} 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 (@_) }
1924 2459
1925############################################################################# 2460#############################################################################
1926 2461
1927package CFClient::UI::TextView; 2462package CFClient::UI::TextView;
1928 2463
… …
1932 2467
1933sub new { 2468sub new {
1934 my $class = shift; 2469 my $class = shift;
1935 2470
1936 my $self = $class->SUPER::new ( 2471 my $self = $class->SUPER::new (
1937 fontsize => 1, 2472 fontsize => 1,
2473 can_events => 0,
1938 #font => default_font 2474 #font => default_font
1939 @_, 2475 @_,
1940 2476
1941 layout => (new CFClient::Layout), 2477 layout => (new CFClient::Layout 1),
1942 par => [], 2478 par => [],
1943 height => 0, 2479 height => 0,
1944 children => [ 2480 children => [
1945 (new CFClient::UI::Empty expand => 1), 2481 (new CFClient::UI::Empty expand => 1),
1946 (new CFClient::UI::Slider vertical => 1), 2482 (new CFClient::UI::Slider vertical => 1),
1947 ], 2483 ],
1948 ); 2484 );
1949 2485
1950 $self->{children}[1]->connect (changed => sub { 2486 $self->{children}[1]->connect (changed => sub { $self->update });
1951 $self->update;
1952 });
1953 2487
1954 $self 2488 $self
1955} 2489}
1956 2490
1957sub set_fontsize { 2491sub set_fontsize {
1958 my ($self, $fontsize) = @_; 2492 my ($self, $fontsize) = @_;
1959 2493
1960 $self->{fontsize} = $fontsize; 2494 $self->{fontsize} = $fontsize;
1961 $self->reflow; 2495 $self->reflow;
1962}
1963
1964sub text_height {
1965 my ($self, $text) = @_;
1966
1967 my $layout = $self->{layout};
1968
1969 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1970 $layout->set_width ($self->{w});
1971 $layout->set_text ($text);
1972
1973 ($layout->size)[1]
1974}
1975
1976sub reflow {
1977 my ($self) = @_;
1978
1979 $self->{need_reflow}++;
1980 $self->update;
1981} 2496}
1982 2497
1983sub size_allocate { 2498sub size_allocate {
1984 my ($self, $w, $h) = @_; 2499 my ($self, $w, $h) = @_;
1985 2500
… …
1990 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
1991 2506
1992 $self->reflow; 2507 $self->reflow;
1993} 2508}
1994 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
1995sub add_paragraph { 2544sub add_paragraph {
1996 my ($self, $color, $text) = @_; 2545 my ($self, $color, $text, $indent) = @_;
1997 2546
1998 #TODO: intelligently "reformat" paragraph 2547 for my $line (split /\n/, $text) {
1999 2548 my ($w, $h) = $self->text_size ($line);
2000 my $height = $self->text_height ($text);
2001
2002 $self->{height} += $height; 2549 $self->{height} += $h;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2551 }
2003 2552
2004 push @{$self->{par}}, [$height, $color, $text];
2005
2006 $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]);
2007 $self->{children}[1]->update;
2008} 2554}
2009 2555
2010sub update { 2556sub update {
2011 my ($self) = @_; 2557 my ($self) = @_;
2012 2558
… …
2014 2560
2015 return unless $self->{h} > 0; 2561 return unless $self->{h} > 0;
2016 2562
2017 delete $self->{texture}; 2563 delete $self->{texture};
2018 2564
2019 $ROOT->on_refresh ($self, sub { 2565 $ROOT->on_post_alloc ($self, sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567
2020 if (delete $self->{need_reflow}) { 2568 if (delete $self->{need_reflow}) {
2021 my $height = 0; 2569 my $height = 0;
2022 2570
2023 $height += $_->[0] = $self->text_height ($_->[2]) 2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2024 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 }
2025 2586
2026 $self->{height} = $height; 2587 $self->{height} = $height;
2027 2588
2028 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2029 2590
2030 delete $self->{texture}; 2591 delete $self->{texture};
2031 } 2592 }
2032 2593
2033 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2034 glClearColor 0, 0, 0, 1; 2595 glClearColor 0, 0, 0, 0;
2035 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2036 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
2037 glEnable GL_BLEND; 2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2039 glEnable GL_TEXTURE_2D;
2040 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2041
2042 my $top = int $self->{children}[1]{range}[0];
2043
2044 my $y0 = $top;
2045 my $y1 = $top + $self->{h};
2046
2047 my $y = 0;
2048
2049 my $layout = $self->{layout};
2050
2051 $layout->set_font ($self->{font}) if $self->{font};
2052 2612
2053 for my $par (@{$self->{par}}) { 2613 for my $par (@{$self->{par}}) {
2054 my $h = $par->[0]; 2614 my $h = $par->[1];
2055 2615
2056 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]);
2057 $layout->set_text ($par->[2]); 2619 $layout->set_markup ($par->[4]);
2058 2620
2059 glColor @{ $par->[1] }; 2621 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2060 my ($W, $H) = $layout->size; 2622
2061 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;
2062 } 2625 }
2063 2626
2064 $y += $h; 2627 $y += $h;
2065 } 2628 }
2066 2629
2067 glDisable GL_TEXTURE_2D;
2068 glDisable GL_BLEND; 2630 glDisable GL_BLEND;
2069 }; 2631 };
2070 }); 2632 });
2071} 2633}
2072 2634
2073sub _draw { 2635sub _draw {
2074 my ($self) = @_; 2636 my ($self) = @_;
2075 2637
2076 if ($self->{texture}) {
2077 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2078 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2079 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2640 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2080 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2081 }
2082 2643
2083 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2084 2645
2085} 2646}
2086 2647
… …
2134 2695
2135sub new { 2696sub new {
2136 my $class = shift; 2697 my $class = shift;
2137 2698
2138 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2139 state => 0, 2700 state => 0,
2140 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2141 can_events => 1,
2142 @_ 2702 @_
2143 ); 2703 );
2144 2704
2145 if ($self->{state}) {
2146 $self->{state} = 0;
2147 $self->toggle_flopper;
2148 }
2149
2150 $self 2705 $self
2151} 2706}
2152 2707
2153sub toggle_flopper { 2708sub toggle_flopper {
2154 my ($self) = @_; 2709 my ($self) = @_;
2155 2710
2156 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2157 if ($self->{state} = !$self->{state}) {
2158 $CFClient::UI::ROOT->add ($self->{other});
2159 $self->{other}->move ($self->coord2global (0, $self->{h}));
2160 $self->emit ("open");
2161 } else {
2162 $CFClient::UI::ROOT->remove ($self->{other});
2163 $self->emit ("close");
2164 }
2165
2166 $self->emit (changed => $self->{state});
2167} 2712}
2168 2713
2169############################################################################# 2714#############################################################################
2170 2715
2171package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2181 @_, 2726 @_,
2182 can_events => 0, 2727 can_events => 0,
2183 ) 2728 )
2184} 2729}
2185 2730
2186sub set_text { 2731sub set_tooltip_from {
2187 my ($self, $text) = @_; 2732 my ($self, $widget) = @_;
2188 2733
2189 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2734 my $tooltip = $widget->{tooltip};
2190 $self->{label}->set_text ($text); 2735
2191 $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 );
2192} 2751}
2193 2752
2194sub size_request { 2753sub size_request {
2195 my ($self) = @_; 2754 my ($self) = @_;
2196 2755
2197 $self->child->set_max_size ($::WIDTH * 0.2);
2198
2199 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200 2757
2201 ($w + 4, $h + 4) 2758 ($w + 4, $h + 4)
2202} 2759}
2203 2760
2761sub size_allocate {
2762 my ($self, $w, $h) = @_;
2763
2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
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
2204sub _draw { 2785sub _draw {
2205 my ($self) = @_; 2786 my ($self) = @_;
2206 2787
2207 glPushMatrix;
2208 glTranslate 0.375, 0.375; 2788 glTranslate 0.375, 0.375;
2209 2789
2210 my ($w, $h) = @$self{qw(w h)}; 2790 my ($w, $h) = @$self{qw(w h)};
2211 2791
2212 glColor 1, 0.8, 0.4; 2792 glColor 1, 0.8, 0.4;
… …
2223 glVertex 0 , $h; 2803 glVertex 0 , $h;
2224 glVertex $w, $h; 2804 glVertex $w, $h;
2225 glVertex $w, 0; 2805 glVertex $w, 0;
2226 glEnd; 2806 glEnd;
2227 2807
2228 glPopMatrix; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2229 2809
2230 glTranslate 2, 2;
2231 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2232} 2811}
2233 2812
2234############################################################################# 2813#############################################################################
2235 2814
2815package CFClient::UI::Face;
2816
2817our @ISA = CFClient::UI::Base::;
2818
2819use CFClient::OpenGL;
2820
2821sub new {
2822 my $class = shift;
2823
2824 my $self = $class->SUPER::new (
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 => [],
3481 @_,
3482 )
3483}
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
2236package CFClient::UI::Root; 3527package CFClient::UI::Root;
2237 3528
2238our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
2239 3530
3531use List::Util qw(min max);
3532
2240use CFClient::OpenGL; 3533use CFClient::OpenGL;
2241 3534
2242sub check_size { 3535sub new {
2243 my ($self) = @_; 3536 my $class = shift;
2244 3537
2245 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2246} 3546}
2247 3547
2248sub size_request { 3548sub size_request {
2249 ($::WIDTH, $::HEIGHT) 3549 my ($self) = @_;
2250}
2251 3550
2252sub configure { 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3566}
3567
3568sub size_allocate {
2253 my ($self, $x, $y, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2254 3570
2255 $self->SUPER::configure ($x, $y, $w, $h);
2256
2257 for my $child (@{$self->{children}}) { 3571 for my $child ($self->children) {
2258 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)};
2259 3573
2260 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3574 $X = $child->{force_x} if exists $child->{force_x};
2261 $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
2262 $child->configure ($X, $Y, $W,$H); 3580 $child->configure ($X, $Y, $W, $H);
2263 } 3581 }
2264} 3582}
2265 3583
2266sub _topleft { 3584sub coord2local {
2267 my ($self, $x, $y) = @_; 3585 my ($self, $x, $y) = @_;
2268 3586
2269 ($x, $y) 3587 ($x, $y)
2270} 3588}
2271 3589
3590sub coord2global {
3591 my ($self, $x, $y) = @_;
3592
3593 ($x, $y)
3594}
3595
2272sub update { 3596sub update {
2273 my ($self) = @_; 3597 my ($self) = @_;
2274 3598
2275 $self->check_size; 3599 $::WANT_REFRESH++;
2276 ::refresh ();
2277} 3600}
2278 3601
2279sub add { 3602sub add {
2280 my ($self, $child) = @_; 3603 my ($self, @children) = @_;
2281 3604
2282 # integerize window positions 3605 $_->{is_toplevel} = 1
2283 $child->{x} = int $child->{x}; 3606 for @children;
2284 $child->{y} = int $child->{y};
2285 3607
2286 $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 }
2287} 3624}
2288 3625
2289sub on_refresh { 3626sub on_refresh {
2290 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
2291 3628
2292 $self->{refresh_hook}{$id} = $cb; 3629 $self->{refresh_hook}{$id} = $cb;
2293} 3630}
2294 3631
3632sub on_post_alloc {
3633 my ($self, $id, $cb) = @_;
3634
3635 $self->{post_alloc_hook}{$id} = $cb;
3636}
3637
2295sub draw { 3638sub draw {
2296 my ($self) = @_; 3639 my ($self) = @_;
2297 3640
2298 while (my $rcb = delete $self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
2299 $_->() for values %$rcb; 3642 $_->()
3643 for values %{delete $self->{refresh_hook}};
2300 } 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
2301 3737
2302 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2303 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2304 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
2305 3741
2306 glMatrixMode GL_PROJECTION; 3742 glMatrixMode GL_PROJECTION;
2307 glLoadIdentity; 3743 glLoadIdentity;
2308 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2309 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
2310 glLoadIdentity; 3746 glLoadIdentity;
2311 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
2312 $self->_draw; 3755 $self->_draw;
2313} 3756}
2314 3757
2315############################################################################# 3758#############################################################################
2316 3759
2317package CFClient::UI; 3760package CFClient::UI;
2318 3761
2319$ROOT = new CFClient::UI::Root; 3762$ROOT = new CFClient::UI::Root;
2320$TOOLTIP = new CFClient::UI::Tooltip; 3763$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2321 3764
23221 37651
2323 3766

Diff Legend

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