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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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