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

Diff Legend

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