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

Diff Legend

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