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

Diff Legend

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