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.205 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
278} 376}
279 377
280sub set_max_size { 378sub set_max_size {
281 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
282 380
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
285} 399}
286 400
287# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
288sub coord2local { 402sub coord2local {
289 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 418 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
306 420
307 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
308 422
309 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
310 424
311 $focus->update if $focus; 425 $focus->update if $focus;
312 $FOCUS->update; 426 $FOCUS->update;
313} 427}
314 428
… …
317 431
318 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
319 433
320 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
321 435
322 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
323 437
324 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
325} 442}
326 443
327sub mouse_motion { } 444sub mouse_motion { }
328sub button_up { } 445sub button_up { }
329sub key_down { } 446sub key_down { }
330sub key_up { } 447sub key_up { }
331 448
332sub button_down { 449sub button_down {
333 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
334 451
335 $self->focus_in; 452 $self->focus_in;
336} 453}
337 454
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
342sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
343 528
344sub draw { 529sub draw {
345 my ($self) = @_; 530 my ($self) = @_;
346 531
347 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
348 543
349 glPushMatrix; 544 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw; 546 $self->_draw;
352 glPopMatrix; 547 glPopMatrix;
… …
364 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
365 glEnd; 560 glEnd;
366 glDisable GL_BLEND; 561 glDisable GL_BLEND;
367 } 562 }
368 563
369 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
370 glPushMatrix; 565 glPushMatrix;
371 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 569 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
378 glEnd; 573 glEnd;
379 glPopMatrix; 574 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 576 }
382} 577}
… …
385 my ($self) = @_; 580 my ($self) = @_;
386 581
387 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
388} 583}
389 584
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 585sub DESTROY {
439 my ($self) = @_; 586 my ($self) = @_;
440 587
441 delete $WIDGET{$self+0}; 588 delete $WIDGET{$self+0};
442 #$self->deactivate; 589 #$self->deactivate;
… …
455 my $class = shift; 602 my $class = shift;
456 603
457 # range [value, low, high, page] 604 # range [value, low, high, page]
458 605
459 $class->SUPER::new ( 606 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
462 @_ 609 @_
463 ) 610 )
464} 611}
465 612
466sub _draw { 613sub _draw {
467 my ($self) = @_; 614 my ($self) = @_;
468 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
470 622
471 glEnable GL_BLEND; 623 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
474 626
475 glBegin GL_QUADS; 627 glBegin GL_QUADS;
476 glVertex 0 , 0; 628 glVertex 0 , 0;
477 glVertex 0 , $h; 629 glVertex 0 , $h;
478 glVertex $w, $h; 630 glVertex $w, $h;
479 glVertex $w, 0; 631 glVertex $w, 0;
480 glEnd; 632 glEnd;
481 633
482 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
483} 636}
484 637
485############################################################################# 638#############################################################################
486 639
487package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
494} 647}
495 648
496sub size_request { 649sub size_request {
497 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
498} 653}
499 654
500sub draw { } 655sub draw { }
501 656
502############################################################################# 657#############################################################################
… …
531 $self->{children} = [ 686 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
534 ]; 689 ];
535 690
536 $self->check_size (1); 691 $self->realloc;
537 $self->update;
538} 692}
539 693
540sub children { 694sub children {
541 @{ $_[0]{children} } 695 @{ $_[0]{children} }
542} 696}
… …
547 delete $child->{parent}; 701 delete $child->{parent};
548 $child->hide; 702 $child->hide;
549 703
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 705
552 $self->check_size; 706 $self->realloc;
553 $self->update;
554} 707}
555 708
556sub clear { 709sub clear {
557 my ($self) = @_; 710 my ($self) = @_;
558 711
… …
562 for (@$children) { 715 for (@$children) {
563 delete $_->{parent}; 716 delete $_->{parent};
564 $_->hide; 717 $_->hide;
565 } 718 }
566 719
567 $self->check_size; 720 $self->realloc;
568 $self->update;
569} 721}
570 722
571sub find_widget { 723sub find_widget {
572 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
573 725
… …
660 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
661 $self->update; 813 $self->update;
662} 814}
663 815
664sub _render { 816sub _render {
817 my ($self) = @_;
818
665 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
666} 820}
667 821
668sub render_child { 822sub render_child {
669 my ($self) = @_; 823 my ($self) = @_;
670 824
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
674 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
675 $self->_render; 836 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 837 };
684} 838}
685 839
686sub _draw { 840sub _draw {
687 my ($self) = @_; 841 my ($self) = @_;
688 842
689 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
690 844
691 my $tex = $self->{texture} 845 my $tex = $self->{texture}
692 or return; 846 or return;
693 847
694 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
697 851
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 853
700 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
701} 855}
… …
704 858
705package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
706 860
707our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
708 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
709sub size_request { 873sub size_request {
710 my ($self) = @_; 874 my ($self) = @_;
711 875
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 877
715 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
716} 882}
717 883
718sub size_allocate { 884sub size_allocate {
719 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
720 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
721 $self->update; 893 $self->update;
722} 894}
723 895
724sub set_offset { 896sub set_offset {
725 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
759} 931}
760 932
761sub _render { 933sub _render {
762 my ($self) = @_; 934 my ($self) = @_;
763 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765 940
766 $self->SUPER::_render; 941 $self->SUPER::_render;
767} 942}
768 943
… …
776 my $class = shift; 951 my $class = shift;
777 952
778 my $self; 953 my $self;
779 954
780 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
781 vertical => 1, 956 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 958 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
785 }, 960 },
786 ; 961 ;
787 962
788 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 965 slider => $slider,
791 @_, 966 @_,
792 ); 967 );
793 968
794 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
797 972
798 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 993}
800 994
801#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 996# update viewport offset on scroll
803 997
… …
847 1041
848our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
849 1043
850use CFClient::OpenGL; 1044use CFClient::OpenGL;
851 1045
852my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855 1053
856sub new { 1054sub new {
857 my $class = shift; 1055 my $class = shift;
858 1056
859 # TODO: user_x, user_y, overwrite moveto?
860
861 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1060 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
867 @_ 1064 @_
868 ); 1065 );
869 1066
870 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 1068 align => 0,
… …
895 my ($self, $w, $h) = @_; 1092 my ($self, $w, $h) = @_;
896 1093
897 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
899 1096
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 1098 if $self->{title};
902 1099
903 $self->child->configure ($self->border, $self->border, $w, $h); 1100 $self->child->configure ($self->border, $self->border, $w, $h);
904} 1101}
905 1102
… …
924 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
925 1122
926 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
928 1125
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
933 }; 1131 };
934 1132
935 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1137 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
941 1139
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
943 1141
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update;
946 }; 1143 };
947 } 1144 }
948} 1145}
949 1146
950sub button_up { 1147sub button_up {
… …
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1167
971 my $border = $self->border; 1168 my $border = $self->border;
972 1169
973 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1175
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
981 1178
982 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1182 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1184 }
993 1185
994 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
995 1187
… …
1011sub new { 1203sub new {
1012 my $class = shift; 1204 my $class = shift;
1013 1205
1014 $class->SUPER::new ( 1206 $class->SUPER::new (
1015 col_expand => [], 1207 col_expand => [],
1016 @_ 1208 @_,
1017 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1214}
1019 1215
1020sub add { 1216sub add {
1021 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1022 1218
1023 $child->set_parent ($self); 1219 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1025 1221
1026 $child->check_size; 1222 $self->realloc;
1027} 1223}
1028 1224
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1225# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1226sub clear {
1035 my ($self) = @_; 1227 my ($self) = @_;
1036 1228
1037 my @children = $self->children; 1229 my @children = $self->children;
1038 delete $self->{children}; 1230 delete $self->{children};
… …
1040 for (@children) { 1232 for (@children) {
1041 delete $_->{parent}; 1233 delete $_->{parent};
1042 $_->hide; 1234 $_->hide;
1043 } 1235 }
1044 1236
1045 $self->update; 1237 $self->realloc;
1046} 1238}
1047 1239
1048sub get_wh { 1240sub get_wh {
1049 my ($self) = @_; 1241 my ($self) = @_;
1050 1242
… …
1081sub size_allocate { 1273sub size_allocate {
1082 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1083 1275
1084 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1085 1277
1086 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1088 1280
1089 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1338 }
1147} 1339}
1148 1340
1149############################################################################# 1341#############################################################################
1150 1342
1151package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1152
1153# TODO: wrap into common Box base class
1154 1344
1155our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1156 1346
1157sub size_request { 1347sub size_request {
1158 my ($self) = @_; 1348 my ($self) = @_;
1159 1349
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1161 1351 ? (
1162 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1163 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164 (List::Util::max map $_->[1], @alloc), 1354 )
1165 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1166} 1359}
1167 1360
1168sub size_allocate { 1361sub size_allocate {
1169 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1170 1363
1171 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1172
1173 my $children = $self->{children}; 1365 my $children = $self->{children};
1174 1366
1175 my @h = map $_->{req_w}, @$children; 1367 my @req;
1176 1368
1177 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1178 1370 @req = ($space / (@$children || 1)) x @$children;
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else { 1371 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1373 my $req = List::Util::sum @req;
1374
1375 if ($req > $space) {
1376 # ah well, not enough space
1377 $_ *= $space / $req for @req;
1378 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184 $exp ||= 1;
1185 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1186 for (0 .. $#$children) { 1384 for 0 .. $#$children;
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 } 1385 }
1193 } 1386 }
1194 1387
1195 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1196 1389
1197 my $y = 0; 1390 my $pos = 0;
1198 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1201 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202 1394
1203 $y += $h; 1395 $pos += $alloc;
1204 } 1396 }
1205 1397
1206 1 1398 1
1207} 1399}
1208 1400
1209############################################################################# 1401#############################################################################
1210 1402
1403package CFClient::UI::HBox;
1404
1405our @ISA = CFClient::UI::Box::;
1406
1407sub new {
1408 my $class = shift;
1409
1410 $class->SUPER::new (
1411 vertical => 0,
1412 @_,
1413 )
1414}
1415
1416#############################################################################
1417
1211package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1212 1419
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1216 1421
1217sub size_request { 1422sub new {
1218 my ($self) = @_; 1423 my $class = shift;
1219 1424
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1221 1426 vertical => 1,
1222 ( 1427 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1428 )
1226} 1429}
1227 1430
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1431#############################################################################
1268 1432
1269package CFClient::UI::Label; 1433package CFClient::UI::Label;
1270 1434
1271our @ISA = CFClient::UI::Base::; 1435our @ISA = CFClient::UI::DrawBG::;
1272 1436
1273use CFClient::OpenGL; 1437use CFClient::OpenGL;
1274 1438
1275sub new { 1439sub new {
1276 my ($class, %arg) = @_; 1440 my ($class, %arg) = @_;
1277 1441
1278 my $self = $class->SUPER::new ( 1442 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1444 #bg => none
1445 #active_bg => none
1280 #font => default_font 1446 #font => default_font
1281 #text => initial text 1447 #text => initial text
1282 #markup => initial narkup 1448 #markup => initial narkup
1449 #max_w => maximum pixel width
1450 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1284 fontsize => 1, 1452 fontsize => 1,
1285 align => -1, 1453 align => -1,
1286 valign => -1, 1454 valign => -1,
1287 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1288 can_events => 0, 1457 can_events => 0,
1289 %arg 1458 %arg
1290 ); 1459 );
1291 1460
1292 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1302 } 1471 }
1303 1472
1304 $self 1473 $self
1305} 1474}
1306 1475
1307sub escape { 1476sub escape($) {
1308 local $_ = $_[1]; 1477 local $_ = $_[0];
1309 1478
1310 s/&/&amp;/g; 1479 s/&/&amp;/g;
1311 s/>/&gt;/g; 1480 s/>/&gt;/g;
1312 s/</&lt;/g; 1481 s/</&lt;/g;
1313 1482
1314 $_[1] 1483 $_
1315} 1484}
1316 1485
1317sub update { 1486sub update {
1318 my ($self) = @_; 1487 my ($self) = @_;
1319 1488
… …
1328 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1329 1498
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1332 1501
1502 $self->realloc;
1333 $self->update; 1503 $self->update;
1334 $self->check_size;
1335} 1504}
1336 1505
1337sub set_markup { 1506sub set_markup {
1338 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1339 1508
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1513
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1347 1516
1517 $self->realloc;
1348 $self->update; 1518 $self->update;
1349 $self->check_size;
1350} 1519}
1351 1520
1352sub size_request { 1521sub size_request {
1353 my ($self) = @_; 1522 my ($self) = @_;
1354 1523
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1525 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1529
1359 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1360 1531
1361 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1366 1537
1367 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1369 } 1540 }
1370 1541
1371 ( 1542 ($w, $h)
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1543}
1376 1544
1377sub size_allocate { 1545sub size_allocate {
1378 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1379 1547
1380 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1381} 1550}
1382 1551
1383sub set_fontsize { 1552sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1385 1554
1386 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1556 delete $self->{texture};
1388 1557
1389 $self->update; 1558 $self->realloc;
1390 $self->check_size;
1391} 1559}
1392 1560
1393sub _draw { 1561sub _draw {
1394 my ($self) = @_; 1562 my ($self) = @_;
1563
1564 $self->SUPER::_draw; # draw background, if applicable
1395 1565
1396 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1567 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1569 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1573
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1575
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1578 : ($self->{w} - $tex->{w}) * 0.5);
1407 1579
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1582 : ($self->{h} - $tex->{h}) * 0.5);
1411 1583
1412 $tex 1584 $tex
1413 }; 1585 };
1414 1586
1415 glEnable GL_TEXTURE_2D; 1587 glEnable GL_TEXTURE_2D;
… …
1443 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1444 can_hover => 1, 1616 can_hover => 1,
1445 can_focus => 1, 1617 can_focus => 1,
1446 valign => 0, 1618 valign => 0,
1447 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1448 @_ 1621 @_
1449 ) 1622 )
1450} 1623}
1451 1624
1452sub _set_text { 1625sub _set_text {
… …
1462 $self->{text} = $text; 1635 $self->{text} = $text;
1463 1636
1464 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1466 1639
1467 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1468} 1641}
1469 1642
1470sub set_text { 1643sub set_text {
1471 my ($self, $text) = @_; 1644 my ($self, $text) = @_;
1472 1645
1473 $self->{cursor} = length $text; 1646 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1647 $self->_set_text ($text);
1475 $self->check_size; 1648
1476 $self->update; 1649 $self->realloc;
1477} 1650}
1478 1651
1479sub get_text { 1652sub get_text {
1480 $_[0]{text} 1653 $_[0]{text}
1481} 1654}
… …
1484 my ($self) = @_; 1657 my ($self) = @_;
1485 1658
1486 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1487 1660
1488 ($w + 1, $h) # add 1 for cursor 1661 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1662}
1496 1663
1497sub key_down { 1664sub key_down {
1498 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1499 1666
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1685 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1686 $self->_emit ('escape');
1520 } elsif ($uni) { 1687 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1689 }
1523 1690
1524 $self->_set_text ($text); 1691 $self->_set_text ($text);
1525 $self->update; 1692
1693 $self->realloc;
1526} 1694}
1527 1695
1528sub focus_in { 1696sub focus_in {
1529 my ($self) = @_; 1697 my ($self) = @_;
1530 1698
… …
1610 if ($sym == 13) { 1778 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1616 $self->update; 1784 $self->update;
1617 1785
1618 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1657 1825
1658sub new { 1826sub new {
1659 my $class = shift; 1827 my $class = shift;
1660 1828
1661 $class->SUPER::new ( 1829 $class->SUPER::new (
1662 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1663 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1666 can_hover => 1, 1834 can_hover => 1,
1667 align => 0, 1835 align => 0,
1668 valign => 0, 1836 valign => 0,
1669 can_events => 1, 1837 can_events => 1,
1670 @_ 1838 @_
1671 ) 1839 )
1672} 1840}
1673 1841
1842sub activate { }
1843
1674sub button_up { 1844sub button_up {
1675 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1676 1846
1847 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate");
1680 }
1681} 1850}
1682 1851
1683sub _draw { 1852sub _draw {
1684 my ($self) = @_; 1853 my ($self) = @_;
1685 1854
… …
1714 1883
1715sub new { 1884sub new {
1716 my $class = shift; 1885 my $class = shift;
1717 1886
1718 $class->SUPER::new ( 1887 $class->SUPER::new (
1719 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1720 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1892 bg => [0, 0, 0, 0.2],
1893 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1894 state => 0,
1723 can_hover => 1, 1895 can_hover => 1,
1724 @_ 1896 @_
1725 ) 1897 )
1726} 1898}
1727 1899
1728sub size_request { 1900sub size_request {
1729 my ($self) = @_; 1901 my ($self) = @_;
1730 1902
1731 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1732} 1904}
1733 1905
1734sub button_down { 1906sub button_down {
1735 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1736 1908
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1739 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1741 } 1913 }
1742} 1914}
1743 1915
1744sub _draw { 1916sub _draw {
1745 my ($self) = @_; 1917 my ($self) = @_;
1746 1918
1747 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1748 1920
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1750 1922
1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1752 1926
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754 1928
1755 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756 1930
… …
2010 qw(s1_slider.png s1_slider_bg.png); 2184 qw(s1_slider.png s1_slider_bg.png);
2011 2185
2012sub new { 2186sub new {
2013 my $class = shift; 2187 my $class = shift;
2014 2188
2015 # range [value, low, high, page] 2189 # range [value, low, high, page, unit]
2016 2190
2017 # TODO: 0-width page 2191 # TODO: 0-width page
2018 # TODO: req_w/h are wrong with vertical 2192 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2193 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2197 bg => [0, 0, 0, 0.2],
2198 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2026 vertical => 0, 2202 vertical => 0,
2027 can_hover => 1, 2203 can_hover => 1,
2028 inner_pad => 5, 2204 inner_pad => 0.02,
2029 @_ 2205 @_
2030 ); 2206 );
2031 2207
2208 $self->set_value ($self->{range}[0]);
2209 $self->update;
2210
2032 $self 2211 $self
2033} 2212}
2034 2213
2214sub changed { }
2215
2216sub set_range {
2217 my ($self, $range) = @_;
2218
2219 ($range, $self->{range}) = ($self->{range}, $range);
2220
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}";
2223}
2224
2225sub set_value {
2226 my ($self, $value) = @_;
2227
2228 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2229
2230 $hi = $lo + 1 if $hi <= $lo;
2231
2232 $page = $hi - $lo if $page > $hi - $lo;
2233
2234 $value = $lo if $value < $lo;
2235 $value = $hi - $page if $value > $hi - $page;
2236
2237 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2238 if $unit;
2239
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241
2242 if ($value != $old_value) {
2243 $self->_emit (changed => $value);
2244 $self->update;
2245 }
2246}
2247
2035sub size_request { 2248sub size_request {
2036 my ($self) = @_; 2249 my ($self) = @_;
2037 2250
2038 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2039 my $h = $self->{req_h};
2040
2041 $self->{vertical} ? ($h, $w) : ($w, $h)
2042} 2252}
2043 2253
2044sub button_down { 2254sub button_down {
2045 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2046 2256
2047 $self->SUPER::button_down ($ev, $x, $y); 2257 $self->SUPER::button_down ($ev, $x, $y);
2258
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260
2048 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2049} 2262}
2050 2263
2051sub mouse_motion { 2264sub mouse_motion {
2052 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
2053 2266
2054 if ($GRAB == $self) { 2267 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269
2270 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2275 }
2276}
2277
2278sub update {
2279 my ($self) = @_;
2280
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2282 $self->set_value ($self->{range}[0]);
2283
2055 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2056 2286
2057 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2058 2288
2059 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2060 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2061 2291
2062 $x -= $inner_pad_px; # substract the padding 2292 $value = ($value - $lo) / $range;
2063 $x = $x * ($hi - $lo) / $inner_w + $lo; 2293 $value = $value * $self->{scale} + $self->{offset};
2064 $x = $lo if $x < $lo;
2065 $x = $hi - $page if $x > $hi - $page;
2066 $self->{range}[0] = $x;
2067 2294
2068 $self->emit (changed => $x); 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2069 $self->update; 2296 $self->{knob_w} = $knob_w;
2070 } 2297 });
2071}
2072 2298
2073# the inner_* stuff is for generating a padding for the slider handle, 2299 $self->SUPER::update;
2074# so that the handle doesn't leave the texture. This calculation isn't 100%
2075# correct propably, but it does the job for now
2076sub _calc_inner_pad_px {
2077 my ($self, $w) = @_;
2078 ($w / 100) * $self->{inner_pad} # % to pixels
2079} 2300}
2080 2301
2081sub _draw { 2302sub _draw {
2082 my ($self) = @_; 2303 my ($self) = @_;
2083 2304
2084 $self->SUPER::_draw (); 2305 $self->SUPER::_draw ();
2085 2306
2086 my ($w, $h) = @$self{qw(w h)}; 2307 glScale $self->{w}, $self->{h};
2087 2308
2088 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
2089 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
2090 2311
2312 glTranslate 1, 0, 0;
2091 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
2092 glTranslate 0, -$self->{w}, 0;
2093
2094 ($w, $h) = ($h, $w);
2095 } 2314 }
2096 2315
2097 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099 2318
2100 my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102 $hi = $value + 1 if $lo == $hi;
2103
2104 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107 $page = int $page * $inner_w / ($hi - $lo);
2108 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110 $w -= $page;
2111 $page &= ~1;
2112 glTranslate $page * 0.5, 0, 0;
2113 $page ||= 2;
2114
2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2321
2121 # draw background 2322 # draw background
2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2323 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123 2324
2124 # draw handle 2325 # draw handle
2125 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2326 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2126 2327
2127 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2128} 2329}
2330
2331#############################################################################
2332
2333package CFClient::UI::ValSlider;
2334
2335our @ISA = CFClient::UI::HBox::;
2336
2337sub new {
2338 my ($class, %arg) = @_;
2339
2340 my $range = delete $arg{range};
2341
2342 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift },
2346 from_value => sub { shift },
2347 %arg,
2348 );
2349
2350 $self->{slider}->connect (changed => sub {
2351 my ($self, $value) = @_;
2352 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2353 $self->{parent}->emit (changed => $value);
2354 });
2355
2356# $self->{entry}->connect (changed => sub {
2357# my ($self, $value) = @_;
2358# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2359# $self->{parent}->emit (changed => $value);
2360# });
2361
2362 $self->add ($self->{slider}, $self->{entry});
2363
2364 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2365
2366 $self
2367}
2368
2369sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) }
2129 2371
2130############################################################################# 2372#############################################################################
2131 2373
2132package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2133 2375
… …
2163 2405
2164 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2407 $self->reflow;
2166} 2408}
2167 2409
2168sub text_height {
2169 my ($self, $text) = @_;
2170
2171 my $layout = $self->{layout};
2172
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_markup ($text);
2176
2177 ($layout->size)[1]
2178}
2179
2180sub reflow {
2181 my ($self) = @_;
2182
2183 $self->{need_reflow}++;
2184 $self->update;
2185}
2186
2187sub size_allocate { 2410sub size_allocate {
2188 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2189 2412
2190 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2191 2414
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2418
2196 $self->reflow; 2419 $self->reflow;
2197} 2420}
2198 2421
2422sub text_size {
2423 my ($self, $text, $indent) = @_;
2424
2425 my $layout = $self->{layout};
2426
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent);
2429 $layout->set_markup ($text);
2430
2431 $layout->size
2432}
2433
2434sub reflow {
2435 my ($self) = @_;
2436
2437 $self->{need_reflow}++;
2438 $self->update;
2439}
2440
2441sub set_offset {
2442 my ($self, $offset) = @_;
2443
2444 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset);
2446}
2447
2448sub clear {
2449 my ($self) = @_;
2450
2451 $self->{par} = [];
2452 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454}
2455
2199sub add_paragraph { 2456sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2201 2458
2202 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2203 2460 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2207 2464
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2466}
2213 2467
2214sub update { 2468sub update {
2215 my ($self) = @_; 2469 my ($self) = @_;
2216 2470
… …
2219 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2220 2474
2221 delete $self->{texture}; 2475 delete $self->{texture};
2222 2476
2223 $ROOT->on_post_alloc ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2224 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2481 my $height = 0;
2226 2482
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2228 for @{$self->{par}}; 2487 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h;
2494 }
2495
2496 $height += $_->[1];
2497 }
2229 2498
2230 $self->{height} = $height; 2499 $self->{height} = $height;
2231 2500
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2502
2234 delete $self->{texture}; 2503 delete $self->{texture};
2235 } 2504 }
2236 2505
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2240 2509
2241 glEnable GL_TEXTURE_2D;
2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2243
2244 my $top = int $self->{children}[1]{range}[0]; 2510 my $top = int $self->{children}[1]{range}[0];
2245 2511
2246 my $y0 = $top; 2512 my $y0 = $top;
2247 my $y1 = $top + $self->{h}; 2513 my $y1 = $top + $H;
2248 2514
2249 my $y = 0; 2515 my $y = 0;
2250 2516
2251 my $layout = $self->{layout}; 2517 my $layout = $self->{layout};
2252 2518
2253 $layout->set_font ($self->{font}) if $self->{font}; 2519 $layout->set_font ($self->{font}) if $self->{font};
2254 2520
2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2255 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2256 my $h = $par->[0]; 2526 my $h = $par->[1];
2257 2527
2258 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] }); 2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2260 $layout->set_markup ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2261 2532
2262 my ($W, $H) = $layout->size; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2534
2535 glRasterPos $par->[3], $y - $y0;
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2264 } 2537 }
2265 2538
2266 $y += $h; 2539 $y += $h;
2267 } 2540 }
2268 2541
2269 glDisable GL_TEXTURE_2D; 2542 glDisable GL_BLEND;
2270 }; 2543 };
2271 }); 2544 });
2272} 2545}
2273 2546
2274sub _draw { 2547sub _draw {
2275 my ($self) = @_; 2548 my ($self) = @_;
2276 2549
2277 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2279 glColor 1, 1, 1, 1; 2552 glColor 1, 1, 1, 1;
2280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2281 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2282 2555
2283 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2284 2557
2285} 2558}
… …
2334 2607
2335sub new { 2608sub new {
2336 my $class = shift; 2609 my $class = shift;
2337 2610
2338 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2339 state => 0, 2612 state => 0,
2340 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2341 @_ 2614 @_
2342 ); 2615 );
2343 2616
2344 if ($self->{state}) {
2345 $self->{state} = 0;
2346 $self->toggle_flopper;
2347 }
2348
2349 $self 2617 $self
2350} 2618}
2351 2619
2352sub toggle_flopper { 2620sub toggle_flopper {
2353 my ($self) = @_; 2621 my ($self) = @_;
2354 2622
2355 # TODO: use animation 2623 $self->{other}->toggle_visibility;
2356 if ($self->{state} = !$self->{state}) {
2357 $CFClient::UI::ROOT->add ($self->{other});
2358 $self->{other}->move ($self->coord2global (0, $self->{h}));
2359 $self->emit ("open");
2360 } else {
2361 $CFClient::UI::ROOT->remove ($self->{other});
2362 $self->emit ("close");
2363 }
2364
2365 $self->emit (changed => $self->{state});
2366} 2624}
2367 2625
2368############################################################################# 2626#############################################################################
2369 2627
2370package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2383} 2641}
2384 2642
2385sub set_tooltip_from { 2643sub set_tooltip_from {
2386 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2387 2645
2646 my $tooltip = $widget->{tooltip};
2647
2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2388 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2389 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2391 fontsize => 0.8, 2658 fontsize => 0.8,
2392 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2660 ellipsise => 0,
2393 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
2394 ); 2662 );
2395} 2663}
2396 2664
2397sub size_request { 2665sub size_request {
2398 my ($self) = @_; 2666 my ($self) = @_;
… …
2404 2672
2405sub size_allocate { 2673sub size_allocate {
2406 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2407 2675
2408 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2677}
2678
2679sub visibility_change {
2680 my ($self, $visible) = @_;
2681
2682 return unless $visible;
2683
2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner}
2686 or return;
2687
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH;
2692
2693 $self->move_abs ($x, $y);
2694 });
2409} 2695}
2410 2696
2411sub _draw { 2697sub _draw {
2412 my ($self) = @_; 2698 my ($self) = @_;
2413 2699
… …
2430 glVertex $w, $h; 2716 glVertex $w, $h;
2431 glVertex $w, 0; 2717 glVertex $w, 0;
2432 glEnd; 2718 glEnd;
2433 2719
2434 glTranslate 2 - 0.375, 2 - 0.375; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2721
2435 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2436} 2723}
2437 2724
2438############################################################################# 2725#############################################################################
2439 2726
… …
2444use CFClient::OpenGL; 2731use CFClient::OpenGL;
2445 2732
2446sub new { 2733sub new {
2447 my $class = shift; 2734 my $class = shift;
2448 2735
2449 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2450 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2451 @_, 2739 @_,
2452 ) 2740 );
2741
2742 if ($self->{anim} && $self->{animspeed}) {
2743 Scalar::Util::weaken (my $widget = $self);
2744
2745 $self->{timer} = Event->timer (
2746 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747 hard => 1,
2748 interval => $self->{animspeed},
2749 cb => sub {
2750 ++$widget->{frame};
2751 $widget->update;
2752 },
2753 );
2754 }
2755
2756 $self
2453} 2757}
2454 2758
2455sub size_request { 2759sub size_request {
2456 (32, 8) 2760 (32, 8)
2457} 2761}
2458 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2459sub _draw { 2771sub _draw {
2460 my ($self) = @_; 2772 my ($self) = @_;
2461 2773
2462 return unless $::CONN;#d# manage and cache textures differently 2774 return unless $::CONN;
2775
2776 my $face;
2777
2778 if ($self->{frame}) {
2779 my $anim = $::CONN->{anim}[$self->{anim}];
2780
2781 $face = $anim->[ $self->{frame} % @$anim ]
2782 if $anim && @$anim;
2783 }
2784
2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2464 2786
2465 # TODO animation
2466 if ($tex) { 2787 if ($tex) {
2467 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2469 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2471 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2472 } 2793 }
2473} 2794}
2474 2795
2475############################################################################# 2796sub DESTROY {
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_; 2797 my ($self) = @_;
2560 2798
2561 $self->{scrolled}->clear; 2799 $self->{timer}->cancel
2562 return unless $items; 2800 if $self->{timer};
2563 2801
2564 my @items = sort { 2802 $self->SUPER::DESTROY;
2565 ($a->{type} <=> $b->{type})
2566 or ($a->{name} cmp $b->{name})
2567 } @$items;
2568
2569 $self->{real_items} = \@items;
2570
2571 for my $item (@items) {
2572 my $desc = $item->{nrof} < 2
2573 ? $item->{name}
2574 : "$item->{nrof} $item->{name_pl}";
2575
2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2577 }
2578
2579 $self->{scrolled}->add (@items);
2580
2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2582}
2583
2584sub size_request {
2585 my ($self) = @_;
2586 ($self->{req_w}, $self->{req_h});
2587} 2803}
2588 2804
2589############################################################################# 2805#############################################################################
2590 2806
2591package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2626 2842
2627# popup given the event (must be a mouse button down event currently) 2843# popup given the event (must be a mouse button down event currently)
2628sub popup { 2844sub popup {
2629 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2630 2846
2631 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2632 2848
2633 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2634 $GRAB = $self; 2850 $GRAB = $self;
2635 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2636 2852
2637 $self->show; 2853 $self->show;
2638 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2639} 2855}
2640 2856
2641sub mouse_motion { 2857sub mouse_motion {
2642 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2643 2859
… …
2651 2867
2652 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2653 undef $GRAB; 2869 undef $GRAB;
2654 $self->hide; 2870 $self->hide;
2655 2871
2656 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2657 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2658 } 2874 }
2659} 2875}
2660 2876
2661############################################################################# 2877#############################################################################
2662 2878
2663package CFClient::UI::Statusbox; 2879package CFClient::UI::Statusbox;
2664 2880
2665our @ISA = CFClient::UI::VBox::; 2881our @ISA = CFClient::UI::VBox::;
2882
2883sub new {
2884 my $class = shift;
2885
2886 $class->SUPER::new (
2887 fontsize => 0.8,
2888 @_,
2889 )
2890}
2666 2891
2667sub reorder { 2892sub reorder {
2668 my ($self) = @_; 2893 my ($self) = @_;
2669 my $NOW = time; 2894 my $NOW = time;
2670 2895
… …
2690 : $item->{text}; 2915 : $item->{text};
2691 2916
2692 for ($short) { 2917 for ($short) {
2693 s/^\s+//; 2918 s/^\s+//;
2694 s/\s+/ /g; 2919 s/\s+/ /g;
2695 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length;
2697 } 2920 }
2698 2921
2699 new CFClient::UI::Label 2922 new CFClient::UI::Label
2700 markup => $short, 2923 markup => $short,
2701 tooltip => $item->{tooltip}, 2924 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP, 2925 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67, 2926 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize}, 2927 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44,
2705 fg => $item->{fg}, 2929 fg => $item->{fg},
2706 can_events => 1, 2930 can_events => 1,
2707 can_hover => 1 2931 can_hover => 1
2708 }; 2932 };
2709 } 2933 }
… …
2715sub add { 2939sub add {
2716 my ($self, $text, %arg) = @_; 2940 my ($self, $text, %arg) = @_;
2717 2941
2718 $text =~ s/^\s+//; 2942 $text =~ s/^\s+//;
2719 $text =~ s/\s+$//; 2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2720 2946
2721 my $timeout = time + ((delete $arg{timeout}) || 60); 2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2722 2948
2723 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2724 2950
… …
2736 $self->{item}{$group} = { 2962 $self->{item}{$group} = {
2737 id => ++$self->{id}, 2963 id => ++$self->{id},
2738 text => $text, 2964 text => $text,
2739 timeout => $timeout, 2965 timeout => $timeout,
2740 tooltip => $text, 2966 tooltip => $text,
2741 fontsize => 0.8,
2742 fg => [0.8, 0.8, 0.8, 0.8], 2967 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0, 2968 pri => 0,
2744 count => 1, 2969 count => 1,
2745 %arg, 2970 %arg,
2746 }; 2971 };
2747 } 2972 }
2748 2973
2749 $self->reorder; 2974 $self->reorder;
2750} 2975}
2751 2976
2977sub reconfigure {
2978 my ($self) = @_;
2979
2980 delete $_->{label}
2981 for values %{ $self->{item} || {} };
2982
2983 $self->reorder;
2984 $self->SUPER::reconfigure;
2985}
2986
2752############################################################################# 2987#############################################################################
2753 2988
2754package CFClient::UI::Root; 2989package CFClient::UI::Inventory;
2755 2990
2756our @ISA = CFClient::UI::Container::; 2991our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758use CFClient::OpenGL;
2759 2992
2760sub new { 2993sub new {
2761 my $class = shift; 2994 my $class = shift;
2762 2995
2763 $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2764 @_, 2998 @_,
2765 ) 2999 );
2766}
2767 3000
2768sub configure { 3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
2769 my ($self, $x, $y, $w, $h) = @_; 3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2770 3150
2771 $self->{w} = $w; 3151 $self->clear_command_list;
2772 $self->{h} = $h; 3152 $self->{recording} = 0;
2773} 3153 $self->{rec_btn}->set_text ("start recording");
2774 3154
2775sub check_size { 3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
2776 my ($self) = @_; 3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
2777 3173
2778 $self->size_allocate ($self->{w}, $self->{h}) 3174sub update_binding_widgets {
2779 if $self->{w}; 3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
3280package CFClient::UI::Root;
3281
3282our @ISA = CFClient::UI::Container::;
3283
3284use CFClient::OpenGL;
3285
3286sub new {
3287 my $class = shift;
3288
3289 my $self = $class->SUPER::new (
3290 visible => 1,
3291 @_,
3292 );
3293
3294 Scalar::Util::weaken ($self->{root} = $self);
3295
3296 $self
2780} 3297}
2781 3298
2782sub size_request { 3299sub size_request {
2783 my ($self) = @_; 3300 my ($self) = @_;
2784 3301
2785 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3303}
3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
2786} 3317}
2787 3318
2788sub size_allocate { 3319sub size_allocate {
2789 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2790 3321
2791 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2792 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2793
2794 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2796
2797 for my $child ($self->children) { 3322 for my $child ($self->children) {
2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2799 3324
2800 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3325 $X = $child->{force_x} if exists $child->{force_x};
2801 if exists $child->{req_x}; 3326 $Y = $child->{force_y} if exists $child->{force_y};
2802 3327
2803 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3328 $X = _to_pixel $X, $W, $self->{w};
2804 if exists $child->{req_y}; 3329 $Y = _to_pixel $Y, $H, $self->{h};
2805
2806 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2807 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2808 3330
2809 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2810 } 3332 }
2811} 3333}
2812 3334
… …
2823} 3345}
2824 3346
2825sub update { 3347sub update {
2826 my ($self) = @_; 3348 my ($self) = @_;
2827 3349
2828 $self->check_size;
2829 $::WANT_REFRESH++; 3350 $::WANT_REFRESH++;
2830} 3351}
2831 3352
2832sub add { 3353sub add {
2833 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
2834 3355
2835 for my $child (@children) {
2836 $child->{toplevel} = 1; 3356 $_->{is_toplevel} = 1
2837 3357 for @children;
2838 # integerise window positions
2839 $child->{x} = int $child->{x};
2840 $child->{y} = int $child->{y};
2841 }
2842 3358
2843 $self->SUPER::add (@children); 3359 $self->SUPER::add (@children);
3360}
3361
3362sub remove {
3363 my ($self, @children) = @_;
3364
3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3369
3370 while (@children) {
3371 my $w = pop @children;
3372 push @children, $w->children;
3373 $w->set_invisible;
3374 }
2844} 3375}
2845 3376
2846sub on_refresh { 3377sub on_refresh {
2847 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2848 3379
… …
2861 while ($self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2862 $_->() 3393 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
2864 } 3395 }
2865 3396
2866 if ($self->{check_size}) { 3397 if ($self->{realloc}) {
2867 my @queue = ([], []); 3398 my %queue;
3399 my @queue;
3400 my $widget;
2868 3401
2869 for (;;) { 3402 outer:
2870 if ($self->{check_size}) { 3403 while () {
2871 # heuristic: check containers last 3404 if (my $realloc = delete $self->{realloc}) {
2872 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3405 for $widget (values %$realloc) {
2873 for values %{delete $self->{check_size}} 3406 $widget->{visible} or next; # do not resize invisible widgets
3407
3408 $queue{$widget+0}++ and next; # duplicates are common
3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
2874 } 3412 }
2875 3413
2876 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3414 while () {
3415 @queue or last outer;
2877 3416
2878 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3417 $widget = pop @{ $queue[-1] || [] }
2879 ? @$widget{qw(user_w user_h)} 3418 and last;
2880 : $widget->size_request;
2881
2882 if (delete $widget->{force_alloc}
2883 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2884 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2885 3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
2886 $widget->{req_w} = $w; 3435 $widget->{req_w} = $w;
2887 $widget->{req_h} = $h; 3436 $widget->{req_h} = $h;
2888 3437
2889 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3438 $self->{size_alloc}{$widget+0} = $widget;
2890 3439
2891 $widget->{parent}->check_size
2892 if $widget->{parent}; 3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
2893 } 3447 }
3448
3449 delete $self->{realloc}{$widget+0};
2894 } 3450 }
2895 } 3451 }
2896 3452
2897 while ($self->{size_alloc}) { 3453 while (my $size_alloc = delete $self->{size_alloc}) {
2898 for (values %{delete $self->{size_alloc}}) { 3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
2899 my ($widget, $w, $h) = @$_; 3455 values %$size_alloc;
3456
3457 while () {
3458 my $widget = pop @queue || last;
3459
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2900 3461
2901 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
2902 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
2903 3464
3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
2904 $widget->{w} = $w; 3472 $widget->{w} = $w;
2905 $widget->{h} = $h; 3473 $widget->{h} = $h;
2906 $widget->size_allocate ($w, $h); 3474
2907 $widget->emit (size_allocate => $w, $h); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
2908 } 3477 }
2909 } 3478 }
2910 3479
2911 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
2912 $_->() 3481 $_->()
2913 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
2914 } 3483 }
2915 3484
3485
2916 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2917 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2918 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
2919 3489
2920 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
2921 glLoadIdentity; 3491 glLoadIdentity;
2922 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2923 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
2924 glLoadIdentity; 3494 glLoadIdentity;
2925 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
2926 $self->_draw; 3503 $self->_draw;
2927} 3504}
2928 3505
2929############################################################################# 3506#############################################################################
2930 3507
2931package CFClient::UI; 3508package CFClient::UI;
2932 3509
2933$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
2934$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2935 3512
29361 35131
2937 3514

Diff Legend

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