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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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->{root};
278 delete $self->{visible};
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, int $x;
195 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, 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
597 delete $WIDGET{$self+0};
450 #$self->deactivate; 598 #$self->deactivate;
451} 599}
452 600
453############################################################################# 601#############################################################################
454 602
… …
463 my $class = shift; 611 my $class = shift;
464 612
465 # range [value, low, high, page] 613 # range [value, low, high, page]
466 614
467 $class->SUPER::new ( 615 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
470 @_ 618 @_
471 ) 619 )
472} 620}
473 621
474sub _draw { 622sub _draw {
475 my ($self) = @_; 623 my ($self) = @_;
476 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
478 631
479 glEnable GL_BLEND; 632 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
482 635
483 glBegin GL_QUADS; 636 glBegin GL_QUADS;
484 glVertex 0 , 0; 637 glVertex 0 , 0;
485 glVertex 0 , $h; 638 glVertex 0 , $h;
486 glVertex $w, $h; 639 glVertex $w, $h;
487 glVertex $w, 0; 640 glVertex $w, 0;
488 glEnd; 641 glEnd;
489 642
490 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
491} 645}
492 646
493############################################################################# 647#############################################################################
494 648
495package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
502} 656}
503 657
504sub size_request { 658sub size_request {
505 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
506} 662}
507 663
508sub draw { } 664sub draw { }
509 665
510############################################################################# 666#############################################################################
… …
514our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
515 671
516sub new { 672sub new {
517 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
518 674
519 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
520 676
521 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
522 children => [], 678 children => [],
523 can_events => 0, 679 can_events => 0,
524 %arg, 680 %arg,
525 ); 681 );
682
526 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
527 685
528 $self 686 $self
529} 687}
530 688
531sub add { 689sub add {
532 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
533 691
534 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
535 694
536 use sort 'stable'; 695 use sort 'stable';
537 696
538 $self->{children} = [ 697 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
541 ]; 700 ];
542 701
543 $child->check_size; 702 $self->realloc;
544} 703}
545 704
546sub children { 705sub children {
547 @{ $_[0]{children} } 706 @{ $_[0]{children} }
548} 707}
… …
553 delete $child->{parent}; 712 delete $child->{parent};
554 $child->hide; 713 $child->hide;
555 714
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 716
558 $self->check_size; 717 $self->realloc;
559 $self->update;
560} 718}
561 719
562sub clear { 720sub clear {
563 my ($self) = @_; 721 my ($self) = @_;
564 722
… …
567 725
568 for (@$children) { 726 for (@$children) {
569 delete $_->{parent}; 727 delete $_->{parent};
570 $_->hide; 728 $_->hide;
571 } 729 }
730
731 $self->realloc;
572} 732}
573 733
574sub find_widget { 734sub find_widget {
575 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
576 736
577 $x -= $self->{x}; 737 $x -= $self->{x};
578 $y -= $self->{y}; 738 $y -= $self->{y};
579 739
580 my $res; 740 my $res;
581 741
582 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
583 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
584 and return $res; 744 and return $res;
585 } 745 }
586 746
587 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
636 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
637} 797}
638 798
639############################################################################# 799#############################################################################
640 800
801# back-buffered drawing area
802
641package CFClient::UI::Window; 803package CFClient::UI::Window;
642 804
643our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
644 806
645use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
651} 813}
652 814
653sub update { 815sub update {
654 my ($self) = @_; 816 my ($self) = @_;
655 817
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 819 $self->SUPER::update;
658} 820}
659 821
660sub size_allocate { 822sub size_allocate {
661 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
662 824
663 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 826 $self->update;
827}
828
829sub _render {
830 my ($self) = @_;
831
832 $self->{children}[0]->draw;
665} 833}
666 834
667sub render_child { 835sub render_child {
668 my ($self) = @_; 836 my ($self) = @_;
669 837
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
849 $self->_render;
674 }; 850 };
675} 851}
676 852
677sub _draw { 853sub _draw {
678 my ($self) = @_; 854 my ($self) = @_;
679 855
680 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
681 857
682 my $tex = $self->{texture} 858 my $tex = $self->{texture}
683 or return; 859 or return;
684 860
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 863 glColor 0, 0, 0, 1;
690 864
691 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 866
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
695} 868}
696 869
697############################################################################# 870#############################################################################
698 871
699package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
700 873
701our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728 875
729sub new { 876sub new {
730 my $class = shift; 877 my $class = shift;
731 878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
886sub size_request {
887 my ($self) = @_;
888
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890
891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
895}
896
897sub size_allocate {
898 my ($self, $w, $h) = @_;
899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
906 $self->update;
907}
908
909sub set_offset {
910 my ($self, $x, $y) = @_;
911
912 $self->{view_x} = int $x;
913 $self->{view_y} = int $y;
914
915 $self->update;
916}
917
918# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local {
920 my ($self, $x, $y) = @_;
921
922 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
923}
924
925sub coord2global {
926 my ($self, $x, $y) = @_;
927
928 $x = List::Util::min $self->{w}, $x - $self->{view_x};
929 $y = List::Util::min $self->{h}, $y - $self->{view_y};
930
931 $self->SUPER::coord2global ($x, $y)
932}
933
934sub find_widget {
935 my ($self, $x, $y) = @_;
936
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y)
943 }
944}
945
946sub _render {
947 my ($self) = @_;
948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953
954 $self->SUPER::_render;
955}
956
957#############################################################################
958
959package CFClient::UI::ScrolledWindow;
960
961our @ISA = CFClient::UI::HBox::;
962
963sub new {
964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
967
968 my $self;
969
970 my $slider = new CFClient::UI::Slider
971 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]);
975 },
976 ;
977
732 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
734 border_bg => [1, 1, 1, 1], 980 slider => $slider,
735 border => 0.8, 981 %arg,
736 @_
737 ); 982 );
738 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
739 $self 987 $self
740} 988}
741 989
742sub _draw { 990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
743 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
744 1008
745 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
746 1010
747 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
749 glEnable GL_TEXTURE_2D;
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751
752# glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
759
760
761 $self->child->draw;
762 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D;
764} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
765 1017
766############################################################################# 1018#############################################################################
767 1019
768package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
769 1021
770our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
771 1023
772use CFClient::OpenGL; 1024use CFClient::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777 1025
778sub new { 1026sub new {
779 my $class = shift; 1027 my $class = shift;
780 1028
781 # TODO: user_x, user_y, overwrite moveto? 1029 $class->SUPER::new (
1030 bg => undef,
1031 @_,
1032 )
1033}
1034
1035sub _draw {
1036 my ($self) = @_;
1037
1038 if ($self->{bg}) {
1039 my ($w, $h) = @$self{qw(w h)};
1040
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1043 glColor_premultiply @{ $self->{bg} };
1044
1045 glBegin GL_QUADS;
1046 glVertex 0 , 0;
1047 glVertex 0 , $h;
1048 glVertex $w, $h;
1049 glVertex $w, 0;
1050 glEnd;
1051
1052 glDisable GL_BLEND;
1053 }
1054
1055 $self->SUPER::_draw;
1056}
1057
1058#############################################################################
1059
1060package CFClient::UI::FancyFrame;
1061
1062our @ISA = CFClient::UI::Bin::;
1063
1064use CFClient::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073
1074sub new {
1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
782 1078
783 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
786 border => 0.8, 1082 border => 0.6,
787 can_events => 1, 1083 can_events => 1,
788 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
789 ); 1087 );
790 1088
791 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
792 align => 0, 1090 align => 0,
793 valign => 1, 1091 valign => 1,
794 text => $self->{title}, 1092 text => $title,
795 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
796 1095
797 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
798} 1104}
799 1105
800sub border { 1106sub border {
801 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
802} 1108}
803 1109
804sub size_request { 1110sub size_request {
805 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
806 1115
807 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
808 1117
809 ( 1118 (
810 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
813} 1122}
814 1123
815sub size_allocate { 1124sub size_allocate {
816 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
817 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
818 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
820 1137
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
822 if $self->{title};
823
824 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
825} 1139}
826 1140
827sub button_down { 1141sub button_down {
828 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
829 1143
1144 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 1145 my $border = $self->border;
831 1146
832 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
837 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
838 $self->{motion} = sub { 1158 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
840 1160
841 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
842 1163
843 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
845 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
846 }; 1169 };
847 1170
848 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
853 1174
854 $self->{motion} = sub { 1175 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
856 1177
857 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
858 1179
859 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
860 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
861 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
862 } 1188 1
863} 1189}
864 1190
865sub button_up { 1191sub button_up {
866 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
867 1193
868 delete $self->{motion}; 1194 !!delete $self->{motion}
869} 1195}
870 1196
871sub mouse_motion { 1197sub mouse_motion {
872 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
873 1199
874 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
875} 1203}
876 1204
877sub _draw { 1205sub _draw {
878 my ($self) = @_; 1206 my ($self) = @_;
879 1207
1208 my $child = $self->{children}[0];
1209
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
882 1212
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1215
888 my $border = $self->border; 1216 my $border = $self->border;
889 1217
890 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1223
896 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
897 1226
898 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
900 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
901 1230 $bg->{t} = $ch / $bg->{h};
902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
908 1233
909 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1235
912 $self->{title}->draw if $self->{title};
913 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
914} 1242}
915 1243
916############################################################################# 1244#############################################################################
917 1245
918package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
926sub new { 1254sub new {
927 my $class = shift; 1255 my $class = shift;
928 1256
929 $class->SUPER::new ( 1257 $class->SUPER::new (
930 col_expand => [], 1258 col_expand => [],
931 @_ 1259 @_,
932 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
933} 1265}
934 1266
935sub add { 1267sub add {
936 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
937 1269
938 $child->set_parent ($self); 1270 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
940 1272
941 $child->check_size; 1273 $self->realloc;
942} 1274}
943 1275
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
949sub clear { 1277sub clear {
950 my ($self) = @_; 1278 my ($self) = @_;
951 1279
952 my @children = $self->children; 1280 my @children = $self->children;
953 delete $self->{children}; 1281 delete $self->{children};
… …
955 for (@children) { 1283 for (@children) {
956 delete $_->{parent}; 1284 delete $_->{parent};
957 $_->hide; 1285 $_->hide;
958 } 1286 }
959 1287
960 $self->update; 1288 $self->realloc;
961} 1289}
962 1290
963sub get_wh { 1291sub get_wh {
964 my ($self) = @_; 1292 my ($self) = @_;
965 1293
… …
996sub size_allocate { 1324sub size_allocate {
997 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
998 1326
999 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1000 1328
1001 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1002 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1003 1331
1004 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1005 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1006 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1007 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1061 } 1389 }
1062} 1390}
1063 1391
1064############################################################################# 1392#############################################################################
1065 1393
1066package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1067
1068# TODO: wrap into common Box base class
1069 1395
1070our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1071 1397
1072sub size_request { 1398sub size_request {
1073 my ($self) = @_; 1399 my ($self) = @_;
1074 1400
1075 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1076 1402 ? (
1077 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1078 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1079 (List::Util::max map $_->[1], @alloc), 1405 )
1080 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1081} 1410}
1082 1411
1083sub size_allocate { 1412sub size_allocate {
1084 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1085 1414
1086 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1087
1088 my $children = $self->{children}; 1416 my $children = $self->{children};
1089 1417
1090 my @h = map $_->{req_w}, @$children; 1418 my @req;
1091 1419
1092 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1093 1421 @req = ($space / (@$children || 1)) x @$children;
1094 if ($req_h > $h) {
1095 # ah well, not enough space
1096 $_ *= $h / $req_h for @h;
1097 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1098 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1099 $exp ||= 1;
1100 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1101 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1102 my $child = $children->[$_];
1103
1104 my $alloc_h = $h[$_];
1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1106 $h[$_] = $alloc_h;
1107 } 1436 }
1108 } 1437 }
1109 1438
1110 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1111 1440
1112 my $y = 0; 1441 my $pos = 0;
1113 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1114 my $child = $children->[$_];
1115 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1116 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1117 1445
1118 $y += $h; 1446 $pos += $alloc;
1119 } 1447 }
1120 1448
1121 1 1449 1
1122} 1450}
1123 1451
1124############################################################################# 1452#############################################################################
1125 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1126package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1127 1470
1128# TODO: wrap into common Box base class
1129
1130our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1131 1472
1132sub size_request { 1473sub new {
1133 my ($self) = @_; 1474 my $class = shift;
1134 1475
1135 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1136 1477 vertical => 1,
1137 ( 1478 @_,
1138 (List::Util::max map $_->[0], @alloc),
1139 (List::Util::sum map $_->[1], @alloc),
1140 ) 1479 )
1141} 1480}
1142 1481
1143sub size_allocate {
1144 my ($self, $w, $h) = @_;
1145
1146 my $children = $self->{children};
1147
1148 my @h = map $_->{req_h}, @$children;
1149
1150 my $req_h = List::Util::sum @h;
1151
1152 if ($req_h > $h) {
1153 # ah well, not enough space
1154 $_ *= $h / $req_h for @h;
1155 } else {
1156 my $exp = List::Util::sum map $_->{expand}, @$children;
1157 $exp ||= 1;
1158
1159 for (0 .. $#$children) {
1160 my $child = $children->[$_];
1161
1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1163 }
1164 }
1165
1166 CFClient::UI::harmonize \@h;
1167
1168 my $y = 0;
1169 for (0 .. $#$children) {
1170 my $child = $children->[$_];
1171 my $h = $h[$_];
1172 $child->configure (0, $y, $w, $h);
1173
1174 $y += $h;
1175 }
1176
1177 1
1178}
1179
1180############################################################################# 1482#############################################################################
1181 1483
1182package CFClient::UI::Label; 1484package CFClient::UI::Label;
1183 1485
1184our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1185 1487
1186use CFClient::OpenGL; 1488use CFClient::OpenGL;
1187 1489
1188sub new { 1490sub new {
1189 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1190 1492
1191 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1193 #font => default_font 1497 #font => default_font
1498 #text => initial text
1499 #markup => initial narkup
1500 #max_w => maximum pixel width
1501 ellipsise => 3, # end
1502 layout => (new CFClient::Layout),
1194 fontsize => 1, 1503 fontsize => 1,
1195 text => "",
1196 align => -1, 1504 align => -1,
1197 valign => -1, 1505 valign => -1,
1198 padding => 2, 1506 padding_x => 2,
1199 layout => new CFClient::Layout, 1507 padding_y => 2,
1200 can_events => 0, 1508 can_events => 0,
1201 %arg 1509 %arg
1202 ); 1510 );
1203 1511
1204 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1515 $self->{template} = $layout;
1208 } 1516 }
1209 1517
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1519 $self->set_markup (delete $self->{markup});
1520 } else {
1521 $self->set_text (delete $self->{text});
1522 }
1212 1523
1213 $self 1524 $self
1214} 1525}
1215 1526
1216sub escape { 1527sub escape($) {
1217 local $_ = $_[1]; 1528 local $_ = $_[0];
1218 1529
1219 s/&/&amp;/g; 1530 s/&/&amp;/g;
1220 s/>/&gt;/g; 1531 s/>/&gt;/g;
1221 s/</&lt;/g; 1532 s/</&lt;/g;
1222 1533
1223 $_[1] 1534 $_
1224} 1535}
1225 1536
1226sub update { 1537sub update {
1227 my ($self) = @_; 1538 my ($self) = @_;
1228 1539
1229 delete $self->{texture}; 1540 delete $self->{texture};
1230 $self->SUPER::update; 1541 $self->SUPER::update;
1231} 1542}
1232 1543
1233sub reconfigure { 1544sub realloc {
1234 my ($self) = @_; 1545 my ($self) = @_;
1235 1546
1236 delete $self->{texture}; 1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1237} 1549}
1238 1550
1239sub set_text { 1551sub set_text {
1240 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1241 1553
1242 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1244 1556
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1246
1247 delete $self->{texture}; 1559 delete $self->{req_h};
1560
1561 $self->realloc;
1248 $self->update; 1562 $self->update;
1249 $self->check_size;
1250} 1563}
1251 1564
1252sub set_markup { 1565sub set_markup {
1253 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1254 1567
1255 return if $self->{text} eq "M$markup"; 1568 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1569 $self->{text} = "M$markup";
1257 1570
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1259
1260 delete $self->{texture}; 1575 delete $self->{req_h};
1576
1577 $self->realloc;
1261 $self->update; 1578 $self->update;
1262 $self->check_size;
1263} 1579}
1264 1580
1265sub size_request { 1581sub size_request {
1266 my ($self) = @_; 1582 my ($self) = @_;
1267 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1592
1272 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1273 1594
1274 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1277 1598
1278 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1279 1600
1280 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1282 } 1603 }
1283 1604
1605 ($w, $h)
1284 ( 1606 }
1285 $w + $self->{padding} * 2,
1286 $h + $self->{padding} * 2,
1287 )
1288} 1607}
1289 1608
1290sub size_allocate { 1609sub size_allocate {
1291 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1292 1611
1612 delete $self->{ox};
1613
1293 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1294} 1616}
1295 1617
1296sub set_fontsize { 1618sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1298 1620
1299 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1622 delete $self->{texture};
1301 $self->check_size; 1623
1302 $self->update; 1624 $self->realloc;
1303} 1625}
1304 1626
1305sub _draw { 1627sub _draw {
1306 my ($self) = @_; 1628 my ($self) = @_;
1307 1629
1630 $self->SUPER::_draw; # draw background, if applicable
1631
1308 my $tex = $self->{texture} ||= do { 1632 my $tex = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639
1312 new_from_layout CFClient::Texture $self->{layout} 1640 new_from_layout CFClient::Texture $self->{layout}
1313 }; 1641 };
1314 1642
1315 glEnable GL_BLEND; 1643 unless (exists $self->{ox}) {
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5);
1647
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5);
1651 };
1652
1317 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1654
1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319
1320 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $tex->draw_quad ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1335 1663
1336 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1665}
1339 1666
1340############################################################################# 1667#############################################################################
1341 1668
1342package CFClient::UI::EntryBase; 1669package CFClient::UI::EntryBase;
… …
1355 active_fg => [0, 0, 0], 1682 active_fg => [0, 0, 0],
1356 can_hover => 1, 1683 can_hover => 1,
1357 can_focus => 1, 1684 can_focus => 1,
1358 valign => 0, 1685 valign => 0,
1359 can_events => 1, 1686 can_events => 1,
1687 #text => ...
1360 @_ 1688 @_
1361 ) 1689 )
1362} 1690}
1363 1691
1364sub _set_text { 1692sub _set_text {
… …
1366 1694
1367 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1368 1696
1369 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1370 1698
1371 delete $self->{texture};
1372
1373 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1374 $self->{text} = $text; 1700 $self->{text} = $text;
1375 1701
1376 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1378 1705
1379 $self->emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1710}
1711
1712sub set_text {
1713 my ($self, $text) = @_;
1714
1715 $self->{cursor} = length $text;
1716 $self->_set_text ($text);
1380} 1717}
1381 1718
1382sub get_text { 1719sub get_text {
1383 $_[0]{text} 1720 $_[0]{text}
1384} 1721}
… …
1387 my ($self) = @_; 1724 my ($self) = @_;
1388 1725
1389 my ($w, $h) = $self->SUPER::size_request; 1726 my ($w, $h) = $self->SUPER::size_request;
1390 1727
1391 ($w + 1, $h) # add 1 for cursor 1728 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
1405 $self->update;
1406} 1729}
1407 1730
1408sub key_down { 1731sub key_down {
1409 my ($self, $ev) = @_; 1732 my ($self, $ev) = @_;
1410 1733
… …
1412 my $sym = $ev->{sym}; 1735 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1736 my $uni = $ev->{unicode};
1414 1737
1415 my $text = $self->get_text; 1738 my $text = $self->get_text;
1416 1739
1417 if ($sym == 8) { 1740 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1741 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1742 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1743 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1744 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1745 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1746 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1747 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1748 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1749 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1750 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1752 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1753 $self->_emit ('escape');
1431 } elsif ($uni) { 1754 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1433 } 1758 }
1434 1759
1435 $self->_set_text ($text); 1760 $self->_set_text ($text);
1436 $self->update; 1761
1762 $self->realloc;
1763
1764 1
1437} 1765}
1438 1766
1439sub focus_in { 1767sub focus_in {
1440 my ($self) = @_; 1768 my ($self) = @_;
1441 1769
… …
1456 utf8::encode $text; 1784 utf8::encode $text;
1457 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1458 1786
1459 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1460 $self->update; 1788 $self->update;
1789
1790 1
1461} 1791}
1462 1792
1463sub mouse_motion { 1793sub mouse_motion {
1464 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1465# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1466} 1798}
1467 1799
1468sub _draw { 1800sub _draw {
1469 my ($self) = @_; 1801 my ($self) = @_;
1470 1802
1471 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1472 1804
1473 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1474 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1475 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1476 } else { 1808 } else {
1477 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1478 } 1810 }
1479 1811
1480 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1482 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1483 glVertex 0 , 0; 1815 glVertex 0 , 0;
1484 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1485 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1486 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1521 if ($sym == 13) { 1853 if ($sym == 13) {
1522 unshift @{$self->{history}}, 1854 unshift @{$self->{history}},
1523 my $txt = $self->get_text; 1855 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1; 1856 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = ''; 1857 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt); 1858 $self->_emit (activate => $txt);
1527 $self->update; 1859 $self->update;
1528 1860
1529 } elsif ($sym == CFClient::SDLK_UP) { 1861 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) { 1862 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text; 1863 $self->{history_saveback} = $self->get_text;
… …
1547 } else { 1879 } else {
1548 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1549 } 1881 }
1550 1882
1551 } else { 1883 } else {
1552 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1553 } 1887 1
1554
1555} 1888}
1556 1889
1557############################################################################# 1890#############################################################################
1558 1891
1559package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1568 1901
1569sub new { 1902sub new {
1570 my $class = shift; 1903 my $class = shift;
1571 1904
1572 $class->SUPER::new ( 1905 $class->SUPER::new (
1573 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1574 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1577 can_hover => 1, 1910 can_hover => 1,
1578 align => 0, 1911 align => 0,
1579 valign => 0, 1912 valign => 0,
1580 can_events => 1, 1913 can_events => 1,
1581 @_ 1914 @_
1582 ) 1915 )
1583} 1916}
1584 1917
1918sub activate { }
1919
1585sub button_up { 1920sub button_up {
1586 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1587 1922
1923 $self->emit ("activate")
1588 if ($x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) { 1925 && $y >= 0 && $y < $self->{h};
1590 $self->emit ("activate"); 1926
1591 } 1927 1
1592} 1928}
1593 1929
1594sub _draw { 1930sub _draw {
1595 my ($self) = @_; 1931 my ($self) = @_;
1596 1932
1597 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1598 1934
1599 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg};
1601 }
1602
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1608 1938
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1939 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1940
1611 glDisable GL_TEXTURE_2D; 1941 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1942
1614 $self->SUPER::_draw; 1943 $self->SUPER::_draw;
1615} 1944}
1616 1945
1617############################################################################# 1946#############################################################################
… …
1628 1957
1629sub new { 1958sub new {
1630 my $class = shift; 1959 my $class = shift;
1631 1960
1632 $class->SUPER::new ( 1961 $class->SUPER::new (
1633 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1634 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1635 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1966 bg => [0, 0, 0, 0.2],
1967 active_bg => [1, 1, 1, 0.5],
1636 state => 0, 1968 state => 0,
1637 can_hover => 1, 1969 can_hover => 1,
1638 @_ 1970 @_
1639 ) 1971 )
1640} 1972}
1641 1973
1642sub size_request { 1974sub size_request {
1643 my ($self) = @_; 1975 my ($self) = @_;
1644 1976
1645 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1646} 1978}
1647 1979
1648sub button_down { 1980sub button_down {
1649 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1650 1982
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1653 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1655 } 1991 1
1656} 1992}
1657 1993
1658sub _draw { 1994sub _draw {
1659 my ($self) = @_; 1995 my ($self) = @_;
1660 1996
1661 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1662 1998
1663 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1664 2000
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1666 2004
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 2006
1669 glEnable GL_BLEND; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
2008
1670 glEnable GL_TEXTURE_2D; 2009 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 2010 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 2011 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 2012}
1680 2013
1681############################################################################# 2014#############################################################################
1682 2015
1683package CFClient::UI::Image; 2016package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 2059 glTranslate 0, -$self->{w}, 0;
1727 2060
1728 ($w, $h) = ($h, $w); 2061 ($w, $h) = ($h, $w);
1729 } 2062 }
1730 2063
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 2064 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 2066
1736 $tex->draw_quad (0, 0, $w, $h); 2067 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 2068
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 2069 glDisable GL_TEXTURE_2D;
1740} 2070}
1741 2071
1742############################################################################# 2072#############################################################################
1743 2073
… …
1833 2163
1834 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
1836 2166
1837 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1839 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 2172
1842 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
1843 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2263 qw(s1_slider.png s1_slider_bg.png);
1933 2264
1934sub new { 2265sub new {
1935 my $class = shift; 2266 my $class = shift;
1936 2267
1937 # range [value, low, high, page] 2268 # range [value, low, high, page, unit]
1938 2269
1939 # TODO: 0-width page 2270 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2271 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2272 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2273 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
1944 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2276 bg => [0, 0, 0, 0.2],
2277 active_bg => [1, 1, 1, 0.5],
1945 range => [0, 0, 100, 10], 2278 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2279 min_w => $::WIDTH / 80,
1947 req_h => 20, 2280 min_h => $::WIDTH / 80,
1948 vertical => 0, 2281 vertical => 0,
1949 can_hover => 1, 2282 can_hover => 1,
1950 inner_pad => 5, 2283 inner_pad => 0.02,
1951 @_ 2284 @_
1952 ); 2285 );
1953 2286
2287 $self->set_value ($self->{range}[0]);
2288 $self->update;
2289
1954 $self 2290 $self
1955} 2291}
1956 2292
2293sub changed { }
2294
2295sub set_range {
2296 my ($self, $range) = @_;
2297
2298 ($range, $self->{range}) = ($self->{range}, $range);
2299
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2302}
2303
2304sub set_value {
2305 my ($self, $value) = @_;
2306
2307 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2308
2309 $hi = $lo + 1 if $hi <= $lo;
2310
2311 $page = $hi - $lo if $page > $hi - $lo;
2312
2313 $value = $lo if $value < $lo;
2314 $value = $hi - $page if $value > $hi - $page;
2315
2316 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2317 if $unit;
2318
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320
2321 if ($value != $old_value) {
2322 $self->_emit (changed => $value);
2323 $self->update;
2324 }
2325}
2326
1957sub size_request { 2327sub size_request {
1958 my ($self) = @_; 2328 my ($self) = @_;
1959 2329
1960 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
1961 my $h = $self->{req_h};
1962
1963 $self->{vertical} ? ($h, $w) : ($w, $h)
1964} 2331}
1965 2332
1966sub button_down { 2333sub button_down {
1967 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
1968 2335
1969 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2337
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339
1970 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
1971} 2341}
1972 2342
1973sub mouse_motion { 2343sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
1975 2345
1976 if ($GRAB == $self) { 2346 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348
2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2350
2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2352
2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2358 1
2359}
2360
2361sub update {
2362 my ($self) = @_;
2363
2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2372 $self->set_value ($self->{range}[0]);
2373
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2375 my $range = ($hi - $page - $lo) || 1e-100;
1978 2376
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2377 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2378
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2379 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2380 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2381
1984 $x -= $inner_pad_px; # substract the padding 2382 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2383 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2384
1990 $self->emit (changed => $x); 2385 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2386 $self->{knob_w} = $knob_w;
1992 } 2387 }
1993}
1994
1995# the inner_* stuff is for generating a padding for the slider handle,
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001}
2002
2003sub _draw {
2004 my ($self) = @_;
2005 2388
2006 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2007 2390
2008 my ($w, $h) = @$self{qw(w h)}; 2391 glScale $self->{w}, $self->{h};
2009 2392
2010 if ($self->{vertical}) { 2393 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2394 # draw a vertical slider like a rotated horizontal slider
2012 2395
2396 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2397 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2398 }
2018 2399
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2400 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2401 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2402
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2403 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2404 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2405
2045 # draw background 2406 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2407 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2408
2048 # draw handle 2409 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2410 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2050 2411
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
2053} 2413}
2414
2415#############################################################################
2416
2417package CFClient::UI::ValSlider;
2418
2419our @ISA = CFClient::UI::HBox::;
2420
2421sub new {
2422 my ($class, %arg) = @_;
2423
2424 my $range = delete $arg{range};
2425
2426 my $self = $class->SUPER::new (
2427 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2428 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2429 to_value => sub { shift },
2430 from_value => sub { shift },
2431 %arg,
2432 );
2433
2434 $self->{slider}->connect (changed => sub {
2435 my ($self, $value) = @_;
2436 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2437 $self->{parent}->emit (changed => $value);
2438 });
2439
2440# $self->{entry}->connect (changed => sub {
2441# my ($self, $value) = @_;
2442# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2443# $self->{parent}->emit (changed => $value);
2444# });
2445
2446 $self->add ($self->{slider}, $self->{entry});
2447
2448 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2449
2450 $self
2451}
2452
2453sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) }
2054 2455
2055############################################################################# 2456#############################################################################
2056 2457
2057package CFClient::UI::TextView; 2458package CFClient::UI::TextView;
2058 2459
… …
2067 fontsize => 1, 2468 fontsize => 1,
2068 can_events => 0, 2469 can_events => 0,
2069 #font => default_font 2470 #font => default_font
2070 @_, 2471 @_,
2071 2472
2072 layout => (new CFClient::Layout), 2473 layout => (new CFClient::Layout 1),
2073 par => [], 2474 par => [],
2074 height => 0, 2475 height => 0,
2075 children => [ 2476 children => [
2076 (new CFClient::UI::Empty expand => 1), 2477 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2478 (new CFClient::UI::Slider vertical => 1),
2078 ], 2479 ],
2079 ); 2480 );
2080 2481
2081 $self->{children}[1]->connect (changed => sub { 2482 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2483
2085 $self 2484 $self
2086} 2485}
2087 2486
2088sub set_fontsize { 2487sub set_fontsize {
2089 my ($self, $fontsize) = @_; 2488 my ($self, $fontsize) = @_;
2090 2489
2091 $self->{fontsize} = $fontsize; 2490 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2491 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112} 2492}
2113 2493
2114sub size_allocate { 2494sub size_allocate {
2115 my ($self, $w, $h) = @_; 2495 my ($self, $w, $h) = @_;
2116 2496
… …
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2501 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2502
2123 $self->reflow; 2503 $self->reflow;
2124} 2504}
2125 2505
2506sub text_size {
2507 my ($self, $text, $indent) = @_;
2508
2509 my $layout = $self->{layout};
2510
2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512 $layout->set_width ($self->{children}[0]{w} - $indent);
2513 $layout->set_markup ($text);
2514
2515 $layout->size
2516}
2517
2518sub reflow {
2519 my ($self) = @_;
2520
2521 $self->{need_reflow}++;
2522 $self->update;
2523}
2524
2525sub set_offset {
2526 my ($self, $offset) = @_;
2527
2528 # todo: base offset on lines or so, not on pixels
2529 $self->{children}[1]->set_value ($offset);
2530}
2531
2532sub clear {
2533 my ($self) = @_;
2534
2535 $self->{par} = [];
2536 $self->{height} = 0;
2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2538}
2539
2126sub add_paragraph { 2540sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2541 my ($self, $color, $text, $indent) = @_;
2128 2542
2129 #TODO: intelligently "reformat" paragraph 2543 for my $line (split /\n/, $text) {
2130 2544 my ($w, $h) = $self->text_size ($line);
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height; 2545 $self->{height} += $h;
2546 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2547 }
2134 2548
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2549 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2138 $self->{children}[1]->update;
2139} 2550}
2140 2551
2141sub update { 2552sub update {
2142 my ($self) = @_; 2553 my ($self) = @_;
2143 2554
… …
2145 2556
2146 return unless $self->{h} > 0; 2557 return unless $self->{h} > 0;
2147 2558
2148 delete $self->{texture}; 2559 delete $self->{texture};
2149 2560
2150 $ROOT->on_refresh ($self, sub { 2561 $ROOT->on_post_alloc ($self, sub {
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563
2151 if (delete $self->{need_reflow}) { 2564 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2565 my $height = 0;
2153 2566
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
2155 for @{$self->{par}}; 2571 for (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573 $layout->set_width ($W - $_->[3]);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3];
2577 $_->[1] = $h;
2578 }
2579
2580 $height += $_->[1];
2581 }
2156 2582
2157 $self->{height} = $height; 2583 $self->{height} = $height;
2158 2584
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2585 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2160 2586
2161 delete $self->{texture}; 2587 delete $self->{texture};
2162 } 2588 }
2163 2589
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2165 glClearColor 0, 0, 0, 1; 2591 glClearColor 0, 0, 0, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2167 2593
2594 my $top = int $self->{children}[1]{range}[0];
2595
2596 my $y0 = $top;
2597 my $y1 = $top + $H;
2598
2599 my $y = 0;
2600
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2168 glEnable GL_BLEND; 2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183 2608
2184 for my $par (@{$self->{par}}) { 2609 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2610 my $h = $par->[1];
2186 2611
2187 if ($y0 < $y + $h && $y < $y1) { 2612 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] });
2614 $layout->set_width ($W - $par->[3]);
2188 $layout->set_text ($par->[2]); 2615 $layout->set_markup ($par->[4]);
2189 2616
2190 glColor @{ $par->[1] }; 2617 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2618
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2619 glRasterPos $par->[3], $y - $y0;
2620 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2193 } 2621 }
2194 2622
2195 $y += $h; 2623 $y += $h;
2196 } 2624 }
2197 2625
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2626 glDisable GL_BLEND;
2200 }; 2627 };
2201 }); 2628 });
2202} 2629}
2203 2630
2204sub _draw { 2631sub _draw {
2205 my ($self) = @_; 2632 my ($self) = @_;
2206 2633
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2213 }
2214 2639
2215 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2216 2641
2217} 2642}
2218 2643
… …
2266 2691
2267sub new { 2692sub new {
2268 my $class = shift; 2693 my $class = shift;
2269 2694
2270 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2271 state => 0, 2696 state => 0,
2272 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2273 @_ 2698 @_
2274 ); 2699 );
2275 2700
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self 2701 $self
2282} 2702}
2283 2703
2284sub toggle_flopper { 2704sub toggle_flopper {
2285 my ($self) = @_; 2705 my ($self) = @_;
2286 2706
2287 # TODO: use animation 2707 $self->{other}->toggle_visibility;
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298} 2708}
2299 2709
2300############################################################################# 2710#############################################################################
2301 2711
2302package CFClient::UI::Tooltip; 2712package CFClient::UI::Tooltip;
… …
2312 @_, 2722 @_,
2313 can_events => 0, 2723 can_events => 0,
2314 ) 2724 )
2315} 2725}
2316 2726
2317sub set_markup { 2727sub set_tooltip_from {
2318 my ($self, $text) = @_; 2728 my ($self, $widget) = @_;
2319 2729
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2730 my $tooltip = $widget->{tooltip};
2321 $self->{label}->set_markup ($text); 2731
2322 $self->add ($self->{label}); 2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2739 $self->add (new CFClient::UI::Label
2740 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8,
2743 fg => [0, 0, 0, 1],
2744 ellipsise => 0,
2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
2746 );
2323} 2747}
2324 2748
2325sub size_request { 2749sub size_request {
2326 my ($self) = @_; 2750 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2751
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2753
2332 ($w + 4, $h + 4) 2754 ($w + 4, $h + 4)
2333} 2755}
… …
2336 my ($self, $w, $h) = @_; 2758 my ($self, $w, $h) = @_;
2337 2759
2338 $self->SUPER::size_allocate ($w - 4, $h - 4); 2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339} 2761}
2340 2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2779}
2780
2341sub _draw { 2781sub _draw {
2342 my ($self) = @_; 2782 my ($self) = @_;
2343 2783
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2784 glTranslate 0.375, 0.375;
2346 2785
2347 my ($w, $h) = @$self{qw(w h)}; 2786 my ($w, $h) = @$self{qw(w h)};
2348 2787
2349 glColor 1, 0.8, 0.4; 2788 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2799 glVertex 0 , $h;
2361 glVertex $w, $h; 2800 glVertex $w, $h;
2362 glVertex $w, 0; 2801 glVertex $w, 0;
2363 glEnd; 2802 glEnd;
2364 2803
2365 glPopMatrix; 2804 glTranslate 2 - 0.375, 2 - 0.375;
2366 2805
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2806 $self->SUPER::_draw;
2369} 2807}
2370 2808
2371############################################################################# 2809#############################################################################
2372 2810
… …
2377use CFClient::OpenGL; 2815use CFClient::OpenGL;
2378 2816
2379sub new { 2817sub new {
2380 my $class = shift; 2818 my $class = shift;
2381 2819
2382 $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2383 aspect => 1, 2821 aspect => 1,
2822 can_events => 0,
2823 @_,
2824 );
2825
2826 if ($self->{anim} && $self->{animspeed}) {
2827 Scalar::Util::weaken (my $widget = $self);
2828
2829 $self->{timer} = Event->timer (
2830 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2831 hard => 1,
2832 interval => $self->{animspeed},
2833 cb => sub {
2834 ++$widget->{frame};
2835 $widget->update;
2836 },
2837 );
2838 }
2839
2840 $self
2841}
2842
2843sub size_request {
2844 (32, 8)
2845}
2846
2847sub update {
2848 my ($self) = @_;
2849
2850 return unless $self->{visible};
2851
2852 $self->SUPER::update;
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 return unless $::CONN;
2859
2860 my $face;
2861
2862 if ($self->{frame}) {
2863 my $anim = $::CONN->{anim}[$self->{anim}];
2864
2865 $face = $anim->[ $self->{frame} % @$anim ]
2866 if $anim && @$anim;
2867 }
2868
2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2870
2871 if ($tex) {
2872 glEnable GL_TEXTURE_2D;
2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2874 glColor 0, 0, 0, 1;
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D;
2877 }
2878}
2879
2880sub DESTROY {
2881 my ($self) = @_;
2882
2883 $self->{timer}->cancel
2884 if $self->{timer};
2885
2886 $self->SUPER::DESTROY;
2887}
2888
2889#############################################################################
2890
2891package CFClient::UI::Buttonbar;
2892
2893our @ISA = CFClient::UI::HBox::;
2894
2895# TODO: should actualyl wrap buttons and other goodies.
2896
2897#############################################################################
2898
2899package CFClient::UI::Menu;
2900
2901our @ISA = CFClient::UI::FancyFrame::;
2902
2903use CFClient::OpenGL;
2904
2905sub new {
2906 my $class = shift;
2907
2908 my $self = $class->SUPER::new (
2909 items => [],
2910 z => 100,
2911 @_,
2912 );
2913
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2915
2916 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item;
2918
2919 # handle various types of items, only text for now
2920 if (!ref $widget) {
2921 $widget = new CFClient::UI::Label
2922 can_hover => 1,
2923 can_events => 1,
2924 text => $widget;
2925 }
2926
2927 $self->{item}{$widget} = $item;
2928
2929 $self->{vbox}->add ($widget);
2930 }
2931
2932 $self
2933}
2934
2935# popup given the event (must be a mouse button down event currently)
2936sub popup {
2937 my ($self, $ev) = @_;
2938
2939 $self->_emit ("popdown");
2940
2941 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self;
2943 $self->{button} = $ev->{button};
2944
2945 $self->show;
2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2947}
2948
2949sub mouse_motion {
2950 my ($self, $ev, $x, $y) = @_;
2951
2952 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2957}
2958
2959sub button_up {
2960 my ($self, $ev, $x, $y) = @_;
2961
2962 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB;
2964 $self->hide;
2965
2966 $self->_emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2972 1
2973}
2974
2975#############################################################################
2976
2977package CFClient::UI::Multiplexer;
2978
2979our @ISA = CFClient::UI::Container::;
2980
2981sub new {
2982 my $class = shift;
2983
2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
3093 fontsize => 0.8,
3094 @_,
3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
3102}
3103
3104sub reorder {
3105 my ($self) = @_;
3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
3112
3113 while (my ($k, $v) = each %{ $self->{item} }) {
3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3115 }
3116
3117 my @widgets;
3118
3119 my @items = sort {
3120 $a->{pri} <=> $b->{pri}
3121 or $b->{id} <=> $a->{id}
3122 } values %{ $self->{item} };
3123
3124 $self->{timer}->interval (1);
3125
3126 my $count = 10 + 1;
3127 for my $item (@items) {
3128 last unless --$count;
3129
3130 my $label = $item->{label} ||= do {
3131 # TODO: doesn't handle markup well (read as: at all)
3132 my $short = $item->{count} > 1
3133 ? "<b>$item->{count} ×</b> $item->{text}"
3134 : $item->{text};
3135
3136 for ($short) {
3137 s/^\s+//;
3138 s/\s+/ /g;
3139 }
3140
3141 new CFClient::UI::Label
3142 markup => $short,
3143 tooltip => $item->{tooltip},
3144 tooltip_font => $::FONT_PROP,
3145 tooltip_width => 0.67,
3146 fontsize => $item->{fontsize} || $self->{fontsize},
3147 max_w => $::WIDTH * 0.44,
3148 fg => [@{ $item->{fg} }],
3149 can_events => 1,
3150 can_hover => 1
3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
3164 }
3165
3166 $self->clear;
3167 $self->SUPER::add (reverse @widgets);
3168}
3169
3170sub add {
3171 my ($self, $text, %arg) = @_;
3172
3173 $text =~ s/^\s+//;
3174 $text =~ s/\s+$//;
3175
3176 return unless $text;
3177
3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3179
3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3181
3182 if (my $item = $self->{item}{$group}) {
3183 if ($item->{text} eq $text) {
3184 $item->{count}++;
3185 } else {
3186 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text;
3188 }
3189 $item->{id} = ++$self->{id};
3190 $item->{timeout} = $timeout;
3191 delete $item->{label};
3192 } else {
3193 $self->{item}{$group} = {
3194 id => ++$self->{id},
3195 text => $text,
3196 timeout => $timeout,
3197 tooltip => $text,
3198 fg => [0.8, 0.8, 0.8, 0.8],
3199 pri => 0,
3200 count => 1,
3201 %arg,
3202 };
3203 }
3204
3205 $self->reorder;
3206}
3207
3208sub reconfigure {
3209 my ($self) = @_;
3210
3211 delete $_->{label}
3212 for values %{ $self->{item} || {} };
3213
3214 $self->reorder;
3215 $self->SUPER::reconfigure;
3216}
3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Inventory;
3229
3230our @ISA = CFClient::UI::ScrolledWindow::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
2384 @_, 3477 @_,
2385 ) 3478 )
2386} 3479}
2387 3480
3481# XXX: Do sorting? Argl...
3482sub add_spell {
3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3485
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root;
3524
3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3528
3529use CFClient::OpenGL;
3530
3531sub new {
3532 my $class = shift;
3533
3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
3542}
3543
2388sub size_request { 3544sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_; 3545 my ($self) = @_;
2394 3546
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3547 ($self->{w}, $self->{h})
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407} 3548}
2408 3549
2409############################################################################# 3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
2410 3552
2411package CFClient::UI::Root; 3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
2412 3557
2413our @ISA = CFClient::UI::Container::; 3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
2414 3560
2415use CFClient::OpenGL; 3561 int $coord + 0.5
2416
2417sub check_size {
2418 my ($self) = @_;
2419
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2421} 3562}
2422 3563
2423sub size_request { 3564sub size_allocate {
2424 ($::WIDTH, $::HEIGHT)
2425}
2426
2427sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
2429 3566
2430 $self->SUPER::configure ($x, $y, $w, $h);
2431
2432 for my $child (@{$self->{children}}) { 3567 for my $child ($self->children) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434 3569
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3570 $X = $child->{force_x} if exists $child->{force_x};
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3571 $Y = $child->{force_y} if exists $child->{force_y};
3572
3573 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h};
3575
2437 $child->configure ($X, $Y, $W,$H); 3576 $child->configure ($X, $Y, $W, $H);
2438 } 3577 }
2439} 3578}
2440 3579
2441sub _topleft { 3580sub coord2local {
2442 my ($self, $x, $y) = @_; 3581 my ($self, $x, $y) = @_;
2443 3582
2444 ($x, $y) 3583 ($x, $y)
2445} 3584}
2446 3585
3586sub coord2global {
3587 my ($self, $x, $y) = @_;
3588
3589 ($x, $y)
3590}
3591
2447sub update { 3592sub update {
2448 my ($self) = @_; 3593 my ($self) = @_;
2449 3594
2450 $self->check_size; 3595 $::WANT_REFRESH++;
2451 ::refresh ();
2452} 3596}
2453 3597
2454sub add { 3598sub add {
2455 my ($self, $child) = @_; 3599 my ($self, @children) = @_;
2456 3600
2457 # integerize window positions 3601 $_->{is_toplevel} = 1
2458 $child->{x} = int $child->{x}; 3602 for @children;
2459 $child->{y} = int $child->{y};
2460 3603
2461 $self->SUPER::add ($child); 3604 $self->SUPER::add (@children);
3605}
3606
3607sub remove {
3608 my ($self, @children) = @_;
3609
3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3614
3615 while (@children) {
3616 my $w = pop @children;
3617 push @children, $w->children;
3618 $w->set_invisible;
3619 }
2462} 3620}
2463 3621
2464sub on_refresh { 3622sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3623 my ($self, $id, $cb) = @_;
2466 3624
2467 $self->{refresh_hook}{$id} = $cb; 3625 $self->{refresh_hook}{$id} = $cb;
2468} 3626}
2469 3627
3628sub on_post_alloc {
3629 my ($self, $id, $cb) = @_;
3630
3631 $self->{post_alloc_hook}{$id} = $cb;
3632}
3633
2470sub draw { 3634sub draw {
2471 my ($self) = @_; 3635 my ($self) = @_;
2472 3636
2473 while (my $rcb = delete $self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 3638 $_->()
3639 for values %{delete $self->{refresh_hook}};
2475 } 3640 }
3641
3642 if ($self->{realloc}) {
3643 my %queue;
3644 my @queue;
3645 my $widget;
3646
3647 outer:
3648 while () {
3649 if (my $realloc = delete $self->{realloc}) {
3650 for $widget (values %$realloc) {
3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3657 }
3658
3659 while () {
3660 @queue or last outer;
3661
3662 $widget = pop @{ $queue[-1] || [] }
3663 and last;
3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3683 $widget->{req_w} = $w;
3684 $widget->{req_h} = $h;
3685
3686 $self->{size_alloc}{$widget+0} = $widget;
3687
3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3698 }
3699 }
3700
3701 while (my $size_alloc = delete $self->{size_alloc}) {
3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709
3710 $w = 0 if $w < 0;
3711 $h = 0 if $h < 0;
3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3720 $widget->{w} = $w;
3721 $widget->{h} = $h;
3722
3723 $widget->emit (size_allocate => $w, $h);
3724 }
3725 }
3726 }
3727
3728 while ($self->{post_alloc_hook}) {
3729 $_->()
3730 for values %{delete $self->{post_alloc_hook}};
3731 }
3732
2476 3733
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
2480 3737
2481 glMatrixMode GL_PROJECTION; 3738 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3739 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3742 glLoadIdentity;
2486 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
2487 $self->_draw; 3751 $self->_draw;
2488} 3752}
2489 3753
2490############################################################################# 3754#############################################################################
2491 3755
2492package CFClient::UI; 3756package CFClient::UI;
2493 3757
2494$ROOT = new CFClient::UI::Root; 3758$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3759$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3760
24971 37611
2498 3762

Diff Legend

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