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

Diff Legend

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