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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
237 $self->{w} = $w; 363 $self->{alloc_w} = $w;
238 $self->{h} = $h; 364 $self->{alloc_h} = $h;
239 365
240 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 367 }
244} 368}
245 369
246sub size_allocate { 370sub size_allocate {
247 # nothing to be done 371 # nothing to be done
248} 372}
249 373
250sub children { 374sub children {
251} 375}
252 376
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 377sub set_max_size {
264 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
265 379
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 382}
269 383
270# return top left coordinates 384sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
273 386
274 $self->{parent} 387 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
276 389
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
278} 398}
279 399
280# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
281sub coord2local { 401sub coord2local {
282 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
283 403
284 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 405}
287 406
288# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
289sub coord2global { 408sub coord2global {
290 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
291 410
292 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 412}
295 413
296sub focus_in { 414sub focus_in {
297 my ($self) = @_; 415 my ($self) = @_;
298 416
299 return if $FOCUS == $self; 417 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
301 419
302 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
303 421
304 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
305 423
306 $focus->update if $focus; 424 $focus->update if $focus;
307 $FOCUS->update; 425 $FOCUS->update;
308} 426}
309 427
… …
312 430
313 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
314 432
315 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
316 434
317 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
318 436
319 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
320} 441}
321 442
322sub mouse_motion { } 443sub mouse_motion { }
323sub button_up { } 444sub button_up { }
324sub key_down { } 445sub key_down { }
325sub key_up { } 446sub key_up { }
326 447
327sub button_down { 448sub button_down {
328 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
329 450
330 $self->focus_in; 451 $self->focus_in;
… …
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
338 529
339sub draw { 530sub draw {
340 my ($self) = @_; 531 my ($self) = @_;
341 532
342 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
359 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
360 glEnd; 551 glEnd;
361 glDisable GL_BLEND; 552 glDisable GL_BLEND;
362 } 553 }
363 554
364 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
365 glPushMatrix; 556 glPushMatrix;
366 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 560 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
373 glEnd; 564 glEnd;
374 glPopMatrix; 565 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 567 }
377} 568}
378 569
379sub _draw { 570sub _draw {
380 my ($self) = @_; 571 my ($self) = @_;
381 572
382 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
383} 574}
384 575
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 576sub DESTROY {
449 my ($self) = @_; 577 my ($self) = @_;
450 578
579 delete $WIDGET{$self+0};
451 #$self->deactivate; 580 #$self->deactivate;
452} 581}
453 582
454############################################################################# 583#############################################################################
455 584
… …
464 my $class = shift; 593 my $class = shift;
465 594
466 # range [value, low, high, page] 595 # range [value, low, high, page]
467 596
468 $class->SUPER::new ( 597 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
471 @_ 600 @_
472 ) 601 )
473} 602}
474 603
475sub _draw { 604sub _draw {
476 my ($self) = @_; 605 my ($self) = @_;
477 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
479 613
480 glEnable GL_BLEND; 614 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
483 617
484 glBegin GL_QUADS; 618 glBegin GL_QUADS;
485 glVertex 0 , 0; 619 glVertex 0 , 0;
486 glVertex 0 , $h; 620 glVertex 0 , $h;
487 glVertex $w, $h; 621 glVertex $w, $h;
488 glVertex $w, 0; 622 glVertex $w, 0;
489 glEnd; 623 glEnd;
490 624
491 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
492} 627}
493 628
494############################################################################# 629#############################################################################
495 630
496package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
501 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
503} 638}
504 639
505sub size_request { 640sub size_request {
506 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
507} 644}
508 645
509sub draw { } 646sub draw { }
510 647
511############################################################################# 648#############################################################################
… …
528 665
529 $self 666 $self
530} 667}
531 668
532sub add { 669sub add {
533 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
534 671
535 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
536 674
537 use sort 'stable'; 675 use sort 'stable';
538 676
539 $self->{children} = [ 677 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
542 ]; 680 ];
543 681
544 $child->check_size; 682 $self->realloc;
545 $self->update;
546} 683}
547 684
548sub children { 685sub children {
549 @{ $_[0]{children} } 686 @{ $_[0]{children} }
550} 687}
… …
555 delete $child->{parent}; 692 delete $child->{parent};
556 $child->hide; 693 $child->hide;
557 694
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 696
560 $self->check_size; 697 $self->realloc;
561 $self->update;
562} 698}
563 699
564sub clear { 700sub clear {
565 my ($self) = @_; 701 my ($self) = @_;
566 702
… …
570 for (@$children) { 706 for (@$children) {
571 delete $_->{parent}; 707 delete $_->{parent};
572 $_->hide; 708 $_->hide;
573 } 709 }
574 710
575 $self->check_size; 711 $self->realloc;
576 $self->update;
577} 712}
578 713
579sub find_widget { 714sub find_widget {
580 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
581 716
… …
656} 791}
657 792
658sub update { 793sub update {
659 my ($self) = @_; 794 my ($self) = @_;
660 795
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 797 $self->SUPER::update;
663} 798}
664 799
665sub size_allocate { 800sub size_allocate {
666 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
682 817
683 $self->_render; 818 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 819 };
692} 820}
693 821
694sub _draw { 822sub _draw {
695 my ($self) = @_; 823 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
698 826
699 my $tex = $self->{texture} 827 my $tex = $self->{texture}
700 or return; 828 or return;
701 829
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
707 833
708 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 835
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
712} 837}
713 838
714############################################################################# 839#############################################################################
715 840
716package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
717 842
718our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
719 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
720sub size_request { 855sub size_request {
721 my ($self) = @_; 856 my ($self) = @_;
722 857
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 859
726 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
727} 864}
728 865
729sub size_allocate { 866sub size_allocate {
730 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
731 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
732 $self->update; 875 $self->update;
733} 876}
734 877
735sub set_offset { 878sub set_offset {
736 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 882 $self->{view_y} = int $y;
740 883
741 $self->update; 884 $self->update;
742} 885}
743 886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
744sub _render { 915sub _render {
745 my ($self) = @_; 916 my ($self) = @_;
746 917
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 919
… …
759 my $class = shift; 930 my $class = shift;
760 931
761 my $self; 932 my $self;
762 933
763 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
764 vertical => 1, 935 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 937 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
768 }, 939 },
769 ; 940 ;
770 941
771 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 944 slider => $slider,
774 @_, 945 @_,
775 ); 946 );
776 947
777 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
780 951
781 $self 952 $self
782} 953}
783 954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
784#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 975# update viewport offset on scroll
786 976
787############################################################################# 977#############################################################################
788 978
789package CFClient::UI::Frame; 979package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 983use CFClient::OpenGL;
794 984
795sub new { 985sub new {
796 my $class = shift; 986 my $class = shift;
797 987
798 my $self = $class->SUPER::new ( 988 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 989 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 990 @_,
803 ); 991 )
804
805 $self
806} 992}
807 993
808sub _draw { 994sub _draw {
809 my ($self) = @_; 995 my ($self) = @_;
810 996
811 my ($w, $h) = ($self->{w}, $self->{h}); 997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
812 999
813 glEnable GL_BLEND; 1000 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 1002 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 1003
818# glBegin GL_QUADS; 1004 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 1005 glVertex 0 , 0;
821# glVertex 0 , $h; 1006 glVertex 0 , $h;
822# glVertex $w, $h; 1007 glVertex $w, $h;
823# glVertex $w, 0; 1008 glVertex $w, 0;
824# glEnd; 1009 glEnd;
825 1010
826
827 $self->child->draw;
828 glDisable GL_BLEND; 1011 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 1012 }
1013
1014 $self->SUPER::_draw;
830} 1015}
831 1016
832############################################################################# 1017#############################################################################
833 1018
834package CFClient::UI::FancyFrame; 1019package CFClient::UI::FancyFrame;
835 1020
836our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
837 1022
838use CFClient::OpenGL; 1023use CFClient::OpenGL;
839 1024
840my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
842 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
843 1032
844sub new { 1033sub new {
845 my $class = shift; 1034 my $class = shift;
846 1035
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
852 border => 0.6, 1039 border => 0.6,
853 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
854 @_ 1043 @_
855 ); 1044 );
856 1045
857 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 1047 align => 0,
… …
882 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
883 1072
884 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
886 1075
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 1077 if $self->{title};
889 1078
890 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
891} 1080}
892 1081
… …
911 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
912 1101
913 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
915 1104
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
919 $self->check_size;
920 }; 1110 };
921 1111
922 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
924 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
926 $self->{motion} = sub { 1116 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
928 1118
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
930 1120
931 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
932 $self->update;
933 }; 1122 };
934 } 1123 }
935} 1124}
936 1125
937sub button_up { 1126sub button_up {
… …
950 my ($self) = @_; 1139 my ($self) = @_;
951 1140
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1143
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1146
960 my $border = $self->border; 1147 my $border = $self->border;
961 1148
962 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1154
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
970 1157
971 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
972 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
973 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
974
975 glColor @{ $self->{bg} };
976
977 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
981 1164
982 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1166
986 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
987 1168
988 $self->child->draw; 1169 $self->child->draw;
989} 1170}
… …
1001sub new { 1182sub new {
1002 my $class = shift; 1183 my $class = shift;
1003 1184
1004 $class->SUPER::new ( 1185 $class->SUPER::new (
1005 col_expand => [], 1186 col_expand => [],
1006 @_ 1187 @_,
1007 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1193}
1009 1194
1010sub add { 1195sub add {
1011 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1012 1197
1013 $child->set_parent ($self); 1198 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1015 1200
1016 $child->check_size; 1201 $self->realloc;
1017} 1202}
1018 1203
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1024sub clear { 1205sub clear {
1025 my ($self) = @_; 1206 my ($self) = @_;
1026 1207
1027 my @children = $self->children; 1208 my @children = $self->children;
1028 delete $self->{children}; 1209 delete $self->{children};
… …
1030 for (@children) { 1211 for (@children) {
1031 delete $_->{parent}; 1212 delete $_->{parent};
1032 $_->hide; 1213 $_->hide;
1033 } 1214 }
1034 1215
1035 $self->update; 1216 $self->realloc;
1036} 1217}
1037 1218
1038sub get_wh { 1219sub get_wh {
1039 my ($self) = @_; 1220 my ($self) = @_;
1040 1221
… …
1071sub size_allocate { 1252sub size_allocate {
1072 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1073 1254
1074 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1075 1256
1076 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1078 1259
1079 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1317 }
1137} 1318}
1138 1319
1139############################################################################# 1320#############################################################################
1140 1321
1141package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1142
1143# TODO: wrap into common Box base class
1144 1323
1145our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1146 1325
1147sub size_request { 1326sub size_request {
1148 my ($self) = @_; 1327 my ($self) = @_;
1149 1328
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1151 1330 ? (
1152 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1153 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1154 (List::Util::max map $_->[1], @alloc), 1333 )
1155 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1156} 1338}
1157 1339
1158sub size_allocate { 1340sub size_allocate {
1159 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1160 1342
1161 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1162
1163 my $children = $self->{children}; 1344 my $children = $self->{children};
1164 1345
1165 my @h = map $_->{req_w}, @$children; 1346 my @req;
1166 1347
1167 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1168 1349 @req = ($space / (@$children || 1)) x @$children;
1169 if ($req_h > $h) {
1170 # ah well, not enough space
1171 $_ *= $h / $req_h for @h;
1172 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1174 $exp ||= 1;
1175 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1176 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 } 1364 }
1183 } 1365 }
1184 1366
1185 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1186 1368
1187 my $y = 0; 1369 my $pos = 0;
1188 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1191 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1192 1373
1193 $y += $h; 1374 $pos += $alloc;
1194 } 1375 }
1195 1376
1196 1 1377 1
1197} 1378}
1198 1379
1199############################################################################# 1380#############################################################################
1200 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1201package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1202 1398
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1206 1400
1207sub size_request { 1401sub new {
1208 my ($self) = @_; 1402 my $class = shift;
1209 1403
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1211 1405 vertical => 1,
1212 ( 1406 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1407 )
1216} 1408}
1217 1409
1218sub size_allocate {
1219 my ($self, $w, $h) = @_;
1220
1221 my $children = $self->{children};
1222
1223 my @h = map $_->{req_h}, @$children;
1224
1225 my $req_h = List::Util::sum @h;
1226
1227 if ($req_h > $h) {
1228 # ah well, not enough space
1229 $_ *= $h / $req_h for @h;
1230 } else {
1231 my $exp = List::Util::sum map $_->{expand}, @$children;
1232 $exp ||= 1;
1233
1234 for (0 .. $#$children) {
1235 my $child = $children->[$_];
1236
1237 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure (0, $y, $w, $h);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1410#############################################################################
1256 1411
1257package CFClient::UI::Label; 1412package CFClient::UI::Label;
1258 1413
1259our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1260 1415
1261use CFClient::OpenGL; 1416use CFClient::OpenGL;
1262 1417
1263sub new { 1418sub new {
1264 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1265 1420
1266 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1268 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1269 fontsize => 1, 1431 fontsize => 1,
1270 text => "",
1271 align => -1, 1432 align => -1,
1272 valign => -1, 1433 valign => -1,
1273 padding => 2, 1434 padding_x => 2,
1274 layout => new CFClient::Layout, 1435 padding_y => 2,
1275 can_events => 0, 1436 can_events => 0,
1276 %arg 1437 %arg
1277 ); 1438 );
1278 1439
1279 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1443 $self->{template} = $layout;
1283 } 1444 }
1284 1445
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1287 1451
1288 $self 1452 $self
1289} 1453}
1290 1454
1291sub escape { 1455sub escape($) {
1292 local $_ = $_[1]; 1456 local $_ = $_[0];
1293 1457
1294 s/&/&amp;/g; 1458 s/&/&amp;/g;
1295 s/>/&gt;/g; 1459 s/>/&gt;/g;
1296 s/</&lt;/g; 1460 s/</&lt;/g;
1297 1461
1298 $_[1] 1462 $_
1299} 1463}
1300 1464
1301sub update { 1465sub update {
1302 my ($self) = @_; 1466 my ($self) = @_;
1303 1467
1304 delete $self->{texture}; 1468 delete $self->{texture};
1305 $self->SUPER::update; 1469 $self->SUPER::update;
1306} 1470}
1307 1471
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1472sub set_text {
1315 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1316 1474
1317 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1319 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1321 1480
1322 delete $self->{texture}; 1481 $self->realloc;
1323 $self->update; 1482 $self->update;
1324 $self->check_size;
1325} 1483}
1326 1484
1327sub set_markup { 1485sub set_markup {
1328 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1329 1487
1330 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1332 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1334 1495
1335 delete $self->{texture}; 1496 $self->realloc;
1336 $self->update; 1497 $self->update;
1337 $self->check_size;
1338} 1498}
1339 1499
1340sub size_request { 1500sub size_request {
1341 my ($self) = @_; 1501 my ($self) = @_;
1342 1502
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1508
1347 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1348 1510
1349 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1354 1516
1355 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1356 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1357 } 1519 }
1358 1520
1359 ( 1521 ($w, $h)
1360 $w + $self->{padding} * 2,
1361 $h + $self->{padding} * 2,
1362 )
1363} 1522}
1364 1523
1365sub size_allocate { 1524sub size_allocate {
1366 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1367 1526
1368 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1369} 1529}
1370 1530
1371sub set_fontsize { 1531sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1373 1533
1374 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1535 delete $self->{texture};
1376 $self->check_size; 1536
1377 $self->update; 1537 $self->realloc;
1378} 1538}
1379 1539
1380sub _draw { 1540sub _draw {
1381 my ($self) = @_; 1541 my ($self) = @_;
1382 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1383 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1387 new_from_layout CFClient::Texture $self->{layout} 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1554
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5);
1558
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1388 }; 1564 };
1389 1565
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1568
1569 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1410 1575
1411 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1577}
1414 1578
1415############################################################################# 1579#############################################################################
1416 1580
1417package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1431 can_hover => 1, 1595 can_hover => 1,
1432 can_focus => 1, 1596 can_focus => 1,
1433 valign => 0, 1597 valign => 0,
1434 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1435 @_ 1600 @_
1436 ) 1601 )
1437} 1602}
1438 1603
1439sub _set_text { 1604sub _set_text {
… …
1449 $self->{text} = $text; 1614 $self->{text} = $text;
1450 1615
1451 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1453 1618
1454 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1620}
1621
1622sub set_text {
1623 my ($self, $text) = @_;
1624
1625 $self->{cursor} = length $text;
1626 $self->_set_text ($text);
1627
1628 $self->realloc;
1455} 1629}
1456 1630
1457sub get_text { 1631sub get_text {
1458 $_[0]{text} 1632 $_[0]{text}
1459} 1633}
… …
1462 my ($self) = @_; 1636 my ($self) = @_;
1463 1637
1464 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1465 1639
1466 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1641}
1482 1642
1483sub key_down { 1643sub key_down {
1484 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1485 1645
… …
1487 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1489 1649
1490 my $text = $self->get_text; 1650 my $text = $self->get_text;
1491 1651
1492 if ($sym == 8) { 1652 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1665 $self->_emit ('escape');
1506 } elsif ($uni) { 1666 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1668 }
1509 1669
1510 $self->_set_text ($text); 1670 $self->_set_text ($text);
1511 $self->update; 1671
1672 $self->realloc;
1512} 1673}
1513 1674
1514sub focus_in { 1675sub focus_in {
1515 my ($self) = @_; 1676 my ($self) = @_;
1516 1677
… …
1596 if ($sym == 13) { 1757 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1602 $self->update; 1763 $self->update;
1603 1764
1604 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1643 1804
1644sub new { 1805sub new {
1645 my $class = shift; 1806 my $class = shift;
1646 1807
1647 $class->SUPER::new ( 1808 $class->SUPER::new (
1648 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1649 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1652 can_hover => 1, 1813 can_hover => 1,
1653 align => 0, 1814 align => 0,
1654 valign => 0, 1815 valign => 0,
1655 can_events => 1, 1816 can_events => 1,
1656 @_ 1817 @_
1657 ) 1818 )
1658} 1819}
1659 1820
1821sub activate { }
1822
1660sub button_up { 1823sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1662 1825
1826 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1829}
1668 1830
1669sub _draw { 1831sub _draw {
1670 my ($self) = @_; 1832 my ($self) = @_;
1671 1833
… …
1673 1835
1674 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1676 } 1838 }
1677 1839
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1683 1843
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1845
1686 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1847
1689 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1690} 1849}
1691 1850
1692############################################################################# 1851#############################################################################
… …
1703 1862
1704sub new { 1863sub new {
1705 my $class = shift; 1864 my $class = shift;
1706 1865
1707 $class->SUPER::new ( 1866 $class->SUPER::new (
1708 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1709 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1873 state => 0,
1712 can_hover => 1, 1874 can_hover => 1,
1713 @_ 1875 @_
1714 ) 1876 )
1715} 1877}
1716 1878
1717sub size_request { 1879sub size_request {
1718 my ($self) = @_; 1880 my ($self) = @_;
1719 1881
1720 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1721} 1883}
1722 1884
1723sub button_down { 1885sub button_down {
1724 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1725 1887
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1728 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1730 } 1892 }
1731} 1893}
1732 1894
1733sub _draw { 1895sub _draw {
1734 my ($self) = @_; 1896 my ($self) = @_;
1735 1897
1736 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1737 1899
1738 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1739 1901
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1741 1905
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1907
1744 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1745 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1913}
1755 1914
1756############################################################################# 1915#############################################################################
1757 1916
1758package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1802 1961
1803 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1804 } 1963 }
1805 1964
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1967
1811 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1969
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1815} 1971}
1816 1972
1817############################################################################# 1973#############################################################################
1818 1974
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
2008 2164
2009sub new { 2165sub new {
2010 my $class = shift; 2166 my $class = shift;
2011 2167
2012 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
2013 2169
2014 # TODO: 0-width page 2170 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2172 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2023 vertical => 0, 2181 vertical => 0,
2024 can_hover => 1, 2182 can_hover => 1,
2025 inner_pad => 5, 2183 inner_pad => 0.02,
2026 @_ 2184 @_
2027 ); 2185 );
2028 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
2029 $self 2190 $self
2030} 2191}
2031 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
2032sub size_request { 2227sub size_request {
2033 my ($self) = @_; 2228 my ($self) = @_;
2034 2229
2035 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2036 my $h = $self->{req_h};
2037
2038 $self->{vertical} ? ($h, $w) : ($w, $h)
2039} 2231}
2040 2232
2041sub button_down { 2233sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2043 2235
2044 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
2045 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
2046} 2241}
2047 2242
2048sub mouse_motion { 2243sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
2050 2245
2051 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2053 2265
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2267
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2270
2059 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2273
2065 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2275 $self->{knob_w} = $knob_w;
2067 } 2276 });
2068}
2069 2277
2070# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2279}
2077 2280
2078sub _draw { 2281sub _draw {
2079 my ($self) = @_; 2282 my ($self) = @_;
2080 2283
2081 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
2082 2285
2083 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
2084 2287
2085 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2087 2290
2291 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2293 }
2093 2294
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2297
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2300
2120 # draw background 2301 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2303
2123 # draw handle 2304 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2306
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2128} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2129 2350
2130############################################################################# 2351#############################################################################
2131 2352
2132package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2133 2354
… …
2142 fontsize => 1, 2363 fontsize => 1,
2143 can_events => 0, 2364 can_events => 0,
2144 #font => default_font 2365 #font => default_font
2145 @_, 2366 @_,
2146 2367
2147 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
2148 par => [], 2369 par => [],
2149 height => 0, 2370 height => 0,
2150 children => [ 2371 children => [
2151 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
… …
2163 2384
2164 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2386 $self->reflow;
2166} 2387}
2167 2388
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_text ($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 { 2389sub size_allocate {
2188 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2189 2391
2190 $self->SUPER::size_allocate ($w, $h); 2392 $self->SUPER::size_allocate ($w, $h);
2191 2393
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2397
2196 $self->reflow; 2398 $self->reflow;
2197} 2399}
2198 2400
2401sub text_size {
2402 my ($self, $text, $indent) = @_;
2403
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2408 $layout->set_markup ($text);
2409
2410 $layout->size
2411}
2412
2413sub reflow {
2414 my ($self) = @_;
2415
2416 $self->{need_reflow}++;
2417 $self->update;
2418}
2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2199sub add_paragraph { 2435sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2201 2437
2202 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2203 2439 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2207 2443
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2445}
2213 2446
2214sub update { 2447sub update {
2215 my ($self) = @_; 2448 my ($self) = @_;
2216 2449
… …
2218 2451
2219 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2220 2453
2221 delete $self->{texture}; 2454 delete $self->{texture};
2222 2455
2223 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2224 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2460 my $height = 0;
2226 2461
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2228 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2229 2477
2230 $self->{height} = $height; 2478 $self->{height} = $height;
2231 2479
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2481
2234 delete $self->{texture}; 2482 delete $self->{texture};
2235 } 2483 }
2236 2484
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2240 2488
2489 my $top = int $self->{children}[1]{range}[0];
2490
2491 my $y0 = $top;
2492 my $y1 = $top + $H;
2493
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
2241 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0];
2247
2248 my $y0 = $top;
2249 my $y1 = $top + $self->{h};
2250
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256 2503
2257 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2505 my $h = $par->[1];
2259 2506
2260 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2262 2511
2263 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2513
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2516 }
2267 2517
2268 $y += $h; 2518 $y += $h;
2269 } 2519 }
2270 2520
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
2273 }; 2522 };
2274 }); 2523 });
2275} 2524}
2276 2525
2277sub _draw { 2526sub _draw {
2278 my ($self) = @_; 2527 my ($self) = @_;
2279 2528
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2534
2289 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2290 2536
2291} 2537}
2292 2538
… …
2340 2586
2341sub new { 2587sub new {
2342 my $class = shift; 2588 my $class = shift;
2343 2589
2344 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2345 state => 0, 2591 state => 0,
2346 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2347 @_ 2593 @_
2348 ); 2594 );
2349 2595
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2596 $self
2356} 2597}
2357 2598
2358sub toggle_flopper { 2599sub toggle_flopper {
2359 my ($self) = @_; 2600 my ($self) = @_;
2360 2601
2361 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2362 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open");
2366 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close");
2369 }
2370
2371 $self->emit (changed => $self->{state});
2372} 2603}
2373 2604
2374############################################################################# 2605#############################################################################
2375 2606
2376package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2386 @_, 2617 @_,
2387 can_events => 0, 2618 can_events => 0,
2388 ) 2619 )
2389} 2620}
2390 2621
2391sub set_markup { 2622sub set_tooltip_from {
2392 my ($self, $text) = @_; 2623 my ($self, $widget) = @_;
2393 2624
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2625 my $tooltip = $widget->{tooltip};
2395 $self->{label}->set_markup ($text); 2626
2396 $self->add ($self->{label}); 2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2634 $self->add (new CFClient::UI::Label
2635 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8,
2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 );
2397} 2642}
2398 2643
2399sub size_request { 2644sub size_request {
2400 my ($self) = @_; 2645 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2646
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2648
2406 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2407} 2650}
… …
2410 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2411 2654
2412 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2413} 2656}
2414 2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2674}
2675
2415sub _draw { 2676sub _draw {
2416 my ($self) = @_; 2677 my ($self) = @_;
2417 2678
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2679 glTranslate 0.375, 0.375;
2420 2680
2421 my ($w, $h) = @$self{qw(w h)}; 2681 my ($w, $h) = @$self{qw(w h)};
2422 2682
2423 glColor 1, 0.8, 0.4; 2683 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2694 glVertex 0 , $h;
2435 glVertex $w, $h; 2695 glVertex $w, $h;
2436 glVertex $w, 0; 2696 glVertex $w, 0;
2437 glEnd; 2697 glEnd;
2438 2698
2439 glPopMatrix; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2440 2700
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2443} 2702}
2444 2703
2445############################################################################# 2704#############################################################################
2446 2705
… …
2451use CFClient::OpenGL; 2710use CFClient::OpenGL;
2452 2711
2453sub new { 2712sub new {
2454 my $class = shift; 2713 my $class = shift;
2455 2714
2456 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2457 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2458 @_, 2718 @_,
2459 ) 2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2460} 2736}
2461 2737
2462sub size_request { 2738sub size_request {
2463 (32, 8) 2739 (32, 8)
2464} 2740}
2465 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2466sub _draw { 2750sub _draw {
2467 my ($self) = @_; 2751 my ($self) = @_;
2468 2752
2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2765
2471 # TODO animation
2472 if ($tex) { 2766 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2482} 2782}
2483 2783
2484############################################################################# 2784#############################################################################
2485 2785
2486package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
… …
2521 2821
2522# popup given the event (must be a mouse button down event currently) 2822# popup given the event (must be a mouse button down event currently)
2523sub popup { 2823sub popup {
2524 my ($self, $ev) = @_; 2824 my ($self, $ev) = @_;
2525 2825
2526 $self->emit ("popdown"); 2826 $self->_emit ("popdown");
2527 2827
2528 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2829 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2531 2831
2532 $self->show; 2832 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534} 2834}
2535 2835
2536sub mouse_motion { 2836sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2538 2838
… …
2546 2846
2547 if ($ev->{button} == $self->{button}) { 2847 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2848 undef $GRAB;
2549 $self->hide; 2849 $self->hide;
2550 2850
2551 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2852 $self->{hover}[1]->() if $self->{hover};
2553 } 2853 }
2554} 2854}
2555 2855
2556############################################################################# 2856#############################################################################
2557 2857
2858package CFClient::UI::Statusbox;
2859
2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2870
2871sub reorder {
2872 my ($self) = @_;
2873 my $NOW = time;
2874
2875 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 }
2878
2879 my @widgets;
2880
2881 my @items = sort {
2882 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} };
2885
2886 my $count = 10 + 1;
2887 for my $item (@items) {
2888 last unless --$count;
2889
2890 push @widgets, $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text};
2895
2896 for ($short) {
2897 s/^\s+//;
2898 s/\s+/ /g;
2899 }
2900
2901 new CFClient::UI::Label
2902 markup => $short,
2903 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg},
2909 can_events => 1,
2910 can_hover => 1
2911 };
2912 }
2913
2914 $self->clear;
2915 $self->SUPER::add (reverse @widgets);
2916}
2917
2918sub add {
2919 my ($self, $text, %arg) = @_;
2920
2921 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2925
2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2927
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929
2930 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) {
2932 $item->{count}++;
2933 } else {
2934 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text;
2936 }
2937 $item->{id} = ++$self->{id};
2938 $item->{timeout} = $timeout;
2939 delete $item->{label};
2940 } else {
2941 $self->{item}{$group} = {
2942 id => ++$self->{id},
2943 text => $text,
2944 timeout => $timeout,
2945 tooltip => $text,
2946 fg => [0.8, 0.8, 0.8, 0.8],
2947 pri => 0,
2948 count => 1,
2949 %arg,
2950 };
2951 }
2952
2953 $self->reorder;
2954}
2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2964}
2965
2966#############################################################################
2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2558package CFClient::UI::Root; 3259package CFClient::UI::Root;
2559 3260
2560our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2561 3262
2562use CFClient::OpenGL; 3263use CFClient::OpenGL;
2563 3264
2564sub check_size { 3265sub new {
2565 my ($self) = @_; 3266 my $class = shift;
2566 3267
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2568} 3276}
2569 3277
2570sub size_request { 3278sub size_request {
2571 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2572}
2573 3280
2574sub configure { 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
3296}
3297
3298sub size_allocate {
2575 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2576 3300
2577 $self->SUPER::configure ($x, $y, $w, $h);
2578
2579 for my $child (@{$self->{children}}) { 3301 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3303
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3304 $X = $child->{force_x} if exists $child->{force_x};
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3306
3307 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h};
3309
2584 $child->configure ($X, $Y, $W,$H); 3310 $child->configure ($X, $Y, $W, $H);
2585 } 3311 }
2586} 3312}
2587 3313
2588sub _topleft { 3314sub coord2local {
2589 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2590 3316
2591 ($x, $y) 3317 ($x, $y)
2592} 3318}
2593 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2594sub update { 3326sub update {
2595 my ($self) = @_; 3327 my ($self) = @_;
2596 3328
2597 $self->check_size; 3329 $::WANT_REFRESH++;
2598 ::refresh ();
2599} 3330}
2600 3331
2601sub add { 3332sub add {
2602 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2603 3334
2604 # integerize window positions 3335 $_->{is_toplevel} = 1
2605 $child->{x} = int $child->{x}; 3336 for @children;
2606 $child->{y} = int $child->{y};
2607 3337
2608 $self->SUPER::add ($child); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2609} 3354}
2610 3355
2611sub on_refresh { 3356sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2613 3358
2614 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2615} 3360}
2616 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2617sub draw { 3368sub draw {
2618 my ($self) = @_; 3369 my ($self) = @_;
2619 3370
2620 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2622 } 3374 }
3375
3376 if ($self->{realloc}) {
3377 my @queue;
3378
3379 while () {
3380 if ($self->{realloc}) {
3381 #TODO use array-of-depth approach
3382
3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3387 }
3388
3389 my $widget = pop @queue || last;
3390
3391 $widget->{visible} or last; # do not resize invisible widgets
3392
3393 my ($w, $h) = $widget->size_request;
3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3417 }
3418 }
3419
3420 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428
3429 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0;
3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3436 $widget->{w} = $w;
3437 $widget->{h} = $h;
3438
3439 $widget->emit (size_allocate => $w, $h);
3440 }
3441 }
3442 }
3443
3444 while ($self->{post_alloc_hook}) {
3445 $_->()
3446 for values %{delete $self->{post_alloc_hook}};
3447 }
3448
2623 3449
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2627 3453
2628 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3455 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3458 glLoadIdentity;
2633 3459
2634 $self->_draw; 3460 $self->_draw;
2635} 3461}
2636 3462
2637############################################################################# 3463#############################################################################
2638 3464
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI; 3465package CFClient::UI;
2745 3466
2746$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2747$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2748 3469
27491 34701
2750 3471

Diff Legend

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