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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

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

Diff Legend

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