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

Diff Legend

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