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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

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

Diff Legend

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