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.203 by root, Sun May 14 21:13:11 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 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
… …
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
… …
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 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
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 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
148 $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.]+$/;
149 $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};
150 $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};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $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.]+$/;
153 $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};
154 $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};
155 $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
156 } 189 }
157
158 $widget->reconfigure;
159 } 190 }
191
192 reconfigure_widgets;
160} 193}
161 194
162############################################################################# 195#############################################################################
163 196
164package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
169 202
170sub new { 203sub new {
171 my $class = shift; 204 my $class = shift;
172 205
173 my $self = bless { 206 my $self = bless {
174 x => 0, 207 x => "center",
175 y => 0, 208 y => "center",
176 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
177 can_events => 1, 212 can_events => 1,
178 @_ 213 @_
179 }, $class; 214 }, $class;
180 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
181 for (keys %$self) { 218 for (keys %$self) {
182 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
184 } 221 }
185 } 222 }
186 223
187 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 }
188 235
189 $self 236 $self
190} 237}
191 238
192sub destroy { 239sub destroy {
… …
202 return if $self->{parent}; 249 return if $self->{parent};
203 250
204 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
205} 252}
206 253
207sub hide { 254sub set_visible {
208 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};
209 278
210 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
212 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
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $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;
264 } 368 }
265} 369}
266 370
267sub size_allocate { 371sub size_allocate {
268 # nothing to be done 372 # nothing to be done
269} 373}
270 374
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 375sub children {
279} 376}
280 377
281sub set_max_size { 378sub set_max_size {
282 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
283 380
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 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 }
286} 399}
287 400
288# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
289sub coord2local { 402sub coord2local {
290 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 418 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
307 420
308 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
309 422
310 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
311 424
312 $focus->update if $focus; 425 $focus->update if $focus;
313 $FOCUS->update; 426 $FOCUS->update;
314} 427}
315 428
… …
318 431
319 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
320 433
321 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
322 435
323 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
324 437
325 $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;
326} 442}
327 443
328sub mouse_motion { } 444sub mouse_motion { }
329sub button_up { } 445sub button_up { }
330sub key_down { } 446sub key_down { }
331sub key_up { } 447sub key_up { }
332 448
333sub button_down { 449sub button_down {
334 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
335 451
336 $self->focus_in; 452 $self->focus_in;
337} 453}
338 454
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
343sub 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
344 528
345sub draw { 529sub draw {
346 my ($self) = @_; 530 my ($self) = @_;
347 531
348 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);
349 543
350 glPushMatrix; 544 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw; 546 $self->_draw;
353 glPopMatrix; 547 glPopMatrix;
… …
365 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
366 glEnd; 560 glEnd;
367 glDisable GL_BLEND; 561 glDisable GL_BLEND;
368 } 562 }
369 563
370 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
371 glPushMatrix; 565 glPushMatrix;
372 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 569 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
379 glEnd; 573 glEnd;
380 glPopMatrix; 574 glPopMatrix;
381 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;
382 } 576 }
383} 577}
384 578
385sub _draw { 579sub _draw {
386 my ($self) = @_; 580 my ($self) = @_;
387 581
388 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 583}
438 584
439sub DESTROY { 585sub DESTROY {
440 my ($self) = @_; 586 my ($self) = @_;
441 587
… …
456 my $class = shift; 602 my $class = shift;
457 603
458 # range [value, low, high, page] 604 # range [value, low, high, page]
459 605
460 $class->SUPER::new ( 606 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
463 @_ 609 @_
464 ) 610 )
465} 611}
466 612
467sub _draw { 613sub _draw {
468 my ($self) = @_; 614 my ($self) = @_;
469 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
471 622
472 glEnable GL_BLEND; 623 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
475 626
476 glBegin GL_QUADS; 627 glBegin GL_QUADS;
477 glVertex 0 , 0; 628 glVertex 0 , 0;
478 glVertex 0 , $h; 629 glVertex 0 , $h;
479 glVertex $w, $h; 630 glVertex $w, $h;
480 glVertex $w, 0; 631 glVertex $w, 0;
481 glEnd; 632 glEnd;
482 633
483 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
484} 636}
485 637
486############################################################################# 638#############################################################################
487 639
488package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
495} 647}
496 648
497sub size_request { 649sub size_request {
498 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
499} 653}
500 654
501sub draw { } 655sub draw { }
502 656
503############################################################################# 657#############################################################################
… …
532 $self->{children} = [ 686 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
535 ]; 689 ];
536 690
537 $self->check_size (1); 691 $self->realloc;
538 $self->update;
539} 692}
540 693
541sub children { 694sub children {
542 @{ $_[0]{children} } 695 @{ $_[0]{children} }
543} 696}
… …
548 delete $child->{parent}; 701 delete $child->{parent};
549 $child->hide; 702 $child->hide;
550 703
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 705
553 $self->check_size; 706 $self->realloc;
554 $self->update;
555} 707}
556 708
557sub clear { 709sub clear {
558 my ($self) = @_; 710 my ($self) = @_;
559 711
… …
563 for (@$children) { 715 for (@$children) {
564 delete $_->{parent}; 716 delete $_->{parent};
565 $_->hide; 717 $_->hide;
566 } 718 }
567 719
568 $self->check_size; 720 $self->realloc;
569 $self->update;
570} 721}
571 722
572sub find_widget { 723sub find_widget {
573 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
574 725
… …
661 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 813 $self->update;
663} 814}
664 815
665sub _render { 816sub _render {
817 my ($self) = @_;
818
666 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
667} 820}
668 821
669sub render_child { 822sub render_child {
670 my ($self) = @_; 823 my ($self) = @_;
671 824
672 $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 {
673 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
675 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
676 $self->_render; 836 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 837 };
685} 838}
686 839
687sub _draw { 840sub _draw {
688 my ($self) = @_; 841 my ($self) = @_;
689 842
690 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
691 844
692 my $tex = $self->{texture} 845 my $tex = $self->{texture}
693 or return; 846 or return;
694 847
695 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
698 851
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 853
701 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
702} 855}
… …
705 858
706package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
707 860
708our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
709 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
710sub size_request { 873sub size_request {
711 my ($self) = @_; 874 my ($self) = @_;
712 875
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 877
716 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
717} 882}
718 883
719sub size_allocate { 884sub size_allocate {
720 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
721 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);
722 $self->update; 893 $self->update;
723} 894}
724 895
725sub set_offset { 896sub set_offset {
726 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
760} 931}
761 932
762sub _render { 933sub _render {
763 my ($self) = @_; 934 my ($self) = @_;
764 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
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 940
767 $self->SUPER::_render; 941 $self->SUPER::_render;
768} 942}
769 943
… …
777 my $class = shift; 951 my $class = shift;
778 952
779 my $self; 953 my $self;
780 954
781 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
782 vertical => 1, 956 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 958 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
786 }, 960 },
787 ; 961 ;
788 962
789 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 965 slider => $slider,
792 @_, 966 @_,
793 ); 967 );
794 968
795 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
798 972
799 $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]);
800} 993}
801 994
802#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 996# update viewport offset on scroll
804 997
… …
848 1041
849our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
850 1043
851use CFClient::OpenGL; 1044use CFClient::OpenGL;
852 1045
853my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 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);
856 1053
857sub new { 1054sub new {
858 my $class = shift; 1055 my $class = shift;
859 1056
860 # TODO: user_x, user_y, overwrite moveto?
861
862 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1060 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
868 @_ 1064 @_
869 ); 1065 );
870 1066
871 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
872 align => 0, 1068 align => 0,
… …
896 my ($self, $w, $h) = @_; 1092 my ($self, $w, $h) = @_;
897 1093
898 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
900 1096
901 $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)
902 if $self->{title}; 1098 if $self->{title};
903 1099
904 $self->child->configure ($self->border, $self->border, $w, $h); 1100 $self->child->configure ($self->border, $self->border, $w, $h);
905} 1101}
906 1102
… …
925 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
926 1122
927 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
929 1125
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size;
934 }; 1131 };
935 1132
936 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1137 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
942 1139
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
944 1141
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update;
947 }; 1143 };
948 } 1144 }
949} 1145}
950 1146
951sub button_up { 1147sub button_up {
… …
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1167
972 my $border = $self->border; 1168 my $border = $self->border;
973 1169
974 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1175
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
982 1178
983 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1182 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1184 }
994 1185
995 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
996 1187
… …
1012sub new { 1203sub new {
1013 my $class = shift; 1204 my $class = shift;
1014 1205
1015 $class->SUPER::new ( 1206 $class->SUPER::new (
1016 col_expand => [], 1207 col_expand => [],
1017 @_ 1208 @_,
1018 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1214}
1020 1215
1021sub add { 1216sub add {
1022 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1023 1218
1024 $child->set_parent ($self); 1219 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1026 1221
1027 $child->check_size; 1222 $self->realloc;
1028} 1223}
1029 1224
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# 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?
1035sub clear { 1226sub clear {
1036 my ($self) = @_; 1227 my ($self) = @_;
1037 1228
1038 my @children = $self->children; 1229 my @children = $self->children;
1039 delete $self->{children}; 1230 delete $self->{children};
… …
1041 for (@children) { 1232 for (@children) {
1042 delete $_->{parent}; 1233 delete $_->{parent};
1043 $_->hide; 1234 $_->hide;
1044 } 1235 }
1045 1236
1046 $self->update; 1237 $self->realloc;
1047} 1238}
1048 1239
1049sub get_wh { 1240sub get_wh {
1050 my ($self) = @_; 1241 my ($self) = @_;
1051 1242
… …
1082sub size_allocate { 1273sub size_allocate {
1083 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1084 1275
1085 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1086 1277
1087 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1089 1280
1090 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1338 }
1148} 1339}
1149 1340
1150############################################################################# 1341#############################################################################
1151 1342
1152package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1344
1156our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1157 1346
1158sub size_request { 1347sub size_request {
1159 my ($self) = @_; 1348 my ($self) = @_;
1160 1349
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1162 1351 ? (
1163 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1354 )
1166 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1167} 1359}
1168 1360
1169sub size_allocate { 1361sub size_allocate {
1170 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1171 1363
1172 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1365 my $children = $self->{children};
1175 1366
1176 my @h = map $_->{req_w}, @$children; 1367 my @req;
1177 1368
1178 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1179 1370 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } 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 {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1384 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1385 }
1194 } 1386 }
1195 1387
1196 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1197 1389
1198 my $y = 0; 1390 my $pos = 0;
1199 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1394
1204 $y += $h; 1395 $pos += $alloc;
1205 } 1396 }
1206 1397
1207 1 1398 1
1208} 1399}
1209 1400
1210############################################################################# 1401#############################################################################
1211 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
1212package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1213 1419
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1217 1421
1218sub size_request { 1422sub new {
1219 my ($self) = @_; 1423 my $class = shift;
1220 1424
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1222 1426 vertical => 1,
1223 ( 1427 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1428 )
1227} 1429}
1228 1430
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1431#############################################################################
1269 1432
1270package CFClient::UI::Label; 1433package CFClient::UI::Label;
1271 1434
1272our @ISA = CFClient::UI::Base::; 1435our @ISA = CFClient::UI::DrawBG::;
1273 1436
1274use CFClient::OpenGL; 1437use CFClient::OpenGL;
1275 1438
1276sub new { 1439sub new {
1277 my ($class, %arg) = @_; 1440 my ($class, %arg) = @_;
1278 1441
1279 my $self = $class->SUPER::new ( 1442 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1444 #bg => none
1445 #active_bg => none
1281 #font => default_font 1446 #font => default_font
1282 #text => initial text 1447 #text => initial text
1283 #markup => initial narkup 1448 #markup => initial narkup
1449 #max_w => maximum pixel width
1450 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1285 fontsize => 1, 1452 fontsize => 1,
1286 align => -1, 1453 align => -1,
1287 valign => -1, 1454 valign => -1,
1288 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1289 can_events => 0, 1457 can_events => 0,
1290 %arg 1458 %arg
1291 ); 1459 );
1292 1460
1293 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1303 } 1471 }
1304 1472
1305 $self 1473 $self
1306} 1474}
1307 1475
1308sub escape { 1476sub escape($) {
1309 local $_ = $_[1]; 1477 local $_ = $_[0];
1310 1478
1311 s/&/&amp;/g; 1479 s/&/&amp;/g;
1312 s/>/&gt;/g; 1480 s/>/&gt;/g;
1313 s/</&lt;/g; 1481 s/</&lt;/g;
1314 1482
1315 $_[1] 1483 $_
1316} 1484}
1317 1485
1318sub update { 1486sub update {
1319 my ($self) = @_; 1487 my ($self) = @_;
1320 1488
… …
1329 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1330 1498
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1333 1501
1502 $self->realloc;
1334 $self->update; 1503 $self->update;
1335 $self->check_size;
1336} 1504}
1337 1505
1338sub set_markup { 1506sub set_markup {
1339 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1340 1508
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1513
1346 $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;
1347 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1348 1516
1517 $self->realloc;
1349 $self->update; 1518 $self->update;
1350 $self->check_size;
1351} 1519}
1352 1520
1353sub size_request { 1521sub size_request {
1354 my ($self) = @_; 1522 my ($self) = @_;
1355 1523
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1529
1360 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1361 1531
1362 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1367 1537
1368 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1370 } 1540 }
1371 1541
1372 ( 1542 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1543}
1377 1544
1378sub size_allocate { 1545sub size_allocate {
1379 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1380 1547
1381 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1550}
1383 1551
1384sub set_fontsize { 1552sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1386 1554
1387 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1556 delete $self->{texture};
1389 1557
1390 $self->update; 1558 $self->realloc;
1391 $self->check_size;
1392} 1559}
1393 1560
1394sub _draw { 1561sub _draw {
1395 my ($self) = @_; 1562 my ($self) = @_;
1563
1564 $self->SUPER::_draw; # draw background, if applicable
1396 1565
1397 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1567 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1573
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1575
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1578 : ($self->{w} - $tex->{w}) * 0.5);
1408 1579
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1582 : ($self->{h} - $tex->{h}) * 0.5);
1412 1583
1413 $tex 1584 $tex
1414 }; 1585 };
1415 1586
1416 glEnable GL_TEXTURE_2D; 1587 glEnable GL_TEXTURE_2D;
… …
1444 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1445 can_hover => 1, 1616 can_hover => 1,
1446 can_focus => 1, 1617 can_focus => 1,
1447 valign => 0, 1618 valign => 0,
1448 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1449 @_ 1621 @_
1450 ) 1622 )
1451} 1623}
1452 1624
1453sub _set_text { 1625sub _set_text {
… …
1463 $self->{text} = $text; 1635 $self->{text} = $text;
1464 1636
1465 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1467 1639
1468 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1469} 1641}
1470 1642
1471sub set_text { 1643sub set_text {
1472 my ($self, $text) = @_; 1644 my ($self, $text) = @_;
1473 1645
1474 $self->{cursor} = length $text; 1646 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1647 $self->_set_text ($text);
1476 $self->check_size; 1648
1477 $self->update; 1649 $self->realloc;
1478} 1650}
1479 1651
1480sub get_text { 1652sub get_text {
1481 $_[0]{text} 1653 $_[0]{text}
1482} 1654}
… …
1485 my ($self) = @_; 1657 my ($self) = @_;
1486 1658
1487 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1488 1660
1489 ($w + 1, $h) # add 1 for cursor 1661 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1662}
1497 1663
1498sub key_down { 1664sub key_down {
1499 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1500 1666
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1685 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1686 $self->_emit ('escape');
1521 } elsif ($uni) { 1687 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1689 }
1524 1690
1525 $self->_set_text ($text); 1691 $self->_set_text ($text);
1526 $self->update; 1692
1693 $self->realloc;
1527} 1694}
1528 1695
1529sub focus_in { 1696sub focus_in {
1530 my ($self) = @_; 1697 my ($self) = @_;
1531 1698
… …
1611 if ($sym == 13) { 1778 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1617 $self->update; 1784 $self->update;
1618 1785
1619 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1658 1825
1659sub new { 1826sub new {
1660 my $class = shift; 1827 my $class = shift;
1661 1828
1662 $class->SUPER::new ( 1829 $class->SUPER::new (
1663 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1664 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1667 can_hover => 1, 1834 can_hover => 1,
1668 align => 0, 1835 align => 0,
1669 valign => 0, 1836 valign => 0,
1670 can_events => 1, 1837 can_events => 1,
1671 @_ 1838 @_
1672 ) 1839 )
1673} 1840}
1674 1841
1842sub activate { }
1843
1675sub button_up { 1844sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1677 1846
1847 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1850}
1683 1851
1684sub _draw { 1852sub _draw {
1685 my ($self) = @_; 1853 my ($self) = @_;
1686 1854
… …
1715 1883
1716sub new { 1884sub new {
1717 my $class = shift; 1885 my $class = shift;
1718 1886
1719 $class->SUPER::new ( 1887 $class->SUPER::new (
1720 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1721 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1722 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],
1723 state => 0, 1894 state => 0,
1724 can_hover => 1, 1895 can_hover => 1,
1725 @_ 1896 @_
1726 ) 1897 )
1727} 1898}
1728 1899
1729sub size_request { 1900sub size_request {
1730 my ($self) = @_; 1901 my ($self) = @_;
1731 1902
1732 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1733} 1904}
1734 1905
1735sub button_down { 1906sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1737 1908
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1742 } 1913 }
1743} 1914}
1744 1915
1745sub _draw { 1916sub _draw {
1746 my ($self) = @_; 1917 my ($self) = @_;
1747 1918
1748 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1749 1920
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1922
1752 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;
1753 1926
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1928
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1930
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2184 qw(s1_slider.png s1_slider_bg.png);
2012 2185
2013sub new { 2186sub new {
2014 my $class = shift; 2187 my $class = shift;
2015 2188
2016 # range [value, low, high, page] 2189 # range [value, low, high, page, unit]
2017 2190
2018 # TODO: 0-width page 2191 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2192 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2193 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2027 vertical => 0, 2202 vertical => 0,
2028 can_hover => 1, 2203 can_hover => 1,
2029 inner_pad => 5, 2204 inner_pad => 0.02,
2030 @_ 2205 @_
2031 ); 2206 );
2032 2207
2208 $self->set_value ($self->{range}[0]);
2209 $self->update;
2210
2033 $self 2211 $self
2034} 2212}
2035 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
2036sub size_request { 2248sub size_request {
2037 my ($self) = @_; 2249 my ($self) = @_;
2038 2250
2039 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2252}
2044 2253
2045sub button_down { 2254sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2047 2256
2048 $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
2049 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2050} 2262}
2051 2263
2052sub mouse_motion { 2264sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
2054 2266
2055 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
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2057 2286
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2288
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2291
2063 $x -= $inner_pad_px; # substract the padding 2292 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2293 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2294
2069 $self->emit (changed => $x); 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2296 $self->{knob_w} = $knob_w;
2071 } 2297 });
2072}
2073 2298
2074# the inner_* stuff is for generating a padding for the slider handle, 2299 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2300}
2081 2301
2082sub _draw { 2302sub _draw {
2083 my ($self) = @_; 2303 my ($self) = @_;
2084 2304
2085 $self->SUPER::_draw (); 2305 $self->SUPER::_draw ();
2086 2306
2087 my ($w, $h) = @$self{qw(w h)}; 2307 glScale $self->{w}, $self->{h};
2088 2308
2089 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
2091 2311
2312 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2314 }
2097 2315
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2318
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2321
2122 # draw background 2322 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2323 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2324
2125 # draw handle 2325 # draw handle
2126 $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);
2127 2327
2128 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2129} 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 (@_) }
2130 2371
2131############################################################################# 2372#############################################################################
2132 2373
2133package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2134 2375
… …
2164 2405
2165 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2407 $self->reflow;
2167} 2408}
2168 2409
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2410sub size_allocate {
2189 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2190 2412
2191 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2192 2414
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2418
2197 $self->reflow; 2419 $self->reflow;
2198} 2420}
2199 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
2200sub add_paragraph { 2456sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2202 2458
2203 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2204 2460 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2208 2464
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $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]);
2212 $self->{children}[1]->update;
2213} 2466}
2214 2467
2215sub update { 2468sub update {
2216 my ($self) = @_; 2469 my ($self) = @_;
2217 2470
… …
2220 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2221 2474
2222 delete $self->{texture}; 2475 delete $self->{texture};
2223 2476
2224 $ROOT->on_post_alloc ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2225 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2481 my $height = 0;
2227 2482
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2229 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 }
2230 2498
2231 $self->{height} = $height; 2499 $self->{height} = $height;
2232 2500
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2502
2235 delete $self->{texture}; 2503 delete $self->{texture};
2236 } 2504 }
2237 2505
2238 $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 {
2239 glClearColor 0, 0, 0, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2241 2509
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2510 my $top = int $self->{children}[1]{range}[0];
2246 2511
2247 my $y0 = $top; 2512 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2513 my $y1 = $top + $H;
2249 2514
2250 my $y = 0; 2515 my $y = 0;
2251 2516
2252 my $layout = $self->{layout}; 2517 my $layout = $self->{layout};
2253 2518
2254 $layout->set_font ($self->{font}) if $self->{font}; 2519 $layout->set_font ($self->{font}) if $self->{font};
2255 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
2256 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2526 my $h = $par->[1];
2258 2527
2259 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2262 2532
2263 my ($W, $H) = $layout->size; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 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;
2265 } 2537 }
2266 2538
2267 $y += $h; 2539 $y += $h;
2268 } 2540 }
2269 2541
2270 glDisable GL_TEXTURE_2D; 2542 glDisable GL_BLEND;
2271 }; 2543 };
2272 }); 2544 });
2273} 2545}
2274 2546
2275sub _draw { 2547sub _draw {
2276 my ($self) = @_; 2548 my ($self) = @_;
2277 2549
2278 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2552 glColor 1, 1, 1, 1;
2281 $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});
2282 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2283 2555
2284 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2285 2557
2286} 2558}
… …
2335 2607
2336sub new { 2608sub new {
2337 my $class = shift; 2609 my $class = shift;
2338 2610
2339 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2340 state => 0, 2612 state => 0,
2341 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2342 @_ 2614 @_
2343 ); 2615 );
2344 2616
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2617 $self
2351} 2618}
2352 2619
2353sub toggle_flopper { 2620sub toggle_flopper {
2354 my ($self) = @_; 2621 my ($self) = @_;
2355 2622
2356 # TODO: use animation 2623 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2624}
2368 2625
2369############################################################################# 2626#############################################################################
2370 2627
2371package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2384} 2641}
2385 2642
2386sub set_tooltip_from { 2643sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2388 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
2389 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2658 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2660 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2662 );
2396} 2663}
2397 2664
2398sub size_request { 2665sub size_request {
2399 my ($self) = @_; 2666 my ($self) = @_;
… …
2405 2672
2406sub size_allocate { 2673sub size_allocate {
2407 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2408 2675
2409 $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 });
2410} 2695}
2411 2696
2412sub _draw { 2697sub _draw {
2413 my ($self) = @_; 2698 my ($self) = @_;
2414 2699
… …
2431 glVertex $w, $h; 2716 glVertex $w, $h;
2432 glVertex $w, 0; 2717 glVertex $w, 0;
2433 glEnd; 2718 glEnd;
2434 2719
2435 glTranslate 2 - 0.375, 2 - 0.375; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2721
2436 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2437} 2723}
2438 2724
2439############################################################################# 2725#############################################################################
2440 2726
… …
2445use CFClient::OpenGL; 2731use CFClient::OpenGL;
2446 2732
2447sub new { 2733sub new {
2448 my $class = shift; 2734 my $class = shift;
2449 2735
2450 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2451 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2452 @_, 2739 @_,
2453 ) 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
2454} 2757}
2455 2758
2456sub size_request { 2759sub size_request {
2457 (32, 8) 2760 (32, 8)
2458} 2761}
2459 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2460sub _draw { 2771sub _draw {
2461 my ($self) = @_; 2772 my ($self) = @_;
2462 2773
2463 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2786
2466 # TODO animation
2467 if ($tex) { 2787 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2473 } 2793 }
2474} 2794}
2475 2795
2476############################################################################# 2796sub DESTROY {
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_; 2797 my ($self) = @_;
2561 2798
2562 $self->{scrolled}->clear; 2799 $self->{timer}->cancel
2563 return unless $items; 2800 if $self->{timer};
2564 2801
2565 my @items = sort { 2802 $self->SUPER::DESTROY;
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588} 2803}
2589 2804
2590############################################################################# 2805#############################################################################
2591 2806
2592package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2627 2842
2628# 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)
2629sub popup { 2844sub popup {
2630 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2631 2846
2632 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2633 2848
2634 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2850 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2637 2852
2638 $self->show; 2853 $self->show;
2639 $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);
2640} 2855}
2641 2856
2642sub mouse_motion { 2857sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2644 2859
… …
2652 2867
2653 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2869 undef $GRAB;
2655 $self->hide; 2870 $self->hide;
2656 2871
2657 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2659 } 2874 }
2660} 2875}
2661 2876
2662############################################################################# 2877#############################################################################
2663 2878
2664package CFClient::UI::Statusbox; 2879package CFClient::UI::Statusbox;
2665 2880
2666our @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}
2667 2891
2668sub reorder { 2892sub reorder {
2669 my ($self) = @_; 2893 my ($self) = @_;
2670 my $NOW = time; 2894 my $NOW = time;
2671 2895
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2914 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2915 : $item->{text};
2692 2916
2693 for ($short) { 2917 for ($short) {
2694 s/^\s+//; 2918 s/^\s+//;
2695 s/\012.*/…/s; 2919 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2920 }
2699 2921
2700 new CFClient::UI::Label 2922 new CFClient::UI::Label
2701 markup => $short, 2923 markup => $short,
2702 tooltip => $item->{tooltip}, 2924 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2925 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2926 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2927 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2929 fg => $item->{fg},
2707 can_events => 1, 2930 can_events => 1,
2708 can_hover => 1 2931 can_hover => 1
2709 }; 2932 };
2710 } 2933 }
2711 2934
… …
2716sub add { 2939sub add {
2717 my ($self, $text, %arg) = @_; 2940 my ($self, $text, %arg) = @_;
2718 2941
2719 $text =~ s/^\s+//; 2942 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2721 2946
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 2948
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 2950
… …
2737 $self->{item}{$group} = { 2962 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2963 id => ++$self->{id},
2739 text => $text, 2964 text => $text,
2740 timeout => $timeout, 2965 timeout => $timeout,
2741 tooltip => $text, 2966 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2967 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2968 pri => 0,
2745 count => 1, 2969 count => 1,
2746 %arg, 2970 %arg,
2747 }; 2971 };
2748 } 2972 }
2749 2973
2750 $self->reorder; 2974 $self->reorder;
2751} 2975}
2752 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
2753############################################################################# 2987#############################################################################
2754 2988
2755package CFClient::UI::Root; 2989package CFClient::UI::Inventory;
2756 2990
2757our @ISA = CFClient::UI::Container::; 2991our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 2992
2761sub new { 2993sub new {
2762 my $class = shift; 2994 my $class = shift;
2763 2995
2764 $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_, 2998 @_,
2766 ) 2999 );
2767}
2768 3000
2769sub 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 {
2770 my ($self, $x, $y, $w, $h) = @_; 3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2771 3150
2772 $self->{w} = $w; 3151 $self->clear_command_list;
2773 $self->{h} = $h; 3152 $self->{recording} = 0;
2774} 3153 $self->{rec_btn}->set_text ("start recording");
2775 3154
2776sub 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 {
2777 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}
2778 3173
2779 $self->size_allocate ($self->{w}, $self->{h}) 3174sub update_binding_widgets {
2780 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
2781} 3297}
2782 3298
2783sub size_request { 3299sub size_request {
2784 my ($self) = @_; 3300 my ($self) = @_;
2785 3301
2786 ($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
2787} 3317}
2788 3318
2789sub size_allocate { 3319sub size_allocate {
2790 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2791 3321
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3322 for my $child ($self->children) {
2799 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)};
2800 3324
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3325 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3326 $Y = $child->{force_y} if exists $child->{force_y};
3327
3328 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h};
3330
2803 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2804 } 3332 }
2805} 3333}
2806 3334
2807sub coord2local { 3335sub coord2local {
… …
2817} 3345}
2818 3346
2819sub update { 3347sub update {
2820 my ($self) = @_; 3348 my ($self) = @_;
2821 3349
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3350 $::WANT_REFRESH++;
2824} 3351}
2825 3352
2826sub add { 3353sub add {
2827 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
2828 3355
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3356 $_->{is_toplevel} = 1
2831 3357 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3358
2837 $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 }
2838} 3375}
2839 3376
2840sub on_refresh { 3377sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2842 3379
… …
2855 while ($self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2856 $_->() 3393 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
2858 } 3395 }
2859 3396
2860 if ($self->{check_size}) { 3397 if ($self->{realloc}) {
2861 my @queue = ([], []); 3398 my %queue;
3399 my @queue;
3400 my $widget;
2862 3401
2863 for (;;) { 3402 outer:
2864 if ($self->{check_size}) { 3403 while () {
2865 # heuristic: check containers last 3404 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3405 for $widget (values %$realloc) {
2867 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 }
2868 } 3412 }
2869 3413
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3414 while () {
3415 @queue or last outer;
2871 3416
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3417 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3418 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 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}) {
2880 $widget->{req_w} = $w; 3435 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3436 $widget->{req_h} = $h;
2882 3437
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3438 $self->{size_alloc}{$widget+0} = $widget;
2884 3439
2885 $widget->{parent}->check_size
2886 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 }
2887 } 3447 }
3448
3449 delete $self->{realloc}{$widget+0};
2888 } 3450 }
2889 } 3451 }
2890 3452
2891 while ($self->{size_alloc}) { 3453 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 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)};
2894 3461
2895 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
2897 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
2898 $widget->{w} = $w; 3472 $widget->{w} = $w;
2899 $widget->{h} = $h; 3473 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3474
2901 $widget->emit (size_allocate => $w, $h); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
2902 } 3477 }
2903 } 3478 }
2904 3479
2905 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
2906 $_->() 3481 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
2908 } 3483 }
2909 3484
3485
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
2913 3489
2914 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3491 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3494 glLoadIdentity;
2919 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
2920 $self->_draw; 3503 $self->_draw;
2921} 3504}
2922 3505
2923############################################################################# 3506#############################################################################
2924 3507
2925package CFClient::UI; 3508package CFClient::UI;
2926 3509
2927$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3512
29301 35131
2931 3514

Diff Legend

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