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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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