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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 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->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
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->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
263 } 364 }
264} 365}
265 366
266sub size_allocate { 367sub size_allocate {
267 # nothing to be done 368 # nothing to be done
268} 369}
269 370
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 371sub children {
278} 372}
279 373
280sub set_max_size { 374sub set_max_size {
281 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
282 376
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
379}
380
381sub set_tooltip {
382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
285} 395}
286 396
287# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
288sub coord2local { 398sub coord2local {
289 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 414 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
306 416
307 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
308 418
309 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
310 420
311 $focus->update if $focus; 421 $focus->update if $focus;
312 $FOCUS->update; 422 $FOCUS->update;
313} 423}
314 424
… …
317 427
318 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
319 429
320 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
321 431
322 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
323 433
324 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
325} 438}
326 439
327sub mouse_motion { } 440sub mouse_motion { }
328sub button_up { } 441sub button_up { }
329sub key_down { } 442sub key_down { }
330sub key_up { } 443sub key_up { }
331 444
332sub button_down { 445sub button_down {
333 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
334 447
335 $self->focus_in; 448 $self->focus_in;
… …
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
342sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
343 525
344sub draw { 526sub draw {
345 my ($self) = @_; 527 my ($self) = @_;
346 528
347 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
364 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
365 glEnd; 547 glEnd;
366 glDisable GL_BLEND; 548 glDisable GL_BLEND;
367 } 549 }
368 550
369 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
370 glPushMatrix; 552 glPushMatrix;
371 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 556 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
378 glEnd; 560 glEnd;
379 glPopMatrix; 561 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 563 }
382} 564}
… …
385 my ($self) = @_; 567 my ($self) = @_;
386 568
387 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
388} 570}
389 571
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}
437
438sub DESTROY { 572sub DESTROY {
439 my ($self) = @_; 573 my ($self) = @_;
440 574
441 delete $WIDGET{$self+0}; 575 delete $WIDGET{$self+0};
442 #$self->deactivate; 576 #$self->deactivate;
… …
455 my $class = shift; 589 my $class = shift;
456 590
457 # range [value, low, high, page] 591 # range [value, low, high, page]
458 592
459 $class->SUPER::new ( 593 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
462 @_ 596 @_
463 ) 597 )
464} 598}
465 599
466sub _draw { 600sub _draw {
467 my ($self) = @_; 601 my ($self) = @_;
468 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
470 609
471 glEnable GL_BLEND; 610 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
474 613
475 glBegin GL_QUADS; 614 glBegin GL_QUADS;
476 glVertex 0 , 0; 615 glVertex 0 , 0;
477 glVertex 0 , $h; 616 glVertex 0 , $h;
478 glVertex $w, $h; 617 glVertex $w, $h;
479 glVertex $w, 0; 618 glVertex $w, 0;
480 glEnd; 619 glEnd;
481 620
482 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
483} 623}
484 624
485############################################################################# 625#############################################################################
486 626
487package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
494} 634}
495 635
496sub size_request { 636sub size_request {
497 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
498} 640}
499 641
500sub draw { } 642sub draw { }
501 643
502############################################################################# 644#############################################################################
… …
531 $self->{children} = [ 673 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
534 ]; 676 ];
535 677
536 $self->check_size (1); 678 $self->realloc;
537 $self->update;
538} 679}
539 680
540sub children { 681sub children {
541 @{ $_[0]{children} } 682 @{ $_[0]{children} }
542} 683}
… …
547 delete $child->{parent}; 688 delete $child->{parent};
548 $child->hide; 689 $child->hide;
549 690
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 692
552 $self->check_size; 693 $self->realloc;
553 $self->update;
554} 694}
555 695
556sub clear { 696sub clear {
557 my ($self) = @_; 697 my ($self) = @_;
558 698
… …
562 for (@$children) { 702 for (@$children) {
563 delete $_->{parent}; 703 delete $_->{parent};
564 $_->hide; 704 $_->hide;
565 } 705 }
566 706
567 $self->check_size; 707 $self->realloc;
568 $self->update;
569} 708}
570 709
571sub find_widget { 710sub find_widget {
572 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
573 712
… …
626sub size_request { 765sub size_request {
627 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
628} 767}
629 768
630sub size_allocate { 769sub size_allocate {
631 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
632 771
633 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
634} 773}
635 774
636############################################################################# 775#############################################################################
… …
653 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
654 $self->SUPER::update; 793 $self->SUPER::update;
655} 794}
656 795
657sub size_allocate { 796sub size_allocate {
658 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
659 798
660 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
661 $self->update; 800 $self->update
801 if $changed;
662} 802}
663 803
664sub _render { 804sub _render {
665 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
666} 806}
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
674 814
675 $self->_render; 815 $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 }; 816 };
684} 817}
685 818
686sub _draw { 819sub _draw {
687 my ($self) = @_; 820 my ($self) = @_;
… …
691 my $tex = $self->{texture} 824 my $tex = $self->{texture}
692 or return; 825 or return;
693 826
694 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
697 830
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 832
700 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
701} 834}
… …
704 837
705package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
706 839
707our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
708 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
709sub size_request { 852sub size_request {
710 my ($self) = @_; 853 my ($self) = @_;
711 854
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 856
715 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
716} 861}
717 862
718sub size_allocate { 863sub size_allocate {
719 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
720 865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
721 $self->update; 870 $self->update;
722} 871}
723 872
724sub set_offset { 873sub set_offset {
725 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
776 my $class = shift; 925 my $class = shift;
777 926
778 my $self; 927 my $self;
779 928
780 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
781 vertical => 1, 930 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 932 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
785 }, 934 },
786 ; 935 ;
787 936
788 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 939 slider => $slider,
791 @_, 940 @_,
792 ); 941 );
793 942
794 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 944 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
797 946
798 $self 947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 967}
800 968
801#TODO# update range on size_allocate depending on child 969#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 970# update viewport offset on scroll
803 971
… …
847 1015
848our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
849 1017
850use CFClient::OpenGL; 1018use CFClient::OpenGL;
851 1019
852my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 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); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855 1027
856sub new { 1028sub new {
857 my $class = shift; 1029 my $class = shift;
858 1030
859 # TODO: user_x, user_y, overwrite moveto?
860
861 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1034 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
867 @_ 1038 @_
868 ); 1039 );
869 1040
870 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 1042 align => 0,
… …
890 $h + $self->border * 2, 1061 $h + $self->border * 2,
891 ) 1062 )
892} 1063}
893 1064
894sub size_allocate { 1065sub size_allocate {
895 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
896 1069
897 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
899 1072
900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
924 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
925 1098
926 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
928 1101
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
933 }; 1107 };
934 1108
935 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1113 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
941 1115
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
943 1117
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update;
946 }; 1119 };
947 } 1120 }
948} 1121}
949 1122
950sub button_up { 1123sub button_up {
… …
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1143
971 my $border = $self->border; 1144 my $border = $self->border;
972 1145
973 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1151
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
981 1154
982 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1158 $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); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1160 }
993 1161
994 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
995 1163
… …
1011sub new { 1179sub new {
1012 my $class = shift; 1180 my $class = shift;
1013 1181
1014 $class->SUPER::new ( 1182 $class->SUPER::new (
1015 col_expand => [], 1183 col_expand => [],
1016 @_ 1184 @_,
1017 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1190}
1019 1191
1020sub add { 1192sub add {
1021 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1022 1194
1023 $child->set_parent ($self); 1195 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1025 1197
1026 $child->check_size; 1198 $self->realloc;
1027} 1199}
1028 1200
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1202sub clear {
1035 my ($self) = @_; 1203 my ($self) = @_;
1036 1204
1037 my @children = $self->children; 1205 my @children = $self->children;
1038 delete $self->{children}; 1206 delete $self->{children};
… …
1040 for (@children) { 1208 for (@children) {
1041 delete $_->{parent}; 1209 delete $_->{parent};
1042 $_->hide; 1210 $_->hide;
1043 } 1211 }
1044 1212
1045 $self->update; 1213 $self->realloc;
1046} 1214}
1047 1215
1048sub get_wh { 1216sub get_wh {
1049 my ($self) = @_; 1217 my ($self) = @_;
1050 1218
… …
1077 (sum @$hs), 1245 (sum @$hs),
1078 ) 1246 )
1079} 1247}
1080 1248
1081sub size_allocate { 1249sub size_allocate {
1082 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1083 1251
1084 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1085 1253
1086 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1088 1256
1089 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1314 }
1147} 1315}
1148 1316
1149############################################################################# 1317#############################################################################
1150 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1151package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1152 1380
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1156 1382
1157sub size_request { 1383sub new {
1158 my ($self) = @_; 1384 my $class = shift;
1159 1385
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1161 1387 vertical => 0,
1162 ( 1388 @_,
1163 (List::Util::sum map $_->[0], @alloc),
1164 (List::Util::max map $_->[1], @alloc),
1165 ) 1389 )
1166} 1390}
1167 1391
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 ($h, $w) = ($w, $h);
1172
1173 my $children = $self->{children};
1174
1175 my @h = map $_->{req_w}, @$children;
1176
1177 my $req_h = List::Util::sum @h;
1178
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children;
1184 $exp ||= 1;
1185
1186 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 }
1193 }
1194
1195 CFClient::UI::harmonize \@h;
1196
1197 my $y = 0;
1198 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_];
1201 $child->configure ($y, 0, $h, $w);
1202
1203 $y += $h;
1204 }
1205
1206 1
1207}
1208
1209############################################################################# 1392#############################################################################
1210 1393
1211package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1212 1395
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1216 1397
1217sub size_request { 1398sub new {
1218 my ($self) = @_; 1399 my $class = shift;
1219 1400
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1221 1402 vertical => 1,
1222 ( 1403 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1404 )
1226} 1405}
1227 1406
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############################################################################# 1407#############################################################################
1268 1408
1269package CFClient::UI::Label; 1409package CFClient::UI::Label;
1270 1410
1271our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1272 1412
1273use CFClient::OpenGL; 1413use CFClient::OpenGL;
1274 1414
1275sub new { 1415sub new {
1276 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1277 1417
1278 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1280 #font => default_font 1422 #font => default_font
1281 #text => initial text 1423 #text => initial text
1282 #markup => initial narkup 1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1284 fontsize => 1, 1428 fontsize => 1,
1285 align => -1, 1429 align => -1,
1286 valign => -1, 1430 valign => -1,
1287 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1288 can_events => 0, 1433 can_events => 0,
1289 %arg 1434 %arg
1290 ); 1435 );
1291 1436
1292 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1302 } 1447 }
1303 1448
1304 $self 1449 $self
1305} 1450}
1306 1451
1307sub escape { 1452sub escape($) {
1308 local $_ = $_[1]; 1453 local $_ = $_[0];
1309 1454
1310 s/&/&amp;/g; 1455 s/&/&amp;/g;
1311 s/>/&gt;/g; 1456 s/>/&gt;/g;
1312 s/</&lt;/g; 1457 s/</&lt;/g;
1313 1458
1314 $_[1] 1459 $_
1315} 1460}
1316 1461
1317sub update { 1462sub update {
1318 my ($self) = @_; 1463 my ($self) = @_;
1319 1464
… …
1328 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1329 1474
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1332 1477
1478 $self->realloc;
1333 $self->update; 1479 $self->update;
1334 $self->check_size;
1335} 1480}
1336 1481
1337sub set_markup { 1482sub set_markup {
1338 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1339 1484
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1489
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1347 1492
1493 $self->realloc;
1348 $self->update; 1494 $self->update;
1349 $self->check_size;
1350} 1495}
1351 1496
1352sub size_request { 1497sub size_request {
1353 my ($self) = @_; 1498 my ($self) = @_;
1354 1499
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1505
1359 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1360 1507
1361 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1366 1513
1367 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1369 } 1516 }
1370 1517
1371 ( 1518 ($w, $h)
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1519}
1376 1520
1377sub size_allocate { 1521sub size_allocate {
1378 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1379 1523
1380 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1381} 1526}
1382 1527
1383sub set_fontsize { 1528sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1385 1530
1386 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1532 delete $self->{texture};
1388 1533
1389 $self->update; 1534 $self->realloc;
1390 $self->check_size;
1391} 1535}
1392 1536
1393sub _draw { 1537sub _draw {
1394 my ($self) = @_; 1538 my ($self) = @_;
1539
1540 $self->SUPER::_draw; # draw background, if applicable
1395 1541
1396 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1543 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1549
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1551
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1406 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1407 1555
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1410 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1411 1559
1412 $tex 1560 $tex
1413 }; 1561 };
1414 1562
… …
1443 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1444 can_hover => 1, 1592 can_hover => 1,
1445 can_focus => 1, 1593 can_focus => 1,
1446 valign => 0, 1594 valign => 0,
1447 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1448 @_ 1597 @_
1449 ) 1598 )
1450} 1599}
1451 1600
1452sub _set_text { 1601sub _set_text {
… …
1462 $self->{text} = $text; 1611 $self->{text} = $text;
1463 1612
1464 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1466 1615
1467 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1468} 1617}
1469 1618
1470sub set_text { 1619sub set_text {
1471 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1472 1621
1473 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1623 $self->_set_text ($text);
1475 $self->update; 1624
1476 $self->check_size; 1625 $self->realloc;
1477} 1626}
1478 1627
1479sub get_text { 1628sub get_text {
1480 $_[0]{text} 1629 $_[0]{text}
1481} 1630}
… …
1484 my ($self) = @_; 1633 my ($self) = @_;
1485 1634
1486 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1487 1636
1488 ($w + 1, $h) # add 1 for cursor 1637 ($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} 1638}
1496 1639
1497sub key_down { 1640sub key_down {
1498 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1499 1642
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1661 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1662 $self->_emit ('escape');
1520 } elsif ($uni) { 1663 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1665 }
1523 1666
1524 $self->_set_text ($text); 1667 $self->_set_text ($text);
1525 $self->update; 1668
1526 $self->check_size; 1669 $self->realloc;
1527} 1670}
1528 1671
1529sub focus_in { 1672sub focus_in {
1530 my ($self) = @_; 1673 my ($self) = @_;
1531 1674
… …
1611 if ($sym == 13) { 1754 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1617 $self->update; 1760 $self->update;
1618 1761
1619 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1658 1801
1659sub new { 1802sub new {
1660 my $class = shift; 1803 my $class = shift;
1661 1804
1662 $class->SUPER::new ( 1805 $class->SUPER::new (
1663 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1664 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1667 can_hover => 1, 1810 can_hover => 1,
1668 align => 0, 1811 align => 0,
1669 valign => 0, 1812 valign => 0,
1670 can_events => 1, 1813 can_events => 1,
1671 @_ 1814 @_
1672 ) 1815 )
1673} 1816}
1674 1817
1818sub activate { }
1819
1675sub button_up { 1820sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1677 1822
1823 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1826}
1683 1827
1684sub _draw { 1828sub _draw {
1685 my ($self) = @_; 1829 my ($self) = @_;
1686 1830
… …
1715 1859
1716sub new { 1860sub new {
1717 my $class = shift; 1861 my $class = shift;
1718 1862
1719 $class->SUPER::new ( 1863 $class->SUPER::new (
1720 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1721 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1870 state => 0,
1724 can_hover => 1, 1871 can_hover => 1,
1725 @_ 1872 @_
1726 ) 1873 )
1727} 1874}
1728 1875
1729sub size_request { 1876sub size_request {
1730 my ($self) = @_; 1877 my ($self) = @_;
1731 1878
1732 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1733} 1880}
1734 1881
1735sub button_down { 1882sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1737 1884
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1742 } 1889 }
1743} 1890}
1744 1891
1745sub _draw { 1892sub _draw {
1746 my ($self) = @_; 1893 my ($self) = @_;
1747 1894
1748 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1749 1896
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1898
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1902
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1904
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1906
… …
2019 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2169 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2027 vertical => 0, 2178 vertical => 0,
2028 can_hover => 1, 2179 can_hover => 1,
2029 inner_pad => .05, 2180 inner_pad => 0.02,
2030 @_ 2181 @_
2031 ); 2182 );
2032 2183
2033 $self->set_value ($self->{range}[0]); 2184 $self->set_value ($self->{range}[0]);
2034 $self->update; 2185 $self->update;
2035 2186
2036 $self 2187 $self
2037} 2188}
2038 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2039sub set_value { 2201sub set_value {
2040 my ($self, $value) = @_; 2202 my ($self, $value) = @_;
2041 2203
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2205
2044 $hi = $lo + 1 if $hi <= $lo; 2206 $hi = $lo + 1 if $hi <= $lo;
2045 2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2046 $value = $lo if $value < $lo; 2210 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2211 $value = $hi - $page if $value > $hi - $page;
2048 2212
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2214 if $unit;
2051 2215
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2217
2056 if ($value != $old_value) { 2218 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2219 $self->_emit (changed => $value);
2058 $self->update; 2220 $self->update;
2059 } 2221 }
2060} 2222}
2061 2223
2062sub size_request { 2224sub size_request {
2063 my ($self) = @_; 2225 my ($self) = @_;
2064 2226
2065 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2066 my $h = $self->{req_h};
2067
2068 $self->{vertical} ? ($h, $w) : ($w, $h)
2069} 2228}
2070 2229
2071sub button_down { 2230sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2073 2232
2074 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
2075 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2076} 2238}
2077 2239
2078sub mouse_motion { 2240sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2245
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2247
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2249
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2251 }
2090} 2252}
2091 2253
2092sub update { 2254sub update {
2093 my ($self) = @_; 2255 my ($self) = @_;
2094 2256
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2258 $self->set_value ($self->{range}[0]);
2097 2259
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2099 2262
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2264
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2267
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2268 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2269 $value = $value * $self->{scale} + $self->{offset};
2106 2270
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2272 $self->{knob_w} = $knob_w;
2114 }); 2273 });
2115 2274
2116 $self->SUPER::update; 2275 $self->SUPER::update;
2117} 2276}
2118 2277
… …
2124 glScale $self->{w}, $self->{h}; 2283 glScale $self->{w}, $self->{h};
2125 2284
2126 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2128 2287
2288 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2290 }
2132 2291
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2294
… …
2142 # draw handle 2301 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2303
2145 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2146} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
2147 2347
2148############################################################################# 2348#############################################################################
2149 2349
2150package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2151 2351
… …
2181 2381
2182 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2383 $self->reflow;
2184} 2384}
2185 2385
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2386sub size_allocate {
2206 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2207 2388
2208 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2209 2392
2210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2211 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2396
2214 $self->reflow; 2397 $self->reflow;
2215} 2398}
2216 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
2217sub add_paragraph { 2434sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2219 2436
2220 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2221 2438 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2225 2442
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $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]);
2229 $self->{children}[1]->update;
2230} 2444}
2231 2445
2232sub update { 2446sub update {
2233 my ($self) = @_; 2447 my ($self) = @_;
2234 2448
… …
2237 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2238 2452
2239 delete $self->{texture}; 2453 delete $self->{texture};
2240 2454
2241 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2242 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2459 my $height = 0;
2244 2460
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2246 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 }
2247 2476
2248 $self->{height} = $height; 2477 $self->{height} = $height;
2249 2478
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2480
2252 delete $self->{texture}; 2481 delete $self->{texture};
2253 } 2482 }
2254 2483
2255 $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 {
2256 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2258 2487
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2263 2489
2264 my $y0 = $top; 2490 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2266 2492
2267 my $y = 0; 2493 my $y = 0;
2268 2494
2269 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2270 2496
2271 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2272 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
2273 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2504 my $h = $par->[1];
2275 2505
2276 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2279 2510
2280 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 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;
2282 } 2515 }
2283 2516
2284 $y += $h; 2517 $y += $h;
2285 } 2518 }
2286 2519
2287 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2288 }; 2521 };
2289 }); 2522 });
2290} 2523}
2291 2524
2292sub _draw { 2525sub _draw {
2293 my ($self) = @_; 2526 my ($self) = @_;
2294 2527
2295 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2298 $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});
2299 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2300 2533
2301 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2302 2535
2303} 2536}
… …
2352 2585
2353sub new { 2586sub new {
2354 my $class = shift; 2587 my $class = shift;
2355 2588
2356 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2357 state => 0, 2590 state => 0,
2358 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2359 @_ 2592 @_
2360 ); 2593 );
2361 2594
2362 if ($self->{state}) {
2363 $self->{state} = 0;
2364 $self->toggle_flopper;
2365 }
2366
2367 $self 2595 $self
2368} 2596}
2369 2597
2370sub toggle_flopper { 2598sub toggle_flopper {
2371 my ($self) = @_; 2599 my ($self) = @_;
2372 2600
2373 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2374 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open");
2378 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close");
2381 }
2382
2383 $self->emit (changed => $self->{state});
2384} 2602}
2385 2603
2386############################################################################# 2604#############################################################################
2387 2605
2388package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2402 2620
2403sub set_tooltip_from { 2621sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2405 2623
2406 $self->add (new CFClient::UI::Label 2624 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2625 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2627 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2631 );
2413} 2632}
2414 2633
2415sub size_request { 2634sub size_request {
2416 my ($self) = @_; 2635 my ($self) = @_;
… …
2419 2638
2420 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2421} 2640}
2422 2641
2423sub size_allocate { 2642sub size_allocate {
2424 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2425 2644
2645 return unless $changed;
2646
2426 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2427} 2666}
2428 2667
2429sub _draw { 2668sub _draw {
2430 my ($self) = @_; 2669 my ($self) = @_;
2431 2670
… …
2448 glVertex $w, $h; 2687 glVertex $w, $h;
2449 glVertex $w, 0; 2688 glVertex $w, 0;
2450 glEnd; 2689 glEnd;
2451 2690
2452 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2453 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2454} 2694}
2455 2695
2456############################################################################# 2696#############################################################################
2457 2697
… …
2462use CFClient::OpenGL; 2702use CFClient::OpenGL;
2463 2703
2464sub new { 2704sub new {
2465 my $class = shift; 2705 my $class = shift;
2466 2706
2467 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2468 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2469 @_, 2710 @_,
2470 ) 2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2471} 2728}
2472 2729
2473sub size_request { 2730sub size_request {
2474 (32, 8) 2731 (32, 8)
2475} 2732}
2476 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2477sub _draw { 2742sub _draw {
2478 my ($self) = @_; 2743 my ($self) = @_;
2479 2744
2480 return unless $::CONN;#d# manage and cache textures differently 2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2757
2483 # TODO animation
2484 if ($tex) { 2758 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2490 } 2764 }
2491} 2765}
2492 2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2493############################################################################# 2776#############################################################################
2494 2777
2495package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2496 2779
2497our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2498 2781
2499sub new { 2782sub new {
2500 my $class = shift; 2783 my $class = shift;
2501 2784
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2526 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_, 2787 @_,
2585 ); 2788 );
2586 2789
2587 $self 2790 $self
2588} 2791}
… …
2598 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2599 } @$items; 2802 } @$items;
2600 2803
2601 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2602 2805
2806 my $row = 0;
2603 for my $item (@items) { 2807 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2808 CFClient::Item::update_widgets $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607 2809
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2609 } 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2610 2813
2611 $self->{scrolled}->add (@items); 2814 $row++;
2612 2815 }
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619} 2816}
2620 2817
2621############################################################################# 2818#############################################################################
2622 2819
2623package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2658 2855
2659# popup given the event (must be a mouse button down event currently) 2856# popup given the event (must be a mouse button down event currently)
2660sub popup { 2857sub popup {
2661 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2662 2859
2663 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2664 2861
2665 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2863 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2668 2865
2669 $self->show; 2866 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671} 2868}
2672 2869
2673sub mouse_motion { 2870sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2675 2872
… …
2683 2880
2684 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2882 undef $GRAB;
2686 $self->hide; 2883 $self->hide;
2687 2884
2688 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2690 } 2887 }
2691} 2888}
2692 2889
2693############################################################################# 2890#############################################################################
2694 2891
2695package CFClient::UI::Statusbox; 2892package CFClient::UI::Statusbox;
2696 2893
2697our @ISA = CFClient::UI::VBox::; 2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2698 2904
2699sub reorder { 2905sub reorder {
2700 my ($self) = @_; 2906 my ($self) = @_;
2701 my $NOW = time; 2907 my $NOW = time;
2702 2908
… …
2722 : $item->{text}; 2928 : $item->{text};
2723 2929
2724 for ($short) { 2930 for ($short) {
2725 s/^\s+//; 2931 s/^\s+//;
2726 s/\s+/ /g; 2932 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2933 }
2730 2934
2731 new CFClient::UI::Label 2935 new CFClient::UI::Label
2732 markup => $short, 2936 markup => $short,
2733 tooltip => $item->{tooltip}, 2937 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2938 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2939 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2942 fg => $item->{fg},
2738 can_events => 1, 2943 can_events => 1,
2739 can_hover => 1 2944 can_hover => 1
2740 }; 2945 };
2741 } 2946 }
… …
2747sub add { 2952sub add {
2748 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2749 2954
2750 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2752 2959
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2961
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2963
… …
2768 $self->{item}{$group} = { 2975 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2976 id => ++$self->{id},
2770 text => $text, 2977 text => $text,
2771 timeout => $timeout, 2978 timeout => $timeout,
2772 tooltip => $text, 2979 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2980 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2981 pri => 0,
2776 count => 1, 2982 count => 1,
2777 %arg, 2983 %arg,
2778 }; 2984 };
2779 } 2985 }
2780 2986
2781 $self->reorder; 2987 $self->reorder;
2782} 2988}
2783 2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
2784############################################################################# 3000#############################################################################
2785 3001
2786package CFClient::UI::Root; 3002package CFClient::UI::Root;
2787 3003
2788our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
… …
2790use CFClient::OpenGL; 3006use CFClient::OpenGL;
2791 3007
2792sub new { 3008sub new {
2793 my $class = shift; 3009 my $class = shift;
2794 3010
2795 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2796 @_, 3013 @_,
2797 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2798} 3019}
2799 3020
2800sub configure { 3021sub configure {
2801 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2802 3023
2803 $self->{w} = $w; 3024 $self->{w} = $w;
2804 $self->{h} = $h; 3025 $self->{h} = $h;
2805} 3026}
2806 3027
2807sub check_size { 3028sub reconfigure {
2808 my ($self) = @_; 3029 my ($self) = @_;
2809 3030
3031 $self->SUPER::reconfigure;
3032
2810 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2811 if $self->{w}; 3034 if $self->{w};
2812} 3035}
2813 3036
2814sub size_request { 3037sub size_request {
2815 my ($self) = @_; 3038 my ($self) = @_;
2816 3039
2817 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2818} 3041}
2819 3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
2820sub size_allocate { 3057sub size_allocate {
2821 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828 3059
2829 for my $child ($self->children) { 3060 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831 3062
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
2833 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
2834 3065
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
2836 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840 3068
2841 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2842 } 3070 }
2843} 3071}
2844 3072
… …
2855} 3083}
2856 3084
2857sub update { 3085sub update {
2858 my ($self) = @_; 3086 my ($self) = @_;
2859 3087
2860 $self->check_size;
2861 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
2862} 3089}
2863 3090
2864sub add { 3091sub add {
2865 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
2866 3093
2867 for my $child (@children) {
2868 $child->{toplevel} = 1; 3094 $_->{is_toplevel} = 1
2869 3095 for @children;
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874 3096
2875 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2876} 3113}
2877 3114
2878sub on_refresh { 3115sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2880 3117
… …
2893 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2894 $_->() 3131 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
2896 } 3133 }
2897 3134
2898 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
2899 my @queue = ([], []); 3136 my @queue;
2900 3137
2901 for (;;) { 3138 while () {
2902 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
2903 # heuristic: check containers last 3140 #TODO use array-of-depth approach
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
2905 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
2906 } 3144 }
2907 3145
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
2909 3147
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
2911 ? @$widget{qw(user_w user_h)} 3149
2912 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
2913 3151
2914 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
2917 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
2918 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
2920 3160
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2922 3162
2923 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
2924 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2925 }
2926 } 3165 }
2927 } 3166 }
2928 3167
2929 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2931 my ($widget, $w, $h) = @$_; 3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
2932 3177
2933 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
2935 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
2936 $widget->{w} = $w; 3186 $widget->{w} = $w;
2937 $widget->{h} = $h; 3187 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h); 3188
2939 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
2940 } 3190 }
2941 } 3191 }
2942 3192
2943 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
2944 $_->() 3194 $_->()
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2951 3201
2952 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3203 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3206 glLoadIdentity;
2957 3207
2958 $self->_draw; 3208 $self->_draw;
2959} 3209}
… …
2961############################################################################# 3211#############################################################################
2962 3212
2963package CFClient::UI; 3213package CFClient::UI;
2964 3214
2965$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3217
29681 32181
2969 3219

Diff Legend

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