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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 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 image => '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, $self->border - $::FONTSIZE * 2, $w, $::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->{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}
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1413 }; 1678 };
1414 1679
1680 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5);
1684
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5);
1688 };
1689
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->check_size;
1476 $self->update;
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}
1527 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1528sub focus_in { 1808sub invoke_focus_in {
1529 my ($self) = @_; 1809 my ($self) = @_;
1530 1810
1531 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1532 1812
1533 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1534} 1814}
1535 1815
1536sub button_down { 1816sub invoke_button_down {
1537 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1538 1818
1539 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1540 1820
1541 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1542 1822
1543 # byte-index to char-index 1823 # byte-index to char-index
1544 my $text = $self->{text}; 1824 my $text = $self->{text};
1545 utf8::encode $text; 1825 utf8::encode $text;
1546 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1547 1827
1548 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1549 $self->update; 1829 $self->update;
1830
1831 1
1550} 1832}
1551 1833
1552sub mouse_motion { 1834sub invoke_mouse_motion {
1553 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1554# 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
1555} 1839}
1556 1840
1557sub _draw { 1841sub _draw {
1558 my ($self) = @_; 1842 my ($self) = @_;
1559 1843
1560 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1561 1845
1562 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1563 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1564 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1565 } else { 1849 } else {
1566 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1567 } 1851 }
1568 1852
1569 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1570 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1571 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1572 glVertex 0 , 0; 1856 glVertex 0 , 0;
1573 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1574 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1575 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1600 1884
1601our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1602 1886
1603use CFClient::OpenGL; 1887use CFClient::OpenGL;
1604 1888
1605sub key_down { 1889sub invoke_key_down {
1606 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1607 1891
1608 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1609 1893
1610 if ($sym == 13) { 1894 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1613 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1616 $self->update; 1901 $self->update;
1617 1902
… …
1636 } else { 1921 } else {
1637 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1638 } 1923 }
1639 1924
1640 } else { 1925 } else {
1641 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1642 } 1929 1
1643
1644} 1930}
1645 1931
1646############################################################################# 1932#############################################################################
1647 1933
1648package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1657 1943
1658sub new { 1944sub new {
1659 my $class = shift; 1945 my $class = shift;
1660 1946
1661 $class->SUPER::new ( 1947 $class->SUPER::new (
1662 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1663 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1666 can_hover => 1, 1952 can_hover => 1,
1667 align => 0, 1953 align => 0,
1668 valign => 0, 1954 valign => 0,
1669 can_events => 1, 1955 can_events => 1,
1670 @_ 1956 @_
1671 ) 1957 )
1672} 1958}
1673 1959
1674sub button_up { 1960sub invoke_button_up {
1675 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1676 1962
1963 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate"); 1966
1680 } 1967 1
1681} 1968}
1682 1969
1683sub _draw { 1970sub _draw {
1684 my ($self) = @_; 1971 my ($self) = @_;
1685 1972
1686 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1687
1688 if ($GRAB == $self) {
1689 $self->{fg} = $self->{active_fg};
1690 }
1691 1974
1692 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1694 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1695 1978
… …
1700 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1701} 1984}
1702 1985
1703############################################################################# 1986#############################################################################
1704 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
1705package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1706 2025
1707our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1708 2027
1709my @tex = 2028my @tex =
… …
1714 2033
1715sub new { 2034sub new {
1716 my $class = shift; 2035 my $class = shift;
1717 2036
1718 $class->SUPER::new ( 2037 $class->SUPER::new (
1719 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1720 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1721 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],
1722 state => 0, 2044 state => 0,
1723 can_hover => 1, 2045 can_hover => 1,
1724 @_ 2046 @_
1725 ) 2047 )
1726} 2048}
1727 2049
1728sub size_request { 2050sub size_request {
1729 my ($self) = @_; 2051 my ($self) = @_;
1730 2052
1731 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1732} 2054}
1733 2055
1734sub button_down { 2056sub invoke_button_down {
1735 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1736 2058
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1739 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1741 } 2067 1
1742} 2068}
1743 2069
1744sub _draw { 2070sub _draw {
1745 my ($self) = @_; 2071 my ($self) = @_;
1746 2072
1747 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1748 2074
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1750 2076
1751 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;
1752 2080
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754 2082
1755 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756 2084
… …
1911 2239
1912 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
1914 2242
1915 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1917 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 2248
1920 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
1921 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2018 # TODO: req_w/h are wrong with vertical 2347 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2348 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2349 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2351 active_fg => [0, 0, 0],
2352 bg => [0, 0, 0, 0.2],
2353 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2354 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2026 vertical => 0, 2357 vertical => 0,
2027 can_hover => 1, 2358 can_hover => 1,
2028 inner_pad => .05, 2359 inner_pad => 0.02,
2029 @_ 2360 @_
2030 ); 2361 );
2031 2362
2032 $self->set_value ($self->{range}[0]); 2363 $self->set_value ($self->{range}[0]);
2033 $self->update; 2364 $self->update;
2034 2365
2035 $self 2366 $self
2036} 2367}
2037 2368
2369sub set_range {
2370 my ($self, $range) = @_;
2371
2372 ($range, $self->{range}) = ($self->{range}, $range);
2373
2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2378}
2379
2038sub set_value { 2380sub set_value {
2039 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2040 2382
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2383 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2384
2043 $hi = $lo + 1 if $hi <= $lo; 2385 $hi = $lo + 1 if $hi <= $lo;
2044 2386
2387 $page = $hi - $lo if $page > $hi - $lo;
2388
2045 $value = $lo if $value < $lo; 2389 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2390 $value = $hi - $page if $value > $hi - $page;
2047 2391
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2392 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2393 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2394
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2396
2055 if ($value != $old_value) { 2397 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2398 $self->emit (changed => $value);
… …
2059} 2401}
2060 2402
2061sub size_request { 2403sub size_request {
2062 my ($self) = @_; 2404 my ($self) = @_;
2063 2405
2064 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2065 my $h = $self->{req_h};
2066
2067 $self->{vertical} ? ($h, $w) : ($w, $h)
2068} 2407}
2069 2408
2070sub button_down { 2409sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2072 2411
2073 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2413
2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2415
2074 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2075} 2417}
2076 2418
2077sub mouse_motion { 2419sub invoke_mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2079 2421
2080 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2424
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2426
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2428
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2088 } 2434 1
2089} 2435}
2090 2436
2091sub update { 2437sub update {
2092 my ($self) = @_; 2438 my ($self) = @_;
2093 2439
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2095 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2096 2449
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2451 my $range = ($hi - $page - $lo) || 1e-100;
2098 2452
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2453 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2454
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2455 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2456 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2457
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2458 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2459 $value = $value * $self->{scale} + $self->{offset};
2105 2460
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2462 $self->{knob_w} = $knob_w;
2113 }); 2463 }
2114
2115 $self->SUPER::update;
2116}
2117
2118sub _draw {
2119 my ($self) = @_;
2120 2464
2121 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2122 2466
2123 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2124 2468
2125 if ($self->{vertical}) { 2469 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2470 # draw a vertical slider like a rotated horizontal slider
2127 2471
2472 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2473 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2474 }
2131 2475
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2476 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2477 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2478
… …
2144 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2145} 2489}
2146 2490
2147############################################################################# 2491#############################################################################
2148 2492
2493package CFClient::UI::ValSlider;
2494
2495our @ISA = CFClient::UI::HBox::;
2496
2497sub new {
2498 my ($class, %arg) = @_;
2499
2500 my $range = delete $arg{range};
2501
2502 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift },
2506 from_value => sub { shift },
2507 %arg,
2508 );
2509
2510 $self->{slider}->connect (changed => sub {
2511 my ($self, $value) = @_;
2512 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2513 $self->{parent}->emit (changed => $value);
2514 });
2515
2516# $self->{entry}->connect (changed => sub {
2517# my ($self, $value) = @_;
2518# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2519# $self->{parent}->emit (changed => $value);
2520# });
2521
2522 $self->add ($self->{slider}, $self->{entry});
2523
2524 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2525
2526 $self
2527}
2528
2529sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) }
2531
2532#############################################################################
2533
2149package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2150 2535
2151our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2152 2537
2153use CFClient::OpenGL; 2538use CFClient::OpenGL;
2154 2539
… …
2156 my $class = shift; 2541 my $class = shift;
2157 2542
2158 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2159 fontsize => 1, 2544 fontsize => 1,
2160 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2161 #font => default_font 2547 #font => default_font
2162 @_, 2548 @_,
2163 2549
2164 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2165 par => [], 2551 par => [],
… …
2180 2566
2181 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2568 $self->reflow;
2183} 2569}
2184 2570
2185sub text_height {
2186 my ($self, $text) = @_;
2187
2188 my $layout = $self->{layout};
2189
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w});
2192 $layout->set_markup ($text);
2193
2194 ($layout->size)[1]
2195}
2196
2197sub reflow {
2198 my ($self) = @_;
2199
2200 $self->{need_reflow}++;
2201 $self->update;
2202}
2203
2204sub size_allocate { 2571sub invoke_size_allocate {
2205 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2206
2207 $self->SUPER::size_allocate ($w, $h);
2208 2573
2209 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2212 2578
2213 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2582}
2583
2584sub text_size {
2585 my ($self, $text, $indent) = @_;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text);
2593
2594 $layout->size
2595}
2596
2597sub reflow {
2598 my ($self) = @_;
2599
2600 $self->{need_reflow}++;
2601 $self->update;
2602}
2603
2604sub set_offset {
2605 my ($self, $offset) = @_;
2606
2607 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset);
2609}
2610
2611sub clear {
2612 my ($self) = @_;
2613
2614 $self->{par} = [];
2615 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2214} 2617}
2215 2618
2216sub add_paragraph { 2619sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2620 my ($self, $color, $text, $indent) = @_;
2218 2621
2219 #TODO: intelligently "reformat" paragraph 2622 for my $line (split /\n/, $text) {
2220 2623 my ($w, $h) = $self->text_size ($line);
2221 my $height = $self->text_height ($text);
2222
2223 $self->{height} += $height; 2624 $self->{height} += $h;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2626 }
2224 2627
2225 push @{$self->{par}}, [$height, $color, $text];
2226
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228 $self->{children}[1]->update;
2229} 2629}
2230 2630
2231sub update { 2631sub update {
2232 my ($self) = @_; 2632 my ($self) = @_;
2233 2633
… …
2235 2635
2236 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2237 2637
2238 delete $self->{texture}; 2638 delete $self->{texture};
2239 2639
2240 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642
2241 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2644 my $height = 0;
2243 2645
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2245 for @{$self->{par}}; 2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2246 2662
2247 $self->{height} = $height; 2663 $self->{height} = $height;
2248 2664
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250 2666
2251 delete $self->{texture}; 2667 delete $self->{texture};
2252 } 2668 }
2253 2669
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2257 2673
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2262 2675
2263 my $y0 = $top; 2676 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2677 my $y1 = $top + $H;
2265 2678
2266 my $y = 0; 2679 my $y = 0;
2267 2680
2268 my $layout = $self->{layout}; 2681 my $layout = $self->{layout};
2269 2682
2270 $layout->set_font ($self->{font}) if $self->{font}; 2683 $layout->set_font ($self->{font}) if $self->{font};
2271 2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2272 for my $par (@{$self->{par}}) { 2689 for my $par (@{$self->{par}}) {
2273 my $h = $par->[0]; 2690 my $h = $par->[1];
2274 2691
2275 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2693 $layout->set_foreground (@{ $par->[2] });
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2277 $layout->set_markup ($par->[2]); 2696 $layout->set_markup ($par->[4]);
2278 2697
2279 my ($W, $H) = $layout->size; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2699
2700 glRasterPos $par->[3], $y - $y0;
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281 } 2702 }
2282 2703
2283 $y += $h; 2704 $y += $h;
2284 } 2705 }
2285 2706
2286 glDisable GL_TEXTURE_2D; 2707 glDisable GL_BLEND;
2287 }; 2708 };
2288 }); 2709 });
2289} 2710}
2290 2711
2291sub _draw { 2712sub _draw {
2292 my ($self) = @_; 2713 my ($self) = @_;
2293 2714
2294 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2299 2720
2300 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2301 2722
… …
2351 2772
2352sub new { 2773sub new {
2353 my $class = shift; 2774 my $class = shift;
2354 2775
2355 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2356 state => 0, 2777 state => 0,
2357 connect_activate => \&toggle_flopper, 2778 on_activate => \&toggle_flopper,
2358 @_ 2779 @_
2359 ); 2780 );
2360 2781
2361 if ($self->{state}) {
2362 $self->{state} = 0;
2363 $self->toggle_flopper;
2364 }
2365
2366 $self 2782 $self
2367} 2783}
2368 2784
2369sub toggle_flopper { 2785sub toggle_flopper {
2370 my ($self) = @_; 2786 my ($self) = @_;
2371 2787
2372 # TODO: use animation 2788 $self->{other}->toggle_visibility;
2373 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open");
2377 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close");
2380 }
2381
2382 $self->emit (changed => $self->{state});
2383} 2789}
2384 2790
2385############################################################################# 2791#############################################################################
2386 2792
2387package CFClient::UI::Tooltip; 2793package CFClient::UI::Tooltip;
… …
2400} 2806}
2401 2807
2402sub set_tooltip_from { 2808sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2404 2810
2811 my $tooltip = $widget->{tooltip};
2812
2813 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816 . "req $widget->{req_w} $widget->{req_h}\n"
2817 . "visible $widget->{visible}";
2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2822
2405 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2826 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2828 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2830 );
2412} 2831}
2413 2832
2414sub size_request { 2833sub size_request {
2415 my ($self) = @_; 2834 my ($self) = @_;
… …
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418 2837
2419 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2420} 2839}
2421 2840
2422sub size_allocate { 2841sub invoke_size_allocate {
2423 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2424 2843
2425 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2845}
2846
2847sub invoke_visibility_change {
2848 my ($self, $visible) = @_;
2849
2850 return unless $visible;
2851
2852 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner}
2854 or return;
2855
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w};
2860
2861 $self->move_abs ($x, $y);
2862 });
2426} 2863}
2427 2864
2428sub _draw { 2865sub _draw {
2429 my ($self) = @_; 2866 my ($self) = @_;
2430 2867
… …
2447 glVertex $w, $h; 2884 glVertex $w, $h;
2448 glVertex $w, 0; 2885 glVertex $w, 0;
2449 glEnd; 2886 glEnd;
2450 2887
2451 glTranslate 2 - 0.375, 2 - 0.375; 2888 glTranslate 2 - 0.375, 2 - 0.375;
2889
2452 $self->SUPER::_draw; 2890 $self->SUPER::_draw;
2453} 2891}
2454 2892
2455############################################################################# 2893#############################################################################
2456 2894
… …
2461use CFClient::OpenGL; 2899use CFClient::OpenGL;
2462 2900
2463sub new { 2901sub new {
2464 my $class = shift; 2902 my $class = shift;
2465 2903
2466 $class->SUPER::new ( 2904 my $self = $class->SUPER::new (
2467 aspect => 1, 2905 aspect => 1,
2906 can_events => 0,
2468 @_, 2907 @_,
2469 ) 2908 );
2909
2910 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self);
2912
2913 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1,
2916 interval => $self->{animspeed},
2917 cb => sub {
2918 ++$widget->{frame};
2919 $widget->update;
2920 },
2921 );
2922 }
2923
2924 $self
2470} 2925}
2471 2926
2472sub size_request { 2927sub size_request {
2473 (32, 8) 2928 (32, 8)
2474} 2929}
2475 2930
2931sub update {
2932 my ($self) = @_;
2933
2934 return unless $self->{visible};
2935
2936 $self->SUPER::update;
2937}
2938
2476sub _draw { 2939sub _draw {
2477 my ($self) = @_; 2940 my ($self) = @_;
2478 2941
2479 return unless $::CONN;#d# manage and cache textures differently 2942 return unless $::CONN;
2943
2944 my $face;
2945
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}];
2948
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2954
2482 # TODO animation
2483 if ($tex) { 2955 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2489 } 2961 }
2490} 2962}
2491 2963
2964sub destroy {
2965 my ($self) = @_;
2966
2967 $self->{timer}->cancel
2968 if $self->{timer};
2969
2970 $self->SUPER::destroy;
2971}
2972
2492############################################################################# 2973#############################################################################
2493 2974
2494package CFClient::UI::InventoryItem; 2975package CFClient::UI::Buttonbar;
2495 2976
2496our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFClient::UI::HBox::;
2497 2978
2498sub new { 2979# TODO: should actualyl wrap buttons and other goodies.
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new (
2525 can_hover => 1,
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_,
2584 );
2585
2586 $self
2587}
2588
2589sub set_items {
2590 my ($self, $items) = @_;
2591
2592 $self->{scrolled}->clear;
2593 return unless $items;
2594
2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2599
2600 $self->{real_items} = \@items;
2601
2602 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2608 }
2609
2610 $self->{scrolled}->add (@items);
2611
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613}
2614
2615sub size_request {
2616 my ($self) = @_;
2617 ($self->{req_w}, $self->{req_h});
2618}
2619 2980
2620############################################################################# 2981#############################################################################
2621 2982
2622package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2623 2984
… …
2635 ); 2996 );
2636 2997
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2638 2999
2639 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2641 3002
2642 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2643 if (!ref $widget) { 3004 if (!ref $widget) {
2644 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2645 can_hover => 1, 3006 can_hover => 1,
2646 can_events => 1, 3007 can_events => 1,
2647 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2648 } 3010 }
2649 3011
2650 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2651 3013
2652 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2664 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self; 3027 $GRAB = $self;
2666 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2667 3029
2668 $self->show; 3030 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670} 3032}
2671 3033
2672sub mouse_motion { 3034sub invoke_mouse_motion {
2673 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2674 3036
2675 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2678}
2679 3040
3041 0
3042}
3043
2680sub button_up { 3044sub invoke_button_up {
2681 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2682 3046
2683 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB; 3048 undef $GRAB;
2685 $self->hide; 3049 $self->hide;
2686 3050
2687 $self->emit ("popdown"); 3051 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2689 } 3057 1
2690} 3058}
2691 3059
2692############################################################################# 3060#############################################################################
2693 3061
3062package CFClient::UI::Multiplexer;
3063
3064our @ISA = CFClient::UI::Container::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
2694package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
2695 3229
2696our @ISA = CFClient::UI::VBox::; 3230our @ISA = CFClient::UI::VBox::;
2697 3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 fontsize => 0.8,
3237 @_,
3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
3245}
3246
2698sub reorder { 3247sub reorder {
2699 my ($self) = @_; 3248 my ($self) = @_;
2700 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2701 3255
2702 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 } 3258 }
2705 3259
… …
2708 my @items = sort { 3262 my @items = sort {
2709 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2712 3266
3267 $self->{timer}->interval (1);
3268
2713 my $count = 10 + 1; 3269 my $count = 10 + 1;
2714 for my $item (@items) { 3270 for my $item (@items) {
2715 last unless --$count; 3271 last unless --$count;
2716 3272
2717 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text}; 3277 : $item->{text};
2722 3278
2723 for ($short) { 3279 for ($short) {
2724 s/^\s+//; 3280 s/^\s+//;
2725 s/\s+/ /g; 3281 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 3282 }
2729 3283
2730 new CFClient::UI::Label 3284 new CFClient::UI::Label
2731 markup => $short, 3285 markup => $short,
2732 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
3290 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2737 can_events => 1, 3292 can_events => 1,
2738 can_hover => 1 3293 can_hover => 1
2739 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2740 } 3307 }
2741 3308
2742 $self->clear; 3309 $self->clear;
2743 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2744} 3311}
… …
2747 my ($self, $text, %arg) = @_; 3314 my ($self, $text, %arg) = @_;
2748 3315
2749 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2751 3318
3319 return unless $text;
3320
2752 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2753 3322
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755 3324
2756 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2758 $item->{count}++; 3327 $item->{count}++;
2759 } else { 3328 } else {
2760 $item->{count} = 1; 3329 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2762 } 3331 }
2763 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2764 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2765 delete $item->{label}; 3334 delete $item->{label};
2766 } else { 3335 } else {
2767 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2768 id => ++$self->{id}, 3337 id => ++$self->{id},
2769 text => $text, 3338 text => $text,
2770 timeout => $timeout, 3339 timeout => $timeout,
2771 tooltip => $text, 3340 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 3341 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 3342 pri => 0,
2775 count => 1, 3343 count => 1,
2776 %arg, 3344 %arg,
2777 }; 3345 };
2778 } 3346 }
2779 3347
2780 $self->reorder; 3348 $self->reorder;
2781} 3349}
2782 3350
3351sub reconfigure {
3352 my ($self) = @_;
3353
3354 delete $_->{label}
3355 for values %{ $self->{item} || {} };
3356
3357 $self->reorder;
3358 $self->SUPER::reconfigure;
3359}
3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
2783############################################################################# 3369#############################################################################
2784 3370
2785package CFClient::UI::Root; 3371package CFClient::UI::Inventory;
2786 3372
2787our @ISA = CFClient::UI::Container::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789use CFClient::OpenGL;
2790 3374
2791sub new { 3375sub new {
2792 my $class = shift; 3376 my $class = shift;
2793 3377
2794 $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
2795 @_, 3621 @_,
2796 ) 3622 )
2797} 3623}
2798 3624
2799sub configure { 3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2800 my ($self, $x, $y, $w, $h) = @_;
2801 3626
2802 $self->{w} = $w; 3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2803 $self->{h} = $h; 3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2804} 3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2805 3637
2806sub check_size { 3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
2807 my ($self) = @_; 3711 my ($self, $spell) = @_;
2808 3712
2809 $self->size_allocate ($self->{w}, $self->{h}) 3713 $self->{spell}->{$spell->{name}} = $spell;
2810 if $self->{w}; 3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root;
3734
3735our @ISA = CFClient::UI::Container::;
3736
3737use List::Util qw(min max);
3738
3739use CFClient::OpenGL;
3740
3741sub new {
3742 my $class = shift;
3743
3744 my $self = $class->SUPER::new (
3745 visible => 1,
3746 @_,
3747 );
3748
3749 Scalar::Util::weaken ($self->{root} = $self);
3750
3751 $self
2811} 3752}
2812 3753
2813sub size_request { 3754sub size_request {
2814 my ($self) = @_; 3755 my ($self) = @_;
2815 3756
2816 ($self->{w}, $self->{h}) 3757 ($self->{w}, $self->{h})
2817} 3758}
2818 3759
3760sub _to_pixel {
3761 my ($coord, $size, $max) = @_;
3762
3763 $coord =
3764 $coord eq "center" ? ($max - $size) * 0.5
3765 : $coord eq "max" ? $max
3766 : $coord;
3767
3768 $coord = 0 if $coord < 0;
3769 $coord = $max - $size if $coord > $max - $size;
3770
3771 int $coord + 0.5
3772}
3773
2819sub size_allocate { 3774sub invoke_size_allocate {
2820 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
2821
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827 3776
2828 for my $child ($self->children) { 3777 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830 3779
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3780 $X = $child->{force_x} if exists $child->{force_x};
2832 if exists $child->{req_x}; 3781 $Y = $child->{force_y} if exists $child->{force_y};
2833 3782
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3783 $X = _to_pixel $X, $W, $self->{w};
2835 if exists $child->{req_y}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
2836
2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839 3785
2840 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
2841 } 3787 }
3788
3789 1
2842} 3790}
2843 3791
2844sub coord2local { 3792sub coord2local {
2845 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
2846 3794
… …
2854} 3802}
2855 3803
2856sub update { 3804sub update {
2857 my ($self) = @_; 3805 my ($self) = @_;
2858 3806
2859 $self->check_size;
2860 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
2861} 3808}
2862 3809
2863sub add { 3810sub add {
2864 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
2865 3812
2866 for my $child (@children) {
2867 $child->{toplevel} = 1; 3813 $_->{is_toplevel} = 1
2868 3814 for @children;
2869 # integerise window positions
2870 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y};
2872 }
2873 3815
2874 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3817}
3818
3819sub remove {
3820 my ($self, @children) = @_;
3821
3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3826
3827 while (@children) {
3828 my $w = pop @children;
3829 push @children, $w->children;
3830 $w->set_invisible;
3831 }
2875} 3832}
2876 3833
2877sub on_refresh { 3834sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3835 my ($self, $id, $cb) = @_;
2879 3836
… …
2892 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
2893 $_->() 3850 $_->()
2894 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
2895 } 3852 }
2896 3853
2897 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
2898 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
2899 3858
2900 for (;;) { 3859 outer:
2901 if ($self->{check_size}) { 3860 while () {
2902 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
2904 for values %{delete $self->{check_size}} 3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
2905 } 3869 }
2906 3870
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
2908 3873
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
2910 ? @$widget{qw(user_w user_h)} 3875 and last;
2911 : $widget->size_request;
2912
2913 if (delete $widget->{force_alloc}
2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
2917 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
2919 3897
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
2921 3899
2922 $widget->{parent}->check_size
2923 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
2924 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
2925 } 3910 }
2926 } 3911 }
2927 3912
2928 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
2930 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2931 3921
2932 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
2934 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
2935 $widget->{w} = $w; 3932 $widget->{w} = $w;
2936 $widget->{h} = $h; 3933 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h); 3934
2938 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
2939 } 3937 }
2940 } 3938 }
2941 3939
2942 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
2943 $_->() 3941 $_->()
2944 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
2945 } 3943 }
2946 3944
3945
2947 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
2950 3949
2951 glMatrixMode GL_PROJECTION; 3950 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3951 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3954 glLoadIdentity;
2956 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
2957 $self->_draw; 3963 $self->_draw;
2958} 3964}
2959 3965
2960############################################################################# 3966#############################################################################
2961 3967
2962package CFClient::UI; 3968package CFClient::UI;
2963 3969
2964$ROOT = new CFClient::UI::Root; 3970$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3971$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3972
29671 39731
2968 3974

Diff Legend

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