ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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