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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC

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

Diff Legend

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