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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
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}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 361 return unless $self->{visible};
238 $self->{h} = $h;
239 362
240 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 364 }
244} 365}
245 366
246sub size_allocate { 367sub size_allocate {
247 # nothing to be done 368 # nothing to be done
248} 369}
249 370
250sub children { 371sub children {
251} 372}
252 373
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 374sub set_max_size {
264 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
265 376
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 379}
269 380
270# return top left coordinates 381sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 382 my ($self, $tooltip) = @_;
273 383
274 $self->{parent} 384 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 385 $tooltip =~ s/\s+$//;
276 386
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
278} 395}
279 396
280# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
281sub coord2local { 398sub coord2local {
282 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
283 400
284 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 402}
287 403
288# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
289sub coord2global { 405sub coord2global {
290 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
291 407
292 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 409}
295 410
296sub focus_in { 411sub focus_in {
297 my ($self) = @_; 412 my ($self) = @_;
298 413
299 return if $FOCUS == $self; 414 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
301 416
302 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
303 418
304 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
305 420
306 $focus->update if $focus; 421 $focus->update if $focus;
307 $FOCUS->update; 422 $FOCUS->update;
308} 423}
309 424
… …
312 427
313 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
314 429
315 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
316 431
317 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
318 433
319 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
320} 438}
321 439
322sub mouse_motion { } 440sub mouse_motion { }
323sub button_up { } 441sub button_up { }
324sub key_down { } 442sub key_down { }
325sub key_up { } 443sub key_up { }
326 444
327sub button_down { 445sub button_down {
328 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
329 447
330 $self->focus_in; 448 $self->focus_in;
… …
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
338 525
339sub draw { 526sub draw {
340 my ($self) = @_; 527 my ($self) = @_;
341 528
342 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
359 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
360 glEnd; 547 glEnd;
361 glDisable GL_BLEND; 548 glDisable GL_BLEND;
362 } 549 }
363 550
364 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
365 glPushMatrix; 552 glPushMatrix;
366 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 556 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
373 glEnd; 560 glEnd;
374 glPopMatrix; 561 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 563 }
377} 564}
378 565
379sub _draw { 566sub _draw {
380 my ($self) = @_; 567 my ($self) = @_;
381 568
382 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
383} 570}
384 571
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 572sub DESTROY {
449 my ($self) = @_; 573 my ($self) = @_;
450 574
575 delete $WIDGET{$self+0};
451 #$self->deactivate; 576 #$self->deactivate;
452} 577}
453 578
454############################################################################# 579#############################################################################
455 580
… …
464 my $class = shift; 589 my $class = shift;
465 590
466 # range [value, low, high, page] 591 # range [value, low, high, page]
467 592
468 $class->SUPER::new ( 593 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
471 @_ 596 @_
472 ) 597 )
473} 598}
474 599
475sub _draw { 600sub _draw {
476 my ($self) = @_; 601 my ($self) = @_;
477 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
479 609
480 glEnable GL_BLEND; 610 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
483 613
484 glBegin GL_QUADS; 614 glBegin GL_QUADS;
485 glVertex 0 , 0; 615 glVertex 0 , 0;
486 glVertex 0 , $h; 616 glVertex 0 , $h;
487 glVertex $w, $h; 617 glVertex $w, $h;
488 glVertex $w, 0; 618 glVertex $w, 0;
489 glEnd; 619 glEnd;
490 620
491 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
492} 623}
493 624
494############################################################################# 625#############################################################################
495 626
496package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
501 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
503} 634}
504 635
505sub size_request { 636sub size_request {
506 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
507} 640}
508 641
509sub draw { } 642sub draw { }
510 643
511############################################################################# 644#############################################################################
… …
528 661
529 $self 662 $self
530} 663}
531 664
532sub add { 665sub add {
533 my ($self, $child) = @_; 666 my ($self, @widgets) = @_;
534 667
535 $child->set_parent ($self); 668 $_->set_parent ($self)
669 for @widgets;
536 670
537 use sort 'stable'; 671 use sort 'stable';
538 672
539 $self->{children} = [ 673 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 675 @{$self->{children}}, @widgets
542 ]; 676 ];
543 677
544 $child->check_size; 678 $self->realloc;
545 $self->update;
546} 679}
547 680
548sub children { 681sub children {
549 @{ $_[0]{children} } 682 @{ $_[0]{children} }
550} 683}
… …
555 delete $child->{parent}; 688 delete $child->{parent};
556 $child->hide; 689 $child->hide;
557 690
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 692
560 $self->check_size; 693 $self->realloc;
561 $self->update;
562} 694}
563 695
564sub clear { 696sub clear {
565 my ($self) = @_; 697 my ($self) = @_;
566 698
… …
570 for (@$children) { 702 for (@$children) {
571 delete $_->{parent}; 703 delete $_->{parent};
572 $_->hide; 704 $_->hide;
573 } 705 }
574 706
575 $self->check_size; 707 $self->realloc;
576 $self->update;
577} 708}
578 709
579sub find_widget { 710sub find_widget {
580 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
581 712
… …
634sub size_request { 765sub size_request {
635 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
636} 767}
637 768
638sub size_allocate { 769sub size_allocate {
639 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
640 771
641 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
642} 773}
643 774
644############################################################################# 775#############################################################################
… …
656} 787}
657 788
658sub update { 789sub update {
659 my ($self) = @_; 790 my ($self) = @_;
660 791
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 793 $self->SUPER::update;
663} 794}
664 795
665sub size_allocate { 796sub size_allocate {
666 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
667 798
668 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
669 $self->update; 800 $self->update
801 if $changed;
670} 802}
671 803
672sub _render { 804sub _render {
673 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
674} 806}
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
682 814
683 $self->_render; 815 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 816 };
692} 817}
693 818
694sub _draw { 819sub _draw {
695 my ($self) = @_; 820 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
698 823
699 my $tex = $self->{texture} 824 my $tex = $self->{texture}
700 or return; 825 or return;
701 826
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
707 830
708 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 832
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
712} 834}
713 835
714############################################################################# 836#############################################################################
715 837
716package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
717 839
718our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
719 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
720sub size_request { 852sub size_request {
721 my ($self) = @_; 853 my ($self) = @_;
722 854
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 856
726 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
727} 861}
728 862
729sub size_allocate { 863sub size_allocate {
730 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
731 865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
732 $self->update; 870 $self->update;
733} 871}
734 872
735sub set_offset { 873sub set_offset {
736 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 877 $self->{view_y} = int $y;
740 878
741 $self->update; 879 $self->update;
742} 880}
743 881
882# hmm, this does not work for topleft of $self... but we should not ask for that
883sub coord2local {
884 my ($self, $x, $y) = @_;
885
886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
888
889sub coord2global {
890 my ($self, $x, $y) = @_;
891
892 $x = List::Util::min $self->{w}, $x - $self->{view_x};
893 $y = List::Util::min $self->{h}, $y - $self->{view_y};
894
895 $self->SUPER::coord2global ($x, $y)
896}
897
898sub find_widget {
899 my ($self, $x, $y) = @_;
900
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y)
907 }
908}
909
744sub _render { 910sub _render {
745 my ($self) = @_; 911 my ($self) = @_;
746 912
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 914
… …
759 my $class = shift; 925 my $class = shift;
760 926
761 my $self; 927 my $self;
762 928
763 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
764 vertical => 1, 930 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 932 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
768 }, 934 },
769 ; 935 ;
770 936
771 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 939 slider => $slider,
774 @_, 940 @_,
775 ); 941 );
776 942
777 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
780 946
781 $self 947 $self
782} 948}
783 949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
784#TODO# update range on size_allocate depeneing on child 969#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 970# update viewport offset on scroll
786 971
787############################################################################# 972#############################################################################
788 973
789package CFClient::UI::Frame; 974package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 978use CFClient::OpenGL;
794 979
795sub new { 980sub new {
796 my $class = shift; 981 my $class = shift;
797 982
798 my $self = $class->SUPER::new ( 983 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 984 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 985 @_,
803 ); 986 )
804
805 $self
806} 987}
807 988
808sub _draw { 989sub _draw {
809 my ($self) = @_; 990 my ($self) = @_;
810 991
811 my ($w, $h) = ($self->{w}, $self->{h}); 992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
812 994
813 glEnable GL_BLEND; 995 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 997 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 998
818# glBegin GL_QUADS; 999 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 1000 glVertex 0 , 0;
821# glVertex 0 , $h; 1001 glVertex 0 , $h;
822# glVertex $w, $h; 1002 glVertex $w, $h;
823# glVertex $w, 0; 1003 glVertex $w, 0;
824# glEnd; 1004 glEnd;
825 1005
826
827 $self->child->draw;
828 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 1007 }
1008
1009 $self->SUPER::_draw;
830} 1010}
831 1011
832############################################################################# 1012#############################################################################
833 1013
834package CFClient::UI::FancyFrame; 1014package CFClient::UI::FancyFrame;
835 1015
836our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
837 1017
838use CFClient::OpenGL; 1018use CFClient::OpenGL;
839 1019
840my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
842 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
843 1027
844sub new { 1028sub new {
845 my $class = shift; 1029 my $class = shift;
846 1030
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
852 border => 0.6, 1034 border => 0.6,
853 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
854 @_ 1038 @_
855 ); 1039 );
856 1040
857 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 1042 align => 0,
… …
877 $h + $self->border * 2, 1061 $h + $self->border * 2,
878 ) 1062 )
879} 1063}
880 1064
881sub size_allocate { 1065sub size_allocate {
882 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
883 1069
884 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
886 1072
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 1074 if $self->{title};
889 1075
890 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
891} 1077}
892 1078
… …
911 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
912 1098
913 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
915 1101
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
919 $self->check_size;
920 }; 1107 };
921 1108
922 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
924 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
926 $self->{motion} = sub { 1113 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
928 1115
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
930 1117
931 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
932 $self->update;
933 }; 1119 };
934 } 1120 }
935} 1121}
936 1122
937sub button_up { 1123sub button_up {
… …
950 my ($self) = @_; 1136 my ($self) = @_;
951 1137
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1140
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1143
960 my $border = $self->border; 1144 my $border = $self->border;
961 1145
962 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1151
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
970 1154
971 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
972 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
973 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
974
975 glColor @{ $self->{bg} };
976
977 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
981 1161
982 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1163
986 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
987 1165
988 $self->child->draw; 1166 $self->child->draw;
989} 1167}
… …
1001sub new { 1179sub new {
1002 my $class = shift; 1180 my $class = shift;
1003 1181
1004 $class->SUPER::new ( 1182 $class->SUPER::new (
1005 col_expand => [], 1183 col_expand => [],
1006 @_ 1184 @_,
1007 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1190}
1009 1191
1010sub add { 1192sub add {
1011 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1012 1194
1013 $child->set_parent ($self); 1195 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1015 1197
1016 $child->check_size; 1198 $self->realloc;
1017} 1199}
1018 1200
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1024sub clear { 1202sub clear {
1025 my ($self) = @_; 1203 my ($self) = @_;
1026 1204
1027 my @children = $self->children; 1205 my @children = $self->children;
1028 delete $self->{children}; 1206 delete $self->{children};
… …
1030 for (@children) { 1208 for (@children) {
1031 delete $_->{parent}; 1209 delete $_->{parent};
1032 $_->hide; 1210 $_->hide;
1033 } 1211 }
1034 1212
1035 $self->update; 1213 $self->realloc;
1036} 1214}
1037 1215
1038sub get_wh { 1216sub get_wh {
1039 my ($self) = @_; 1217 my ($self) = @_;
1040 1218
… …
1067 (sum @$hs), 1245 (sum @$hs),
1068 ) 1246 )
1069} 1247}
1070 1248
1071sub size_allocate { 1249sub size_allocate {
1072 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1073 1251
1074 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1075 1253
1076 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1078 1256
1079 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1314 }
1137} 1315}
1138 1316
1139############################################################################# 1317#############################################################################
1140 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1141package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1142 1380
1143# TODO: wrap into common Box base class
1144
1145our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1146 1382
1147sub size_request { 1383sub new {
1148 my ($self) = @_; 1384 my $class = shift;
1149 1385
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1151 1387 vertical => 0,
1152 ( 1388 @_,
1153 (List::Util::sum map $_->[0], @alloc),
1154 (List::Util::max map $_->[1], @alloc),
1155 ) 1389 )
1156} 1390}
1157 1391
1158sub size_allocate {
1159 my ($self, $w, $h) = @_;
1160
1161 ($h, $w) = ($w, $h);
1162
1163 my $children = $self->{children};
1164
1165 my @h = map $_->{req_w}, @$children;
1166
1167 my $req_h = List::Util::sum @h;
1168
1169 if ($req_h > $h) {
1170 # ah well, not enough space
1171 $_ *= $h / $req_h for @h;
1172 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children;
1174 $exp ||= 1;
1175
1176 for (0 .. $#$children) {
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 }
1183 }
1184
1185 CFClient::UI::harmonize \@h;
1186
1187 my $y = 0;
1188 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_];
1191 $child->configure ($y, 0, $h, $w);
1192
1193 $y += $h;
1194 }
1195
1196 1
1197}
1198
1199############################################################################# 1392#############################################################################
1200 1393
1201package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1202 1395
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1206 1397
1207sub size_request { 1398sub new {
1208 my ($self) = @_; 1399 my $class = shift;
1209 1400
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1211 1402 vertical => 1,
1212 ( 1403 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1404 )
1216} 1405}
1217 1406
1218sub size_allocate {
1219 my ($self, $w, $h) = @_;
1220
1221 my $children = $self->{children};
1222
1223 my @h = map $_->{req_h}, @$children;
1224
1225 my $req_h = List::Util::sum @h;
1226
1227 if ($req_h > $h) {
1228 # ah well, not enough space
1229 $_ *= $h / $req_h for @h;
1230 } else {
1231 my $exp = List::Util::sum map $_->{expand}, @$children;
1232 $exp ||= 1;
1233
1234 for (0 .. $#$children) {
1235 my $child = $children->[$_];
1236
1237 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure (0, $y, $w, $h);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1407#############################################################################
1256 1408
1257package CFClient::UI::Label; 1409package CFClient::UI::Label;
1258 1410
1259our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1260 1412
1261use CFClient::OpenGL; 1413use CFClient::OpenGL;
1262 1414
1263sub new { 1415sub new {
1264 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1265 1417
1266 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1268 #font => default_font 1422 #font => default_font
1423 #text => initial text
1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1427 layout => (new CFClient::Layout),
1269 fontsize => 1, 1428 fontsize => 1,
1270 text => "",
1271 align => -1, 1429 align => -1,
1272 valign => -1, 1430 valign => -1,
1273 padding => 2, 1431 padding_x => 2,
1274 layout => new CFClient::Layout, 1432 padding_y => 2,
1275 can_events => 0, 1433 can_events => 0,
1276 %arg 1434 %arg
1277 ); 1435 );
1278 1436
1279 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1440 $self->{template} = $layout;
1283 } 1441 }
1284 1442
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1444 $self->set_markup (delete $self->{markup});
1445 } else {
1446 $self->set_text (delete $self->{text});
1447 }
1287 1448
1288 $self 1449 $self
1289} 1450}
1290 1451
1291sub escape { 1452sub escape($) {
1292 local $_ = $_[1]; 1453 local $_ = $_[0];
1293 1454
1294 s/&/&amp;/g; 1455 s/&/&amp;/g;
1295 s/>/&gt;/g; 1456 s/>/&gt;/g;
1296 s/</&lt;/g; 1457 s/</&lt;/g;
1297 1458
1298 $_[1] 1459 $_
1299} 1460}
1300 1461
1301sub update { 1462sub update {
1302 my ($self) = @_; 1463 my ($self) = @_;
1303 1464
1304 delete $self->{texture}; 1465 delete $self->{texture};
1305 $self->SUPER::update; 1466 $self->SUPER::update;
1306} 1467}
1307 1468
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1469sub set_text {
1315 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1316 1471
1317 return if $self->{text} eq "T$text"; 1472 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1319 1474
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1321 1477
1322 delete $self->{texture}; 1478 $self->realloc;
1323 $self->update; 1479 $self->update;
1324 $self->check_size;
1325} 1480}
1326 1481
1327sub set_markup { 1482sub set_markup {
1328 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1329 1484
1330 return if $self->{text} eq "M$markup"; 1485 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1486 $self->{text} = "M$markup";
1332 1487
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1334 1492
1335 delete $self->{texture}; 1493 $self->realloc;
1336 $self->update; 1494 $self->update;
1337 $self->check_size;
1338} 1495}
1339 1496
1340sub size_request { 1497sub size_request {
1341 my ($self) = @_; 1498 my ($self) = @_;
1342 1499
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1505
1347 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1348 1507
1349 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1354 1513
1355 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1356 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1357 } 1516 }
1358 1517
1359 ( 1518 ($w, $h)
1360 $w + $self->{padding} * 2,
1361 $h + $self->{padding} * 2,
1362 )
1363} 1519}
1364 1520
1365sub size_allocate { 1521sub size_allocate {
1366 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1367 1523
1368 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1369} 1526}
1370 1527
1371sub set_fontsize { 1528sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1373 1530
1374 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1532 delete $self->{texture};
1376 $self->check_size; 1533
1377 $self->update; 1534 $self->realloc;
1378} 1535}
1379 1536
1380sub _draw { 1537sub _draw {
1381 my ($self) = @_; 1538 my ($self) = @_;
1382 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1383 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1387 new_from_layout CFClient::Texture $self->{layout} 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1551
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5);
1555
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1388 }; 1561 };
1389 1562
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1565
1566 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1410 1572
1411 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1574}
1414 1575
1415############################################################################# 1576#############################################################################
1416 1577
1417package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1431 can_hover => 1, 1592 can_hover => 1,
1432 can_focus => 1, 1593 can_focus => 1,
1433 valign => 0, 1594 valign => 0,
1434 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1435 @_ 1597 @_
1436 ) 1598 )
1437} 1599}
1438 1600
1439sub _set_text { 1601sub _set_text {
… …
1449 $self->{text} = $text; 1611 $self->{text} = $text;
1450 1612
1451 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1453 1615
1454 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1617}
1618
1619sub set_text {
1620 my ($self, $text) = @_;
1621
1622 $self->{cursor} = length $text;
1623 $self->_set_text ($text);
1624
1625 $self->realloc;
1455} 1626}
1456 1627
1457sub get_text { 1628sub get_text {
1458 $_[0]{text} 1629 $_[0]{text}
1459} 1630}
… …
1462 my ($self) = @_; 1633 my ($self) = @_;
1463 1634
1464 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1465 1636
1466 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1638}
1482 1639
1483sub key_down { 1640sub key_down {
1484 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1485 1642
… …
1487 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1489 1646
1490 my $text = $self->get_text; 1647 my $text = $self->get_text;
1491 1648
1492 if ($sym == 8) { 1649 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1662 $self->_emit ('escape');
1506 } elsif ($uni) { 1663 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1665 }
1509 1666
1510 $self->_set_text ($text); 1667 $self->_set_text ($text);
1511 $self->update; 1668
1669 $self->realloc;
1512} 1670}
1513 1671
1514sub focus_in { 1672sub focus_in {
1515 my ($self) = @_; 1673 my ($self) = @_;
1516 1674
… …
1596 if ($sym == 13) { 1754 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1602 $self->update; 1760 $self->update;
1603 1761
1604 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1643 1801
1644sub new { 1802sub new {
1645 my $class = shift; 1803 my $class = shift;
1646 1804
1647 $class->SUPER::new ( 1805 $class->SUPER::new (
1648 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1649 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1652 can_hover => 1, 1810 can_hover => 1,
1653 align => 0, 1811 align => 0,
1654 valign => 0, 1812 valign => 0,
1655 can_events => 1, 1813 can_events => 1,
1656 @_ 1814 @_
1657 ) 1815 )
1658} 1816}
1659 1817
1818sub activate { }
1819
1660sub button_up { 1820sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1662 1822
1823 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1826}
1668 1827
1669sub _draw { 1828sub _draw {
1670 my ($self) = @_; 1829 my ($self) = @_;
1671 1830
… …
1673 1832
1674 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1676 } 1835 }
1677 1836
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1683 1840
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1842
1686 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1844
1689 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1690} 1846}
1691 1847
1692############################################################################# 1848#############################################################################
… …
1703 1859
1704sub new { 1860sub new {
1705 my $class = shift; 1861 my $class = shift;
1706 1862
1707 $class->SUPER::new ( 1863 $class->SUPER::new (
1708 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1709 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1870 state => 0,
1712 can_hover => 1, 1871 can_hover => 1,
1713 @_ 1872 @_
1714 ) 1873 )
1715} 1874}
1716 1875
1717sub size_request { 1876sub size_request {
1718 my ($self) = @_; 1877 my ($self) = @_;
1719 1878
1720 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1721} 1880}
1722 1881
1723sub button_down { 1882sub button_down {
1724 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1725 1884
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1728 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1730 } 1889 }
1731} 1890}
1732 1891
1733sub _draw { 1892sub _draw {
1734 my ($self) = @_; 1893 my ($self) = @_;
1735 1894
1736 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1737 1896
1738 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1739 1898
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1741 1902
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1904
1744 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1745 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1910}
1755 1911
1756############################################################################# 1912#############################################################################
1757 1913
1758package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1802 1958
1803 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1804 } 1960 }
1805 1961
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1964
1811 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1966
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1815} 1968}
1816 1969
1817############################################################################# 1970#############################################################################
1818 1971
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
2008 2161
2009sub new { 2162sub new {
2010 my $class = shift; 2163 my $class = shift;
2011 2164
2012 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
2013 2166
2014 # TODO: 0-width page 2167 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2169 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2023 vertical => 0, 2178 vertical => 0,
2024 can_hover => 1, 2179 can_hover => 1,
2025 inner_pad => 5, 2180 inner_pad => 0.02,
2026 @_ 2181 @_
2027 ); 2182 );
2028 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
2029 $self 2187 $self
2030} 2188}
2031 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
2032sub size_request { 2224sub size_request {
2033 my ($self) = @_; 2225 my ($self) = @_;
2034 2226
2035 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2036 my $h = $self->{req_h};
2037
2038 $self->{vertical} ? ($h, $w) : ($w, $h)
2039} 2228}
2040 2229
2041sub button_down { 2230sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2043 2232
2044 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
2045 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2046} 2238}
2047 2239
2048sub mouse_motion { 2240sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
2050 2242
2051 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2053 2262
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2264
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2267
2059 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2270
2065 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2272 $self->{knob_w} = $knob_w;
2067 } 2273 });
2068}
2069 2274
2070# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2276}
2077 2277
2078sub _draw { 2278sub _draw {
2079 my ($self) = @_; 2279 my ($self) = @_;
2080 2280
2081 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
2082 2282
2083 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
2084 2284
2085 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2087 2287
2288 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2290 }
2093 2291
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2294
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2297
2120 # draw background 2298 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2300
2123 # draw handle 2301 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2303
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2128} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
2129 2347
2130############################################################################# 2348#############################################################################
2131 2349
2132package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2133 2351
… …
2142 fontsize => 1, 2360 fontsize => 1,
2143 can_events => 0, 2361 can_events => 0,
2144 #font => default_font 2362 #font => default_font
2145 @_, 2363 @_,
2146 2364
2147 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
2148 par => [], 2366 par => [],
2149 height => 0, 2367 height => 0,
2150 children => [ 2368 children => [
2151 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
… …
2163 2381
2164 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2383 $self->reflow;
2166} 2384}
2167 2385
2168sub text_height {
2169 my ($self, $text) = @_;
2170
2171 my $layout = $self->{layout};
2172
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text);
2176
2177 ($layout->size)[1]
2178}
2179
2180sub reflow {
2181 my ($self) = @_;
2182
2183 $self->{need_reflow}++;
2184 $self->update;
2185}
2186
2187sub size_allocate { 2386sub size_allocate {
2188 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2189 2388
2190 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2191 2392
2192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2193 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2396
2196 $self->reflow; 2397 $self->reflow;
2197} 2398}
2198 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2199sub add_paragraph { 2434sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2201 2436
2202 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2203 2438 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2207 2442
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2444}
2213 2445
2214sub update { 2446sub update {
2215 my ($self) = @_; 2447 my ($self) = @_;
2216 2448
… …
2218 2450
2219 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2220 2452
2221 delete $self->{texture}; 2453 delete $self->{texture};
2222 2454
2223 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2224 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2459 my $height = 0;
2226 2460
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2228 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2229 2476
2230 $self->{height} = $height; 2477 $self->{height} = $height;
2231 2478
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2480
2234 delete $self->{texture}; 2481 delete $self->{texture};
2235 } 2482 }
2236 2483
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2240 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2241 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0];
2247
2248 my $y0 = $top;
2249 my $y1 = $top + $self->{h};
2250
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256 2502
2257 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2504 my $h = $par->[1];
2259 2505
2260 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2262 2510
2263 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2512
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2515 }
2267 2516
2268 $y += $h; 2517 $y += $h;
2269 } 2518 }
2270 2519
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2273 }; 2521 };
2274 }); 2522 });
2275} 2523}
2276 2524
2277sub _draw { 2525sub _draw {
2278 my ($self) = @_; 2526 my ($self) = @_;
2279 2527
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2533
2289 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2290 2535
2291} 2536}
2292 2537
… …
2340 2585
2341sub new { 2586sub new {
2342 my $class = shift; 2587 my $class = shift;
2343 2588
2344 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2345 state => 0, 2590 state => 0,
2346 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2347 @_ 2592 @_
2348 ); 2593 );
2349 2594
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2595 $self
2356} 2596}
2357 2597
2358sub toggle_flopper { 2598sub toggle_flopper {
2359 my ($self) = @_; 2599 my ($self) = @_;
2360 2600
2361 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2362 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open");
2366 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close");
2369 }
2370
2371 $self->emit (changed => $self->{state});
2372} 2602}
2373 2603
2374############################################################################# 2604#############################################################################
2375 2605
2376package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2386 @_, 2616 @_,
2387 can_events => 0, 2617 can_events => 0,
2388 ) 2618 )
2389} 2619}
2390 2620
2391sub set_markup { 2621sub set_tooltip_from {
2392 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2393 2623
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2625 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8,
2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 );
2397} 2632}
2398 2633
2399sub size_request { 2634sub size_request {
2400 my ($self) = @_; 2635 my ($self) = @_;
2401 2636
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2638
2406 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2407} 2640}
2408 2641
2409sub size_allocate { 2642sub size_allocate {
2410 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2411 2644
2645 return unless $changed;
2646
2412 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2413} 2666}
2414 2667
2415sub _draw { 2668sub _draw {
2416 my ($self) = @_; 2669 my ($self) = @_;
2417 2670
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2671 glTranslate 0.375, 0.375;
2420 2672
2421 my ($w, $h) = @$self{qw(w h)}; 2673 my ($w, $h) = @$self{qw(w h)};
2422 2674
2423 glColor 1, 0.8, 0.4; 2675 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2686 glVertex 0 , $h;
2435 glVertex $w, $h; 2687 glVertex $w, $h;
2436 glVertex $w, 0; 2688 glVertex $w, 0;
2437 glEnd; 2689 glEnd;
2438 2690
2439 glPopMatrix; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2440 2692
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2443} 2694}
2444 2695
2445############################################################################# 2696#############################################################################
2446 2697
… …
2451use CFClient::OpenGL; 2702use CFClient::OpenGL;
2452 2703
2453sub new { 2704sub new {
2454 my $class = shift; 2705 my $class = shift;
2455 2706
2456 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2457 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2458 @_, 2710 @_,
2459 ) 2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2460} 2728}
2461 2729
2462sub size_request { 2730sub size_request {
2463 (32, 8) 2731 (32, 8)
2464} 2732}
2465 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2466sub _draw { 2742sub _draw {
2467 my ($self) = @_; 2743 my ($self) = @_;
2468 2744
2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2757
2471 # TODO animation
2472 if ($tex) { 2758 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND; 2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2776#############################################################################
2777
2778package CFClient::UI::Inventory;
2779
2780our @ISA = CFClient::UI::ScrolledWindow::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2481 } 2815 }
2482} 2816}
2483 2817
2484############################################################################# 2818#############################################################################
2485 2819
… …
2521 2855
2522# popup given the event (must be a mouse button down event currently) 2856# popup given the event (must be a mouse button down event currently)
2523sub popup { 2857sub popup {
2524 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2525 2859
2526 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2527 2861
2528 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2863 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2531 2865
2532 $self->show; 2866 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534} 2868}
2535 2869
2536sub mouse_motion { 2870sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2538 2872
… …
2546 2880
2547 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2882 undef $GRAB;
2549 $self->hide; 2883 $self->hide;
2550 2884
2551 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2553 } 2887 }
2554} 2888}
2555 2889
2556############################################################################# 2890#############################################################################
2557 2891
2892package CFClient::UI::Statusbox;
2893
2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2904
2905sub reorder {
2906 my ($self) = @_;
2907 my $NOW = time;
2908
2909 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 }
2912
2913 my @widgets;
2914
2915 my @items = sort {
2916 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} };
2919
2920 my $count = 10 + 1;
2921 for my $item (@items) {
2922 last unless --$count;
2923
2924 push @widgets, $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text};
2929
2930 for ($short) {
2931 s/^\s+//;
2932 s/\s+/ /g;
2933 }
2934
2935 new CFClient::UI::Label
2936 markup => $short,
2937 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg},
2943 can_events => 1,
2944 can_hover => 1
2945 };
2946 }
2947
2948 $self->clear;
2949 $self->SUPER::add (reverse @widgets);
2950}
2951
2952sub add {
2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2959
2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2961
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963
2964 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) {
2966 $item->{count}++;
2967 } else {
2968 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text;
2970 }
2971 $item->{id} = ++$self->{id};
2972 $item->{timeout} = $timeout;
2973 delete $item->{label};
2974 } else {
2975 $self->{item}{$group} = {
2976 id => ++$self->{id},
2977 text => $text,
2978 timeout => $timeout,
2979 tooltip => $text,
2980 fg => [0.8, 0.8, 0.8, 0.8],
2981 pri => 0,
2982 count => 1,
2983 %arg,
2984 };
2985 }
2986
2987 $self->reorder;
2988}
2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
3000#############################################################################
3001
2558package CFClient::UI::Root; 3002package CFClient::UI::Root;
2559 3003
2560our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2561 3005
2562use CFClient::OpenGL; 3006use CFClient::OpenGL;
2563 3007
2564sub check_size { 3008sub new {
2565 my ($self) = @_; 3009 my $class = shift;
2566 3010
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3011 my $self = $class->SUPER::new (
2568} 3012 visible => 1,
3013 @_,
3014 );
2569 3015
2570sub size_request { 3016 Scalar::Util::weaken ($self->{root} = $self);
2571 ($::WIDTH, $::HEIGHT) 3017
3018 $self
2572} 3019}
2573 3020
2574sub configure { 3021sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2576 3023
2577 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
2578 3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 ($self->{w}, $self->{h})
3041}
3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3057sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_;
3059
2579 for my $child (@{$self->{children}}) { 3060 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3062
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2584 $child->configure ($X, $Y, $W,$H); 3069 $child->configure ($X, $Y, $W, $H);
2585 } 3070 }
2586} 3071}
2587 3072
2588sub _topleft { 3073sub coord2local {
2589 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2590 3075
2591 ($x, $y) 3076 ($x, $y)
2592} 3077}
2593 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2594sub update { 3085sub update {
2595 my ($self) = @_; 3086 my ($self) = @_;
2596 3087
2597 $self->check_size; 3088 $::WANT_REFRESH++;
2598 ::refresh ();
2599} 3089}
2600 3090
2601sub add { 3091sub add {
2602 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2603 3093
2604 # integerize window positions 3094 $_->{is_toplevel} = 1
2605 $child->{x} = int $child->{x}; 3095 for @children;
2606 $child->{y} = int $child->{y};
2607 3096
2608 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2609} 3113}
2610 3114
2611sub on_refresh { 3115sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2613 3117
2614 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2615} 3119}
2616 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2617sub draw { 3127sub draw {
2618 my ($self) = @_; 3128 my ($self) = @_;
2619 3129
2620 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3131 $_->()
3132 for values %{delete $self->{refresh_hook}};
3133 }
3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
2622 } 3196 }
2623 3197
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2627 3201
2628 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3203 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3206 glLoadIdentity;
2633 3207
2634 $self->_draw; 3208 $self->_draw;
2635} 3209}
2636 3210
2637############################################################################# 3211#############################################################################
2638 3212
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 3213package CFClient::UI;
2693 3214
2694$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696 3217
26971 32181
2698 3219

Diff Legend

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