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

Diff Legend

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