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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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 ();
8use Event;
7 9
8use CFClient; 10use CFClient;
11use CFClient::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
23 32
24 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
25 34
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 36
28 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 38 $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 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
66 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
67 90
68 $GRAB = $widget; 91 $GRAB = $widget;
69 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
70 93
71 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
136} 153}
137 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
138############################################################################# 196#############################################################################
139 197
140package CFClient::UI::Base; 198package CFClient::UI::Base;
141 199
142use strict; 200use strict;
… …
145 203
146sub new { 204sub new {
147 my $class = shift; 205 my $class = shift;
148 206
149 my $self = bless { 207 my $self = bless {
150 x => 0, 208 x => "center",
151 y => 0, 209 y => "center",
152 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
153 can_events => 1, 213 can_events => 1,
154 @_ 214 @_
155 }, $class; 215 }, $class;
156 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
157 for (keys %$self) { 219 for (keys %$self) {
158 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
160 } 222 }
161 } 223 }
162 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
163 $self 237 $self
164} 238}
165 239
166sub destroy { 240sub destroy {
167 my ($self) = @_; 241 my ($self) = @_;
… …
176 return if $self->{parent}; 250 return if $self->{parent};
177 251
178 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
179} 253}
180 254
181sub hide { 255sub set_visible {
182 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
183 279
184 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
186 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
187 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
188 if $self->{parent}; 314 if $self->{parent};
189} 315}
190 316
191sub move { 317sub move_abs {
192 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
193 319
194 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
197 323
198 $self->update; 324 $self->update;
199} 325}
200 326
201sub set_size { 327sub set_size {
202 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
203 329
204 $self->{user_w} = $w; 330 $self->{force_w} = $w;
205 $self->{user_h} = $h; 331 $self->{force_h} = $h;
206 332
207 $self->check_size; 333 $self->realloc;
208} 334}
209 335
210sub size_request { 336sub size_request {
211 require Carp; 337 require Carp;
212 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
214 340
215sub configure { 341sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
217 343
218 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
221 349
222 # use alignment to adjust x, y 350 # use alignment to adjust x, y
223 351
224 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 354 }
229 355
230 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 357 $self->{x} = $x;
232 $self->{y} = $y; 358 $self->{y} = $y;
233 $self->update; 359 $self->update;
234 } 360 }
235 361
236 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
237 $self->{w} = $w; 365 $self->{alloc_w} = $w;
238 $self->{h} = $h; 366 $self->{alloc_h} = $h;
239 367
240 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 } 369 }
243} 370}
244 371
245sub size_allocate { 372sub size_allocate {
246 # nothing to be done 373 # nothing to be done
247} 374}
248 375
249sub children { 376sub children {
377 # nop
250} 378}
251 379
252# call when resoltuion changes etc. 380sub visible_children {
253sub reconfigure { 381 $_[0]->children
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 382}
261 383
262sub set_max_size { 384sub set_max_size {
263 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
264 386
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
267}
268 389
269# return top left coordinates 390 $self->realloc;
270sub _topleft { 391}
392
393sub set_tooltip {
271 my ($self, $x, $y) = @_; 394 my ($self, $tooltip) = @_;
272 395
273 $self->{parent} 396 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 397 $tooltip =~ s/\s+$//;
275 398
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
277} 407}
278 408
279# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
280sub coord2local { 410sub coord2local {
281 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
282 412
283 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 414}
286 415
287# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
288sub coord2global { 417sub coord2global {
289 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
290 419
291 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 421}
294 422
295sub focus_in { 423sub focus_in {
296 my ($self) = @_; 424 my ($self) = @_;
297 425
298 return if $FOCUS == $self; 426 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
300 428
301 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
302 430
303 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
304 432
305 $focus->update if $focus; 433 $focus->update if $focus;
306 $FOCUS->update; 434 $FOCUS->update;
307} 435}
308 436
… …
311 439
312 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
313 441
314 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
315 443
316 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
317 445
318 $focus->update if $focus; #? 446 $focus->update if $focus; #?
319}
320 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
321sub mouse_motion { } 452sub mouse_motion { 0 }
322sub button_up { } 453sub button_up { 0 }
323sub key_down { } 454sub key_down { 0 }
324sub key_up { } 455sub key_up { 0 }
325 456
326sub button_down { 457sub button_down {
327 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
328 459
329 $self->focus_in; 460 $self->focus_in;
330}
331 461
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
336sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
337 538
338sub draw { 539sub draw {
339 my ($self) = @_; 540 my ($self) = @_;
340 541
341 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
342 553
343 glPushMatrix; 554 glPushMatrix;
344 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
345 $self->_draw;
346 glPopMatrix;
347 556
348 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
349 my ($x, $y) = @$self{qw(x y)};
350
351 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
352 glEnable GL_BLEND; 559 glEnable GL_BLEND;
353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
354 glBegin GL_QUADS; 561 glBegin GL_QUADS;
355 glVertex $x , $y;
356 glVertex $x + $self->{w}, $y;
357 glVertex $x + $self->{w}, $y + $self->{h};
358 glVertex $x , $y + $self->{h};
359 glEnd;
360 glDisable GL_BLEND;
361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 562 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
372 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
373 glPopMatrix; 580 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
376} 586}
377 587
378sub _draw { 588sub _draw {
379 my ($self) = @_; 589 my ($self) = @_;
380 590
381 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
382} 592}
383 593
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 594sub DESTROY {
448 my ($self) = @_; 595 my ($self) = @_;
449 596
450 #$self->deactivate; 597 delete $WIDGET{$self+0};
598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
451} 601}
452 602
453############################################################################# 603#############################################################################
454 604
455package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
463 my $class = shift; 613 my $class = shift;
464 614
465 # range [value, low, high, page] 615 # range [value, low, high, page]
466 616
467 $class->SUPER::new ( 617 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 618 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 619 #active_bg => [1, 1, 1, 0.5],
470 @_ 620 @_
471 ) 621 )
472} 622}
473 623
474sub _draw { 624sub _draw {
475 my ($self) = @_; 625 my ($self) = @_;
476 626
627 my $color = $FOCUS == $self && $self->{active_bg}
628 ? $self->{active_bg}
629 : $self->{bg};
630
631 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
478 633
479 glEnable GL_BLEND; 634 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 636 glColor_premultiply @$color;
482 637
483 glBegin GL_QUADS; 638 glBegin GL_QUADS;
484 glVertex 0 , 0; 639 glVertex 0 , 0;
485 glVertex 0 , $h; 640 glVertex 0 , $h;
486 glVertex $w, $h; 641 glVertex $w, $h;
487 glVertex $w, 0; 642 glVertex $w, 0;
488 glEnd; 643 glEnd;
489 644
490 glDisable GL_BLEND; 645 glDisable GL_BLEND;
646 }
491} 647}
492 648
493############################################################################# 649#############################################################################
494 650
495package CFClient::UI::Empty; 651package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
502} 658}
503 659
504sub size_request { 660sub size_request {
505 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
506} 664}
507 665
508sub draw { } 666sub draw { }
509 667
510############################################################################# 668#############################################################################
… …
514our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
515 673
516sub new { 674sub new {
517 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
518 676
519 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
520 678
521 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
522 children => [], 680 children => [],
523 can_events => 0, 681 can_events => 0,
524 %arg, 682 %arg,
525 ); 683 );
684
526 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
527 687
528 $self 688 $self
529} 689}
530 690
531sub add { 691sub add {
532 my ($self, $child) = @_; 692 my ($self, @widgets) = @_;
533 693
534 $child->set_parent ($self); 694 $_->set_parent ($self)
695 for @widgets;
535 696
536 use sort 'stable'; 697 use sort 'stable';
537 698
538 $self->{children} = [ 699 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 701 @{$self->{children}}, @widgets
541 ]; 702 ];
542 703
543 $child->check_size; 704 $self->realloc;
544} 705}
545 706
546sub children { 707sub children {
547 @{ $_[0]{children} } 708 @{ $_[0]{children} }
548} 709}
… …
553 delete $child->{parent}; 714 delete $child->{parent};
554 $child->hide; 715 $child->hide;
555 716
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 718
558 $self->check_size; 719 $self->realloc;
559 $self->update;
560} 720}
561 721
562sub clear { 722sub clear {
563 my ($self) = @_; 723 my ($self) = @_;
564 724
… …
567 727
568 for (@$children) { 728 for (@$children) {
569 delete $_->{parent}; 729 delete $_->{parent};
570 $_->hide; 730 $_->hide;
571 } 731 }
732
733 $self->realloc;
572} 734}
573 735
574sub find_widget { 736sub find_widget {
575 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
576 738
577 $x -= $self->{x}; 739 $x -= $self->{x};
578 $y -= $self->{y}; 740 $y -= $self->{y};
579 741
580 my $res; 742 my $res;
581 743
582 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
583 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
584 and return $res; 746 and return $res;
585 } 747 }
586 748
587 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
608} 770}
609 771
610sub add { 772sub add {
611 my ($self, $child) = @_; 773 my ($self, $child) = @_;
612 774
613 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
614
615 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
616} 777}
617 778
618sub remove { 779sub remove {
619 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
636 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
637} 798}
638 799
639############################################################################# 800#############################################################################
640 801
802# back-buffered drawing area
803
641package CFClient::UI::Window; 804package CFClient::UI::Window;
642 805
643our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
644 807
645use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
651} 814}
652 815
653sub update { 816sub update {
654 my ($self) = @_; 817 my ($self) = @_;
655 818
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 820 $self->SUPER::update;
658} 821}
659 822
660sub size_allocate { 823sub size_allocate {
661 my ($self, $w, $h) = @_; 824 my ($self, $w, $h) = @_;
662 825
663 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 827 $self->update;
828}
829
830sub _render {
831 my ($self) = @_;
832
833 $self->{children}[0]->draw;
665} 834}
666 835
667sub render_child { 836sub render_child {
668 my ($self) = @_; 837 my ($self) = @_;
669 838
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 842
674# glColorMask 1, 1, 1, 0; 843 {
675# glEnable GL_BLEND; 844 package CFClient::UI::Base;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 845
677# glRasterPos 0, 0; 846 ($draw_x, $draw_y, $draw_w, $draw_h) =
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 847 (0, 0, $self->{w}, $self->{h});
679# glDisable GL_BLEND; 848 }
680# glColorMask 1, 1, 1, 1; 849
850 $self->_render;
681 }; 851 };
682} 852}
683 853
684sub _draw { 854sub _draw {
685 my ($self) = @_; 855 my ($self) = @_;
686 856
687 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
688 858
689 my $tex = $self->{texture} 859 my $tex = $self->{texture}
690 or return; 860 or return;
691 861
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 864 glColor 0, 0, 0, 1;
697 865
698 $tex->draw_quad (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 867
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
702} 869}
703 870
704############################################################################# 871#############################################################################
705 872
706package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
707 874
708our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 876
736sub new { 877sub new {
737 my $class = shift; 878 my $class = shift;
738 879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
887sub size_request {
888 my ($self) = @_;
889
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891
892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
896}
897
898sub size_allocate {
899 my ($self, $w, $h) = @_;
900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
907 $self->update;
908}
909
910sub set_offset {
911 my ($self, $x, $y) = @_;
912
913 $self->{view_x} = int $x;
914 $self->{view_y} = int $y;
915
916 $self->update;
917}
918
919# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local {
921 my ($self, $x, $y) = @_;
922
923 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
924}
925
926sub coord2global {
927 my ($self, $x, $y) = @_;
928
929 $x = List::Util::min $self->{w}, $x - $self->{view_x};
930 $y = List::Util::min $self->{h}, $y - $self->{view_y};
931
932 $self->SUPER::coord2global ($x, $y)
933}
934
935sub find_widget {
936 my ($self, $x, $y) = @_;
937
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y)
944 }
945}
946
947sub _render {
948 my ($self) = @_;
949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954
955 $self->SUPER::_render;
956}
957
958#############################################################################
959
960package CFClient::UI::ScrolledWindow;
961
962our @ISA = CFClient::UI::HBox::;
963
964sub new {
965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
968
969 my $self;
970
971 my $slider = new CFClient::UI::Slider
972 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]);
976 },
977 ;
978
739 my $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 980 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 981 slider => $slider,
742 border => 0.8, 982 %arg,
743 @_
744 ); 983 );
745 984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
746 $self 988 $self
747} 989}
748 990
749sub _draw { 991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub size_allocate {
750 my ($self) = @_; 1008 my ($self, $w, $h) = @_;
751 1009
752 my ($w, $h) = ($self->{w}, $self->{h}); 1010 $self->SUPER::size_allocate ($w, $h);
753 1011
754 glEnable GL_BLEND; 1012 my $child = $self->{vp}->child;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766
767
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771} 1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
772 1018
773############################################################################# 1019#############################################################################
774 1020
775package CFClient::UI::FancyFrame; 1021package CFClient::UI::Frame;
776 1022
777our @ISA = CFClient::UI::Bin::; 1023our @ISA = CFClient::UI::Bin::;
778 1024
779use CFClient::OpenGL; 1025use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 1026
785sub new { 1027sub new {
786 my $class = shift; 1028 my $class = shift;
787 1029
788 # TODO: user_x, user_y, overwrite moveto? 1030 $class->SUPER::new (
1031 bg => undef,
1032 @_,
1033 )
1034}
1035
1036sub _draw {
1037 my ($self) = @_;
1038
1039 if ($self->{bg}) {
1040 my ($w, $h) = @$self{qw(w h)};
1041
1042 glEnable GL_BLEND;
1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044 glColor_premultiply @{ $self->{bg} };
1045
1046 glBegin GL_QUADS;
1047 glVertex 0 , 0;
1048 glVertex 0 , $h;
1049 glVertex $w, $h;
1050 glVertex $w, 0;
1051 glEnd;
1052
1053 glDisable GL_BLEND;
1054 }
1055
1056 $self->SUPER::_draw;
1057}
1058
1059#############################################################################
1060
1061package CFClient::UI::FancyFrame;
1062
1063our @ISA = CFClient::UI::Bin::;
1064
1065use CFClient::OpenGL;
1066
1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074
1075sub new {
1076 my ($class, %arg) = @_;
789 1077
790 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1081 border => 0.6,
794 can_events => 1, 1082 can_events => 1,
795 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
796 ); 1086 );
797 1087
798 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
799 align => 0, 1089 align => 0,
800 valign => 1, 1090 valign => 1,
801 text => $self->{title}, 1091 text => $self->{title},
802 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
803 1094
804 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
805} 1103}
806 1104
807sub border { 1105sub border {
808 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
809} 1107}
810 1108
811sub size_request { 1109sub size_request {
812 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
813 1114
814 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
815 1116
816 ( 1117 (
817 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
820} 1121}
821 1122
822sub size_allocate { 1123sub size_allocate {
823 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
824 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
825 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
827 1136
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
831 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
832} 1138}
833 1139
834sub button_down { 1140sub button_down {
835 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
836 1142
… …
852 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
853 1159
854 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
856 1162
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1167 $self->realloc;
861 }; 1168 };
862 1169
863 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1174 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
869 1176
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
871 1178
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
875 } 1187 1
876} 1188}
877 1189
878sub button_up { 1190sub button_up {
879 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
880 1192
881 delete $self->{motion}; 1193 !!delete $self->{motion}
882} 1194}
883 1195
884sub mouse_motion { 1196sub mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
886 1198
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
888} 1202}
889 1203
890sub _draw { 1204sub _draw {
891 my ($self) = @_; 1205 my ($self) = @_;
892 1206
1207 my $child = $self->{children}[0];
1208
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1211
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1214
901 my $border = $self->border; 1215 my $border = $self->border;
902 1216
903 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1222
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
911 1225
912 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1231 }
922 1232
923 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1234
927 $self->{title}->draw if $self->{title};
928
929 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
930} 1241}
931 1242
932############################################################################# 1243#############################################################################
933 1244
934package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
942sub new { 1253sub new {
943 my $class = shift; 1254 my $class = shift;
944 1255
945 $class->SUPER::new ( 1256 $class->SUPER::new (
946 col_expand => [], 1257 col_expand => [],
947 @_ 1258 @_,
948 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1264}
950 1265
951sub add { 1266sub add {
952 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
953 1268
954 $child->set_parent ($self); 1269 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
956 1271
957 $child->check_size; 1272 $self->realloc;
958} 1273}
959 1274
960sub children { 1275sub remove {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1276 my ($self, $child) = @_;
962}
963 1277
1278 # TODO: not yet implemented
1279}
1280
964# TODO: move to container class maybe? send childs a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
965sub clear { 1282sub clear {
966 my ($self) = @_; 1283 my ($self) = @_;
967 1284
968 my @children = $self->children; 1285 my @children = $self->children;
969 delete $self->{children}; 1286 delete $self->{children};
… …
971 for (@children) { 1288 for (@children) {
972 delete $_->{parent}; 1289 delete $_->{parent};
973 $_->hide; 1290 $_->hide;
974 } 1291 }
975 1292
976 $self->update; 1293 $self->realloc;
977} 1294}
978 1295
979sub get_wh { 1296sub get_wh {
980 my ($self) = @_; 1297 my ($self) = @_;
981 1298
… …
1012sub size_allocate { 1329sub size_allocate {
1013 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1014 1331
1015 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1016 1333
1017 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1019 1336
1020 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1394 }
1078} 1395}
1079 1396
1080############################################################################# 1397#############################################################################
1081 1398
1082package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1400
1086our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1087 1402
1088sub size_request { 1403sub size_request {
1089 my ($self) = @_; 1404 my ($self) = @_;
1090 1405
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1092 1407 ? (
1093 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1410 )
1096 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1097} 1415}
1098 1416
1099sub size_allocate { 1417sub size_allocate {
1100 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1101 1419
1102 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1421 my $children = $self->{children};
1105 1422
1106 my @h = map $_->{req_w}, @$children; 1423 my @req;
1107 1424
1108 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1109 1426 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } else { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1441 }
1124 } 1442 }
1125 1443
1126 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1127 1445
1128 my $y = 0; 1446 my $pos = 0;
1129 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1450
1134 $y += $h; 1451 $pos += $alloc;
1135 } 1452 }
1136 1453
1137 1 1454 1
1138} 1455}
1139 1456
1140############################################################################# 1457#############################################################################
1141 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1142package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1143 1475
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1147 1477
1148sub size_request { 1478sub new {
1149 my ($self) = @_; 1479 my $class = shift;
1150 1480
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1152 1482 vertical => 1,
1153 ( 1483 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1484 )
1157} 1485}
1158 1486
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1487#############################################################################
1197 1488
1198package CFClient::UI::Label; 1489package CFClient::UI::Label;
1199 1490
1200our @ISA = CFClient::UI::Base::; 1491our @ISA = CFClient::UI::DrawBG::;
1201 1492
1202use CFClient::OpenGL; 1493use CFClient::OpenGL;
1203 1494
1204sub new { 1495sub new {
1205 my ($class, %arg) = @_; 1496 my ($class, %arg) = @_;
1206 1497
1207 my $self = $class->SUPER::new ( 1498 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1499 fg => [1, 1, 1],
1500 #bg => none
1501 #active_bg => none
1209 #font => default_font 1502 #font => default_font
1503 #text => initial text
1504 #markup => initial narkup
1505 #max_w => maximum pixel width
1506 ellipsise => 3, # end
1507 layout => (new CFClient::Layout),
1210 fontsize => 1, 1508 fontsize => 1,
1211 text => "",
1212 align => -1, 1509 align => -1,
1213 valign => -1, 1510 valign => -1,
1214 padding => 2, 1511 padding_x => 2,
1215 layout => new CFClient::Layout, 1512 padding_y => 2,
1216 can_events => 0, 1513 can_events => 0,
1217 %arg 1514 %arg
1218 ); 1515 );
1219 1516
1220 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1518 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1519 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1520 $self->{template} = $layout;
1224 } 1521 }
1225 1522
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1523 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1524 $self->set_markup (delete $self->{markup});
1525 } else {
1526 $self->set_text (delete $self->{text});
1527 }
1228 1528
1229 $self 1529 $self
1230} 1530}
1231 1531
1232sub escape { 1532sub escape($) {
1233 local $_ = $_[1]; 1533 local $_ = $_[0];
1234 1534
1235 s/&/&amp;/g; 1535 s/&/&amp;/g;
1236 s/>/&gt;/g; 1536 s/>/&gt;/g;
1237 s/</&lt;/g; 1537 s/</&lt;/g;
1238 1538
1239 $_[1] 1539 $_
1240} 1540}
1241 1541
1242sub update { 1542sub update {
1243 my ($self) = @_; 1543 my ($self) = @_;
1244 1544
1245 delete $self->{texture}; 1545 delete $self->{texture};
1246 $self->SUPER::update; 1546 $self->SUPER::update;
1247} 1547}
1248 1548
1249sub reconfigure { 1549sub realloc {
1250 my ($self) = @_; 1550 my ($self) = @_;
1251 1551
1252 delete $self->{texture}; 1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1253} 1554}
1254 1555
1255sub set_text { 1556sub set_text {
1256 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1257 1558
1258 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1260 1561
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1262 1564
1263 delete $self->{texture}; 1565 delete $self->{size_req};
1566 $self->realloc;
1264 $self->update; 1567 $self->update;
1265 $self->check_size;
1266} 1568}
1267 1569
1268sub set_markup { 1570sub set_markup {
1269 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1270 1572
1271 return if $self->{text} eq "M$markup"; 1573 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1574 $self->{text} = "M$markup";
1273 1575
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1275 1580
1276 delete $self->{texture}; 1581 delete $self->{size_req};
1582 $self->realloc;
1277 $self->update; 1583 $self->update;
1278 $self->check_size;
1279} 1584}
1280 1585
1281sub size_request { 1586sub size_request {
1282 my ($self) = @_; 1587 my ($self) = @_;
1283 1588
1589 $self->{size_req} ||= do {
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1595
1288 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1289 1597
1290 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1291 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1292 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1293 1601
1294 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1295 1603
1296 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1298 } 1609 };
1299 1610
1300 ( 1611 @{ $self->{size_req} }
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1612}
1305 1613
1306sub size_allocate { 1614sub size_allocate {
1307 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1308 1616
1617 delete $self->{ox};
1618
1309 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1310} 1621}
1311 1622
1312sub set_fontsize { 1623sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1314 1625
1315 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1627 delete $self->{texture};
1317 $self->check_size; 1628
1318 $self->update; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1319} 1638}
1320 1639
1321sub _draw { 1640sub _draw {
1322 my ($self) = @_; 1641 my ($self) = @_;
1323 1642
1643 $self->SUPER::_draw; # draw background, if applicable
1644
1324 my $tex = $self->{texture} ||= do { 1645 my $tex = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1647 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652
1328 new_from_layout CFClient::Texture $self->{layout} 1653 new_from_layout CFClient::Texture $self->{layout}
1329 }; 1654 };
1330 1655
1331 glEnable GL_BLEND; 1656 unless (exists $self->{ox}) {
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5);
1660
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5);
1664 };
1665
1333 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1670
1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1336 glColor @{$self->{fg}}; 1678 }
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy});
1351 1679
1352 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1681}
1355 1682
1356############################################################################# 1683#############################################################################
1357 1684
1358package CFClient::UI::EntryBase; 1685package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1698 active_fg => [0, 0, 0],
1372 can_hover => 1, 1699 can_hover => 1,
1373 can_focus => 1, 1700 can_focus => 1,
1374 valign => 0, 1701 valign => 0,
1375 can_events => 1, 1702 can_events => 1,
1703 #text => ...
1704 #hidden => "*",
1376 @_ 1705 @_
1377 ) 1706 )
1378} 1707}
1379 1708
1380sub _set_text { 1709sub _set_text {
… …
1382 1711
1383 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1384 1713
1385 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1386 1715
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 1717 $self->{text} = $text;
1391 1718
1392 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1394 1722
1395 $self->emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1727}
1728
1729sub set_text {
1730 my ($self, $text) = @_;
1731
1732 $self->{cursor} = length $text;
1733 $self->_set_text ($text);
1396} 1734}
1397 1735
1398sub get_text { 1736sub get_text {
1399 $_[0]{text} 1737 $_[0]{text}
1400} 1738}
… …
1403 my ($self) = @_; 1741 my ($self) = @_;
1404 1742
1405 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1406 1744
1407 ($w + 1, $h) # add 1 for cursor 1745 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1746}
1423 1747
1424sub key_down { 1748sub key_down {
1425 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1426 1750
… …
1428 my $sym = $ev->{sym}; 1752 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1753 my $uni = $ev->{unicode};
1430 1754
1431 my $text = $self->get_text; 1755 my $text = $self->get_text;
1432 1756
1433 if ($sym == 8) { 1757 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1759 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1760 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1761 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1762 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1763 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1764 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1765 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1766 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1767 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1769 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1770 $self->_emit ('escape');
1447 } elsif ($uni) { 1771 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1449 } 1775 }
1450 1776
1451 $self->_set_text ($text); 1777 $self->_set_text ($text);
1452 $self->update; 1778
1779 $self->realloc;
1780
1781 1
1453} 1782}
1454 1783
1455sub focus_in { 1784sub focus_in {
1456 my ($self) = @_; 1785 my ($self) = @_;
1457 1786
… …
1472 utf8::encode $text; 1801 utf8::encode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1474 1803
1475 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1476 $self->update; 1805 $self->update;
1806
1807 1
1477} 1808}
1478 1809
1479sub mouse_motion { 1810sub mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1481# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1482} 1815}
1483 1816
1484sub _draw { 1817sub _draw {
1485 my ($self) = @_; 1818 my ($self) = @_;
1486 1819
1487 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1488 1821
1489 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1490 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1491 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1492 } else { 1825 } else {
1493 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1494 } 1827 }
1495 1828
1496 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1498 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1499 glVertex 0 , 0; 1832 glVertex 0 , 0;
1500 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1501 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1502 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1537 if ($sym == 13) { 1870 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1871 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1872 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1873 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1874 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1875 $self->_emit (activate => $txt);
1543 $self->update; 1876 $self->update;
1544 1877
1545 } elsif ($sym == CFClient::SDLK_UP) { 1878 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1879 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1880 $self->{history_saveback} = $self->get_text;
… …
1563 } else { 1896 } else {
1564 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1565 } 1898 }
1566 1899
1567 } else { 1900 } else {
1568 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1569 } 1904 1
1570
1571} 1905}
1572 1906
1573############################################################################# 1907#############################################################################
1574 1908
1575package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1584 1918
1585sub new { 1919sub new {
1586 my $class = shift; 1920 my $class = shift;
1587 1921
1588 $class->SUPER::new ( 1922 $class->SUPER::new (
1589 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1590 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1593 can_hover => 1, 1927 can_hover => 1,
1594 align => 0, 1928 align => 0,
1595 valign => 0, 1929 valign => 0,
1596 can_events => 1, 1930 can_events => 1,
1597 @_ 1931 @_
1598 ) 1932 )
1599} 1933}
1600 1934
1935sub activate { }
1936
1601sub button_up { 1937sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1603 1939
1940 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1942 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 1943
1607 } 1944 1
1608} 1945}
1609 1946
1610sub _draw { 1947sub _draw {
1611 my ($self) = @_; 1948 my ($self) = @_;
1612 1949
1613 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1614 1951
1615 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg};
1617 }
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1624 1955
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1957
1627 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1959
1630 $self->SUPER::_draw; 1960 $self->SUPER::_draw;
1631} 1961}
1632 1962
1633############################################################################# 1963#############################################################################
… …
1644 1974
1645sub new { 1975sub new {
1646 my $class = shift; 1976 my $class = shift;
1647 1977
1648 $class->SUPER::new ( 1978 $class->SUPER::new (
1649 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1650 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1983 bg => [0, 0, 0, 0.2],
1984 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1985 state => 0,
1653 can_hover => 1, 1986 can_hover => 1,
1654 @_ 1987 @_
1655 ) 1988 )
1656} 1989}
1657 1990
1658sub size_request { 1991sub size_request {
1659 my ($self) = @_; 1992 my ($self) = @_;
1660 1993
1661 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1662} 1995}
1663 1996
1664sub button_down { 1997sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1666 1999
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1671 } 2008 1
1672} 2009}
1673 2010
1674sub _draw { 2011sub _draw {
1675 my ($self) = @_; 2012 my ($self) = @_;
1676 2013
1677 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1678 2015
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 2017
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1682 2021
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 2023
1685 glEnable GL_BLEND; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
2025
1686 glEnable GL_TEXTURE_2D; 2026 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 2027 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 2028 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 2029}
1696 2030
1697############################################################################# 2031#############################################################################
1698 2032
1699package CFClient::UI::Image; 2033package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 2076 glTranslate 0, -$self->{w}, 0;
1743 2077
1744 ($w, $h) = ($h, $w); 2078 ($w, $h) = ($h, $w);
1745 } 2079 }
1746 2080
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 2081 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 2083
1752 $tex->draw_quad (0, 0, $w, $h); 2084 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 2085
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 2086 glDisable GL_TEXTURE_2D;
1756} 2087}
1757 2088
1758############################################################################# 2089#############################################################################
1759 2090
… …
1849 2180
1850 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1852 2183
1853 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1854 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1857 2189
1858 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
1859 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2280 qw(s1_slider.png s1_slider_bg.png);
1949 2281
1950sub new { 2282sub new {
1951 my $class = shift; 2283 my $class = shift;
1952 2284
1953 # range [value, low, high, page] 2285 # range [value, low, high, page, unit]
1954 2286
1955 # TODO: 0-width page 2287 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2288 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2289 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2290 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2293 bg => [0, 0, 0, 0.2],
2294 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2295 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2296 min_w => $::WIDTH / 80,
1963 req_h => 20, 2297 min_h => $::WIDTH / 80,
1964 vertical => 0, 2298 vertical => 0,
1965 can_hover => 1, 2299 can_hover => 1,
1966 inner_pad => 5, 2300 inner_pad => 0.02,
1967 @_ 2301 @_
1968 ); 2302 );
1969 2303
2304 $self->set_value ($self->{range}[0]);
2305 $self->update;
2306
1970 $self 2307 $self
1971} 2308}
1972 2309
2310sub changed { }
2311
2312sub set_range {
2313 my ($self, $range) = @_;
2314
2315 ($range, $self->{range}) = ($self->{range}, $range);
2316
2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2321}
2322
2323sub set_value {
2324 my ($self, $value) = @_;
2325
2326 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2327
2328 $hi = $lo + 1 if $hi <= $lo;
2329
2330 $page = $hi - $lo if $page > $hi - $lo;
2331
2332 $value = $lo if $value < $lo;
2333 $value = $hi - $page if $value > $hi - $page;
2334
2335 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2336 if $unit;
2337
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339
2340 if ($value != $old_value) {
2341 $self->_emit (changed => $value);
2342 $self->update;
2343 }
2344}
2345
1973sub size_request { 2346sub size_request {
1974 my ($self) = @_; 2347 my ($self) = @_;
1975 2348
1976 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2350}
1981 2351
1982sub button_down { 2352sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
1984 2354
1985 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2356
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358
1986 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
1987} 2360}
1988 2361
1989sub mouse_motion { 2362sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
1991 2364
1992 if ($GRAB == $self) { 2365 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367
2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2369
2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2371
2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2377 1
2378}
2379
2380sub update {
2381 my ($self) = @_;
2382
2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2391 $self->set_value ($self->{range}[0]);
2392
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2394 my $range = ($hi - $page - $lo) || 1e-100;
1994 2395
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2396 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2397
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2398 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2399 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2400
2000 $x -= $inner_pad_px; # substract the padding 2401 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2402 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2403
2006 $self->emit (changed => $x); 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2405 $self->{knob_w} = $knob_w;
2008 } 2406 }
2009}
2010
2011# the inner_* stuff is for generating a padding for the slider handle,
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017}
2018
2019sub _draw {
2020 my ($self) = @_;
2021 2407
2022 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2023 2409
2024 my ($w, $h) = @$self{qw(w h)}; 2410 glScale $self->{w}, $self->{h};
2025 2411
2026 if ($self->{vertical}) { 2412 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2413 # draw a vertical slider like a rotated horizontal slider
2028 2414
2415 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2416 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2417 }
2034 2418
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2419 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2420 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2421
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2422 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2424
2061 # draw background 2425 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2426 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2427
2064 # draw handle 2428 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2429 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2430
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2431 glDisable GL_TEXTURE_2D;
2069} 2432}
2070 2433
2071############################################################################# 2434#############################################################################
2072 2435
2436package CFClient::UI::ValSlider;
2437
2438our @ISA = CFClient::UI::HBox::;
2439
2440sub new {
2441 my ($class, %arg) = @_;
2442
2443 my $range = delete $arg{range};
2444
2445 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift },
2449 from_value => sub { shift },
2450 %arg,
2451 );
2452
2453 $self->{slider}->connect (changed => sub {
2454 my ($self, $value) = @_;
2455 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2456 $self->{parent}->emit (changed => $value);
2457 });
2458
2459# $self->{entry}->connect (changed => sub {
2460# my ($self, $value) = @_;
2461# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2462# $self->{parent}->emit (changed => $value);
2463# });
2464
2465 $self->add ($self->{slider}, $self->{entry});
2466
2467 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2468
2469 $self
2470}
2471
2472sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) }
2474
2475#############################################################################
2476
2073package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2074 2478
2075our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2076 2480
2077use CFClient::OpenGL; 2481use CFClient::OpenGL;
2078 2482
… …
2080 my $class = shift; 2484 my $class = shift;
2081 2485
2082 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2083 fontsize => 1, 2487 fontsize => 1,
2084 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2085 #font => default_font 2490 #font => default_font
2086 @_, 2491 @_,
2087 2492
2088 layout => (new CFClient::Layout), 2493 layout => (new CFClient::Layout 1),
2089 par => [], 2494 par => [],
2090 height => 0, 2495 height => 0,
2091 children => [ 2496 children => [
2092 (new CFClient::UI::Empty expand => 1), 2497 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2498 (new CFClient::UI::Slider vertical => 1),
… …
2104 2509
2105 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2511 $self->reflow;
2107} 2512}
2108 2513
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2514sub size_allocate {
2129 my ($self, $w, $h) = @_; 2515 my ($self, $w, $h) = @_;
2130 2516
2131 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2132 2518
2133 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2136 2523
2137 $self->reflow; 2524 $self->reflow;
2138} 2525}
2139 2526
2527sub text_size {
2528 my ($self, $text, $indent) = @_;
2529
2530 my $layout = $self->{layout};
2531
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text);
2536
2537 $layout->size
2538}
2539
2540sub reflow {
2541 my ($self) = @_;
2542
2543 $self->{need_reflow}++;
2544 $self->update;
2545}
2546
2547sub set_offset {
2548 my ($self, $offset) = @_;
2549
2550 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset);
2552}
2553
2554sub clear {
2555 my ($self) = @_;
2556
2557 $self->{par} = [];
2558 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560}
2561
2140sub add_paragraph { 2562sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2563 my ($self, $color, $text, $indent) = @_;
2142 2564
2143 #TODO: intelligently "reformat" paragraph 2565 for my $line (split /\n/, $text) {
2144 2566 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2567 $self->{height} += $h;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2569 }
2148 2570
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2572}
2154 2573
2155sub update { 2574sub update {
2156 my ($self) = @_; 2575 my ($self) = @_;
2157 2576
… …
2159 2578
2160 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2161 2580
2162 delete $self->{texture}; 2581 delete $self->{texture};
2163 2582
2164 $ROOT->on_refresh ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585
2165 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2587 my $height = 0;
2167 2588
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2169 for @{$self->{par}}; 2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2170 2605
2171 $self->{height} = $height; 2606 $self->{height} = $height;
2172 2607
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2609
2175 delete $self->{texture}; 2610 delete $self->{texture};
2176 } 2611 }
2177 2612
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2614 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2181 2616
2617 my $top = int $self->{children}[1]{range}[0];
2618
2619 my $y0 = $top;
2620 my $y1 = $top + $H;
2621
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2182 glEnable GL_BLEND; 2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2631
2198 for my $par (@{$self->{par}}) { 2632 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2633 my $h = $par->[1];
2200 2634
2201 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2202 $layout->set_text ($par->[2]); 2639 $layout->set_markup ($par->[4]);
2203 2640
2204 glColor @{ $par->[1] }; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2642
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2643 glRasterPos $par->[3], $y - $y0;
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2645 }
2208 2646
2209 $y += $h; 2647 $y += $h;
2210 } 2648 }
2211 2649
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2650 glDisable GL_BLEND;
2214 }; 2651 };
2215 }); 2652 });
2216} 2653}
2217 2654
2218sub _draw { 2655sub _draw {
2219 my ($self) = @_; 2656 my ($self) = @_;
2220 2657
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2663
2230 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2231 2665
2232} 2666}
2233 2667
… …
2281 2715
2282sub new { 2716sub new {
2283 my $class = shift; 2717 my $class = shift;
2284 2718
2285 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2286 state => 0, 2720 state => 0,
2287 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2288 @_ 2722 @_
2289 ); 2723 );
2290 2724
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2725 $self
2297} 2726}
2298 2727
2299sub toggle_flopper { 2728sub toggle_flopper {
2300 my ($self) = @_; 2729 my ($self) = @_;
2301 2730
2302 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2732}
2314 2733
2315############################################################################# 2734#############################################################################
2316 2735
2317package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2327 @_, 2746 @_,
2328 can_events => 0, 2747 can_events => 0,
2329 ) 2748 )
2330} 2749}
2331 2750
2332sub set_markup { 2751sub set_tooltip_from {
2333 my ($self, $text) = @_; 2752 my ($self, $widget) = @_;
2334 2753
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2754 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2755
2337 $self->add ($self->{label}); 2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2766 $self->add (new CFClient::UI::Label
2767 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8,
2770 fg => [0, 0, 0, 1],
2771 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 );
2338} 2774}
2339 2775
2340sub size_request { 2776sub size_request {
2341 my ($self) = @_; 2777 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2778
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2780
2347 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2348} 2782}
… …
2351 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2352 2786
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2788}
2355 2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2806}
2807
2356sub _draw { 2808sub _draw {
2357 my ($self) = @_; 2809 my ($self) = @_;
2358 2810
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2811 glTranslate 0.375, 0.375;
2361 2812
2362 my ($w, $h) = @$self{qw(w h)}; 2813 my ($w, $h) = @$self{qw(w h)};
2363 2814
2364 glColor 1, 0.8, 0.4; 2815 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2826 glVertex 0 , $h;
2376 glVertex $w, $h; 2827 glVertex $w, $h;
2377 glVertex $w, 0; 2828 glVertex $w, 0;
2378 glEnd; 2829 glEnd;
2379 2830
2380 glPopMatrix; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2381 2832
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2384} 2834}
2385 2835
2386############################################################################# 2836#############################################################################
2387 2837
… …
2392use CFClient::OpenGL; 2842use CFClient::OpenGL;
2393 2843
2394sub new { 2844sub new {
2395 my $class = shift; 2845 my $class = shift;
2396 2846
2397 $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2398 aspect => 1, 2848 aspect => 1,
2849 can_events => 0,
2399 @_, 2850 @_,
2400 ) 2851 );
2852
2853 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self);
2855
2856 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1,
2859 interval => $self->{animspeed},
2860 cb => sub {
2861 ++$widget->{frame};
2862 $widget->update;
2863 },
2864 );
2865 }
2866
2867 $self
2401} 2868}
2402 2869
2403sub size_request { 2870sub size_request {
2404 (32, 8) 2871 (32, 8)
2405} 2872}
2406 2873
2874sub update {
2875 my ($self) = @_;
2876
2877 return unless $self->{visible};
2878
2879 $self->SUPER::update;
2880}
2881
2407sub _draw { 2882sub _draw {
2408 my ($self) = @_; 2883 my ($self) = @_;
2409 2884
2885 return unless $::CONN;
2886
2887 my $face;
2888
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2897
2412 # TODO animation
2413 if ($tex) { 2898 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2904 }
2423} 2905}
2906
2907sub destroy {
2908 my ($self) = @_;
2909
2910 $self->{timer}->cancel
2911 if $self->{timer};
2912
2913 $self->SUPER::destroy;
2914}
2915
2916#############################################################################
2917
2918package CFClient::UI::Buttonbar;
2919
2920our @ISA = CFClient::UI::HBox::;
2921
2922# TODO: should actualyl wrap buttons and other goodies.
2424 2923
2425############################################################################# 2924#############################################################################
2426 2925
2427package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2428 2927
… …
2440 ); 2939 );
2441 2940
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2443 2942
2444 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2446 2945
2447 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2448 if (!ref $widget) { 2947 if (!ref $widget) {
2449 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2450 can_hover => 1, 2949 can_hover => 1,
2451 can_events => 1, 2950 can_events => 1,
2452 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2453 } 2953 }
2454 2954
2455 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2456 2956
2457 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2462 2962
2463# popup given the event (must be a mouse button down event currently) 2963# popup given the event (must be a mouse button down event currently)
2464sub popup { 2964sub popup {
2465 my ($self, $ev) = @_; 2965 my ($self, $ev) = @_;
2466 2966
2467 $self->emit ("popdown"); 2967 $self->_emit ("popdown");
2468 2968
2469 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2970 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2472 2972
2473 $self->show; 2973 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2975}
2476 2976
2477sub mouse_motion { 2977sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2479 2979
2480 # TODO: should use vbox->fdind_widget or so 2980 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2483} 2985}
2484 2986
2485sub button_up { 2987sub button_up {
2486 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2487 2989
2488 if ($ev->{button} == $self->{button}) { 2990 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2991 undef $GRAB;
2490 $self->hide; 2992 $self->hide;
2491 2993
2492 $self->emit ("popdown"); 2994 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2494 } 3000 1
2495} 3001}
2496 3002
2497############################################################################# 3003#############################################################################
2498 3004
3005package CFClient::UI::Multiplexer;
3006
3007our @ISA = CFClient::UI::Container::;
3008
3009sub new {
3010 my $class = shift;
3011
3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
3177 fontsize => 0.8,
3178 @_,
3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
3186}
3187
3188sub reorder {
3189 my ($self) = @_;
3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
3196
3197 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 }
3200
3201 my @widgets;
3202
3203 my @items = sort {
3204 $a->{pri} <=> $b->{pri}
3205 or $b->{id} <=> $a->{id}
3206 } values %{ $self->{item} };
3207
3208 $self->{timer}->interval (1);
3209
3210 my $count = 10 + 1;
3211 for my $item (@items) {
3212 last unless --$count;
3213
3214 my $label = $item->{label} ||= do {
3215 # TODO: doesn't handle markup well (read as: at all)
3216 my $short = $item->{count} > 1
3217 ? "<b>$item->{count} ×</b> $item->{text}"
3218 : $item->{text};
3219
3220 for ($short) {
3221 s/^\s+//;
3222 s/\s+/ /g;
3223 }
3224
3225 new CFClient::UI::Label
3226 markup => $short,
3227 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize},
3231 max_w => $::WIDTH * 0.44,
3232 fg => [@{ $item->{fg} }],
3233 can_events => 1,
3234 can_hover => 1
3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
3248 }
3249
3250 $self->clear;
3251 $self->SUPER::add (reverse @widgets);
3252}
3253
3254sub add {
3255 my ($self, $text, %arg) = @_;
3256
3257 $text =~ s/^\s+//;
3258 $text =~ s/\s+$//;
3259
3260 return unless $text;
3261
3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3263
3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3265
3266 if (my $item = $self->{item}{$group}) {
3267 if ($item->{text} eq $text) {
3268 $item->{count}++;
3269 } else {
3270 $item->{count} = 1;
3271 $item->{text} = $item->{tooltip} = $text;
3272 }
3273 $item->{id} += 0.2;#d#
3274 $item->{timeout} = $timeout;
3275 delete $item->{label};
3276 } else {
3277 $self->{item}{$group} = {
3278 id => ++$self->{id},
3279 text => $text,
3280 timeout => $timeout,
3281 tooltip => $text,
3282 fg => [0.8, 0.8, 0.8, 0.8],
3283 pri => 0,
3284 count => 1,
3285 %arg,
3286 };
3287 }
3288
3289 $self->reorder;
3290}
3291
3292sub reconfigure {
3293 my ($self) = @_;
3294
3295 delete $_->{label}
3296 for values %{ $self->{item} || {} };
3297
3298 $self->reorder;
3299 $self->SUPER::reconfigure;
3300}
3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3310#############################################################################
3311
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
2499package CFClient::UI::Root; 3673package CFClient::UI::Root;
2500 3674
2501our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
2502 3676
3677use List::Util qw(min max);
3678
2503use CFClient::OpenGL; 3679use CFClient::OpenGL;
2504 3680
2505sub check_size { 3681sub new {
2506 my ($self) = @_; 3682 my $class = shift;
2507 3683
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3684 my $self = $class->SUPER::new (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
2509} 3692}
2510 3693
2511sub size_request { 3694sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3695 my ($self) = @_;
2513}
2514 3696
2515sub configure { 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3712}
3713
3714sub size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2517 3716
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3717 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3719
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3720 $X = $child->{force_x} if exists $child->{force_x};
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3722
3723 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h};
3725
2525 $child->configure ($X, $Y, $W,$H); 3726 $child->configure ($X, $Y, $W, $H);
2526 } 3727 }
2527} 3728}
2528 3729
2529sub _topleft { 3730sub coord2local {
2530 my ($self, $x, $y) = @_; 3731 my ($self, $x, $y) = @_;
2531 3732
2532 ($x, $y) 3733 ($x, $y)
2533} 3734}
2534 3735
3736sub coord2global {
3737 my ($self, $x, $y) = @_;
3738
3739 ($x, $y)
3740}
3741
2535sub update { 3742sub update {
2536 my ($self) = @_; 3743 my ($self) = @_;
2537 3744
2538 $self->check_size; 3745 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3746}
2541 3747
2542sub add { 3748sub add {
2543 my ($self, $child) = @_; 3749 my ($self, @children) = @_;
2544 3750
2545 # integerize window positions 3751 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3752 for @children;
2547 $child->{y} = int $child->{y};
2548 3753
2549 $self->SUPER::add ($child); 3754 $self->SUPER::add (@children);
3755}
3756
3757sub remove {
3758 my ($self, @children) = @_;
3759
3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3764
3765 while (@children) {
3766 my $w = pop @children;
3767 push @children, $w->children;
3768 $w->set_invisible;
3769 }
2550} 3770}
2551 3771
2552sub on_refresh { 3772sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3773 my ($self, $id, $cb) = @_;
2554 3774
2555 $self->{refresh_hook}{$id} = $cb; 3775 $self->{refresh_hook}{$id} = $cb;
2556} 3776}
2557 3777
3778sub on_post_alloc {
3779 my ($self, $id, $cb) = @_;
3780
3781 $self->{post_alloc_hook}{$id} = $cb;
3782}
3783
2558sub draw { 3784sub draw {
2559 my ($self) = @_; 3785 my ($self) = @_;
2560 3786
2561 while (my $rcb = delete $self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3788 $_->()
3789 for values %{delete $self->{refresh_hook}};
2563 } 3790 }
3791
3792 if ($self->{realloc}) {
3793 my %queue;
3794 my @queue;
3795 my $widget;
3796
3797 outer:
3798 while () {
3799 if (my $realloc = delete $self->{realloc}) {
3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3807 }
3808
3809 while () {
3810 @queue or last outer;
3811
3812 $widget = pop @{ $queue[-1] || [] }
3813 and last;
3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3833 $widget->{req_w} = $w;
3834 $widget->{req_h} = $h;
3835
3836 $self->{size_alloc}{$widget+0} = $widget;
3837
3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3848 }
3849 }
3850
3851 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859
3860 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0;
3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3870 $widget->{w} = $w;
3871 $widget->{h} = $h;
3872
3873 $widget->emit (size_allocate => $w, $h);
3874 }
3875 }
3876 }
3877
3878 while ($self->{post_alloc_hook}) {
3879 $_->()
3880 for values %{delete $self->{post_alloc_hook}};
3881 }
3882
2564 3883
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
2568 3887
2569 glMatrixMode GL_PROJECTION; 3888 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3889 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3892 glLoadIdentity;
2574 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
2575 $self->_draw; 3901 $self->_draw;
2576} 3902}
2577 3903
2578############################################################################# 3904#############################################################################
2579 3905
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3906package CFClient::UI;
2688 3907
2689$ROOT = new CFClient::UI::Root; 3908$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3909$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3910
26921 39111
2693 3912

Diff Legend

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