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.203 by root, Sun May 14 21:13:11 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 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 76 if $FOCUS;
58} 77}
59 78
60sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 81 if $FOCUS;
63} 82}
64 83
65sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
66 my ($ev) = @_; 85 my ($ev) = @_;
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 101}
85 102
86sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
87 my ($ev) = @_; 104 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
89 106
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 108
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 110
94 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 113
99 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 116 $grab->update if $grab;
102 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
103 118
104 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
105 } 120 }
106} 121}
107 122
108sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
109 my ($ev) = @_; 124 my ($ev) = @_;
… …
115 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
116 131
117 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 134
120 check_tooltip; 135 $TOOLTIP_WATCHER->start;
121 } 136 }
122 137
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 139 if $HOVER;
127} 140}
128 141
129# convert position array to integers 142# convert position array to integers
130sub harmonize { 143sub harmonize {
131 my ($vals) = @_; 144 my ($vals) = @_;
… …
137 $rem += $_ - $i; 150 $rem += $_ - $i;
138 $_ = $i; 151 $_ = $i;
139 } 152 }
140} 153}
141 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
142# call when resolution changes etc. 171# call when resolution changes etc.
143sub rescale_widgets { 172sub rescale_widgets {
144 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
145 174
146 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
147 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
148 $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.]+$/;
149 $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};
150 $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};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $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.]+$/;
153 $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};
154 $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};
155 $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
156 } 190 }
157
158 $widget->reconfigure;
159 } 191 }
192
193 reconfigure_widgets;
160} 194}
161 195
162############################################################################# 196#############################################################################
163 197
164package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
169 203
170sub new { 204sub new {
171 my $class = shift; 205 my $class = shift;
172 206
173 my $self = bless { 207 my $self = bless {
174 x => 0, 208 x => "center",
175 y => 0, 209 y => "center",
176 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
177 can_events => 1, 213 can_events => 1,
178 @_ 214 @_
179 }, $class; 215 }, $class;
180 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
181 for (keys %$self) { 219 for (keys %$self) {
182 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
184 } 222 }
185 } 223 }
186 224
187 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 }
188 236
189 $self 237 $self
190} 238}
191 239
192sub destroy { 240sub destroy {
… …
202 return if $self->{parent}; 250 return if $self->{parent};
203 251
204 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
205} 253}
206 254
207sub hide { 255sub set_visible {
208 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};
209 279
210 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
212 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
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
264 }
265}
266 363
267sub size_allocate { 364 $self->{alloc_w} = $w;
268 # nothing to be done 365 $self->{alloc_h} = $h;
269}
270 366
271sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
272 my ($self) = @_; 368 }
273
274 $self->check_size (1);
275 $self->update;
276} 369}
277 370
278sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
279} 377}
280 378
281sub set_max_size { 379sub set_max_size {
282 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
283 381
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
285 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 }
286} 402}
287 403
288# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
289sub coord2local { 405sub coord2local {
290 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
… …
297 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
298 414
299 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
300} 416}
301 417
302sub focus_in { 418sub invoke_focus_in {
303 my ($self) = @_; 419 my ($self) = @_;
304 420
305 return if $FOCUS == $self; 421 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
307 423
308 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
309 425
310 $self->emit (focus_in => $focus);
311
312 $focus->update if $focus; 426 $focus->update if $focus;
313 $FOCUS->update; 427 $FOCUS->update;
314}
315 428
429 0
430}
431
316sub focus_out { 432sub invoke_focus_out {
317 my ($self) = @_; 433 my ($self) = @_;
318 434
319 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
320 436
321 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
322 438
323 $self->emit (focus_out => $focus);
324
325 $focus->update if $focus; #? 439 $focus->update if $focus; #?
326}
327 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
328sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
329sub button_up { } 454sub invoke_button_up { 1 }
330sub key_down { } 455sub invoke_key_down { 1 }
331sub key_up { } 456sub invoke_key_up { 1 }
332 457
333sub button_down { 458sub invoke_button_down {
334 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
335 460
336 $self->focus_in; 461 $self->grab_focus;
337}
338 462
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
343sub 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
344 531
345sub draw { 532sub draw {
346 my ($self) = @_; 533 my ($self) = @_;
347 534
348 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);
349 546
350 glPushMatrix; 547 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw;
353 glPopMatrix;
354 549
355 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
356 my ($x, $y) = @$self{qw(x y)};
357
358 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
359 glEnable GL_BLEND; 552 glEnable GL_BLEND;
360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
361 glBegin GL_QUADS; 554 glBegin GL_QUADS;
362 glVertex $x , $y;
363 glVertex $x + $self->{w}, $y;
364 glVertex $x + $self->{w}, $y + $self->{h};
365 glVertex $x , $y + $self->{h};
366 glEnd;
367 glDisable GL_BLEND;
368 }
369
370 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix;
372 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 555 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 556 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h}; 557 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h}; 558 glVertex 0 , $self->{h};
379 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;
380 glPopMatrix; 573 glPopMatrix;
381 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;
382 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
383} 579}
384 580
385sub _draw { 581sub _draw {
386 my ($self) = @_; 582 my ($self) = @_;
387 583
388 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
389} 585}
390 586
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 587sub DESTROY {
440 my ($self) = @_; 588 my ($self) = @_;
441 589
442 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
443 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
444} 594}
445 595
446############################################################################# 596#############################################################################
447 597
448package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
456 my $class = shift; 606 my $class = shift;
457 607
458 # range [value, low, high, page] 608 # range [value, low, high, page]
459 609
460 $class->SUPER::new ( 610 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 611 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 612 #active_bg => [1, 1, 1, 0.5],
463 @_ 613 @_
464 ) 614 )
465} 615}
466 616
467sub _draw { 617sub _draw {
468 my ($self) = @_; 618 my ($self) = @_;
469 619
620 my $color = $FOCUS == $self && $self->{active_bg}
621 ? $self->{active_bg}
622 : $self->{bg};
623
624 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
471 626
472 glEnable GL_BLEND; 627 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 629 glColor_premultiply @$color;
475 630
476 glBegin GL_QUADS; 631 glBegin GL_QUADS;
477 glVertex 0 , 0; 632 glVertex 0 , 0;
478 glVertex 0 , $h; 633 glVertex 0 , $h;
479 glVertex $w, $h; 634 glVertex $w, $h;
480 glVertex $w, 0; 635 glVertex $w, 0;
481 glEnd; 636 glEnd;
482 637
483 glDisable GL_BLEND; 638 glDisable GL_BLEND;
639 }
484} 640}
485 641
486############################################################################# 642#############################################################################
487 643
488package CFClient::UI::Empty; 644package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
495} 651}
496 652
497sub size_request { 653sub size_request {
498 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
499} 657}
500 658
501sub draw { } 659sub draw { }
502 660
503############################################################################# 661#############################################################################
… …
507our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
508 666
509sub new { 667sub new {
510 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
511 669
512 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
513 671
514 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
515 children => [], 673 children => [],
516 can_events => 0, 674 can_events => 0,
517 %arg, 675 %arg,
518 ); 676 );
677
519 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
520 680
521 $self 681 $self
522} 682}
523 683
524sub add { 684sub add {
… …
532 $self->{children} = [ 692 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
535 ]; 695 ];
536 696
537 $self->check_size (1); 697 $self->realloc;
538 $self->update;
539} 698}
540 699
541sub children { 700sub children {
542 @{ $_[0]{children} } 701 @{ $_[0]{children} }
543} 702}
… …
548 delete $child->{parent}; 707 delete $child->{parent};
549 $child->hide; 708 $child->hide;
550 709
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 711
553 $self->check_size; 712 $self->realloc;
554 $self->update;
555} 713}
556 714
557sub clear { 715sub clear {
558 my ($self) = @_; 716 my ($self) = @_;
559 717
… …
563 for (@$children) { 721 for (@$children) {
564 delete $_->{parent}; 722 delete $_->{parent};
565 $_->hide; 723 $_->hide;
566 } 724 }
567 725
568 $self->check_size; 726 $self->realloc;
569 $self->update;
570} 727}
571 728
572sub find_widget { 729sub find_widget {
573 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
574 731
575 $x -= $self->{x}; 732 $x -= $self->{x};
576 $y -= $self->{y}; 733 $y -= $self->{y};
577 734
578 my $res; 735 my $res;
579 736
580 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
581 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
582 and return $res; 739 and return $res;
583 } 740 }
584 741
585 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
606} 763}
607 764
608sub add { 765sub add {
609 my ($self, $child) = @_; 766 my ($self, $child) = @_;
610 767
611 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
612
613 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
614} 770}
615 771
616sub remove { 772sub remove {
617 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
626 782
627sub size_request { 783sub size_request {
628 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
629} 785}
630 786
631sub size_allocate { 787sub invoke_size_allocate {
632 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
633 789
634 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
635} 793}
636 794
637############################################################################# 795#############################################################################
796
797# back-buffered drawing area
638 798
639package CFClient::UI::Window; 799package CFClient::UI::Window;
640 800
641our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
642 802
… …
653 813
654 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
655 $self->SUPER::update; 815 $self->SUPER::update;
656} 816}
657 817
658sub size_allocate { 818sub invoke_size_allocate {
659 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
660 820
661 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
663} 824}
664 825
665sub _render { 826sub _render {
827 my ($self) = @_;
828
666 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
667} 830}
668 831
669sub render_child { 832sub render_child {
670 my ($self) = @_; 833 my ($self) = @_;
671 834
672 $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 {
673 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
675 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
676 $self->_render; 846 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 847 };
685} 848}
686 849
687sub _draw { 850sub _draw {
688 my ($self) = @_; 851 my ($self) = @_;
689 852
690 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
691 854
692 my $tex = $self->{texture} 855 my $tex = $self->{texture}
693 or return; 856 or return;
694 857
695 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
… …
705 868
706package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
707 870
708our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
709 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
710sub size_request { 883sub size_request {
711 my ($self) = @_; 884 my ($self) = @_;
712 885
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 887
716 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
717} 889 $h = 10 if $self->{scroll_y};
718 890
891 ($w, $h)
892}
893
719sub size_allocate { 894sub invoke_size_allocate {
720 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
721 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);
722 $self->update; 903 $self->update;
904
905 1
723} 906}
724 907
725sub set_offset { 908sub set_offset {
726 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
727 910
… …
760} 943}
761 944
762sub _render { 945sub _render {
763 my ($self) = @_; 946 my ($self) = @_;
764 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
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 952
767 $self->SUPER::_render; 953 $self->SUPER::_render;
768} 954}
769 955
… …
772package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
773 959
774our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
775 961
776sub new { 962sub new {
777 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
778 966
779 my $self; 967 my $self;
780 968
781 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
782 vertical => 1, 970 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 972 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
786 }, 974 },
787 ; 975 ;
788 976
789 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 978 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 979 slider => $slider,
792 @_, 980 %arg,
793 ); 981 );
794 982
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
798 985
799 $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)
800} 1012}
801 1013
802#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 1015# update viewport offset on scroll
804 1016
… …
824 1036
825 if ($self->{bg}) { 1037 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
827 1039
828 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
830 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
831 1043
832 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
833 glVertex 0 , 0; 1045 glVertex 0 , 0;
834 glVertex 0 , $h; 1046 glVertex 0 , $h;
835 glVertex $w, $h; 1047 glVertex $w, $h;
… …
848 1060
849our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
850 1062
851use CFClient::OpenGL; 1063use CFClient::OpenGL;
852 1064
853my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 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);
856 1072
857sub new { 1073sub new {
858 my $class = shift; 1074 my ($class, %arg) = @_;
859
860 # TODO: user_x, user_y, overwrite moveto?
861 1075
862 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1079 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1080 can_events => 1,
868 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
869 ); 1084 );
870 1085
871 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
872 align => 0, 1087 align => 0,
873 valign => 1, 1088 valign => 1,
874 text => $self->{title}, 1089 text => $self->{title},
875 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 }
876 1101
877 $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};
878} 1111}
879 1112
880sub border { 1113sub border {
881 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
882} 1115}
883 1116
884sub size_request { 1117sub size_request {
885 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};
886 1125
887 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
888 1127
889 ( 1128 (
890 $w + $self->border * 2, 1129 $w + $self->border * 2,
891 $h + $self->border * 2, 1130 $h + $self->border * 2,
892 ) 1131 )
893} 1132}
894 1133
895sub size_allocate { 1134sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
897 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
898 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
900 1147
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902 if $self->{title};
903
904 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
905}
906 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
907sub button_down { 1156sub invoke_button_down {
908 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
909 1158
910 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
911 my $border = $self->border; 1160 my $border = $self->border;
912 1161
… …
925 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
926 1175
927 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
929 1178
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size; 1183 $self->realloc;
934 }; 1184 };
935 1185
936 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1190 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
942 1192
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
944 1194
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
947 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
948 } 1203 1
949} 1204}
950 1205
951sub button_up { 1206sub invoke_button_up {
952 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
953 1208
954 delete $self->{motion}; 1209 ! ! delete $self->{motion}
955} 1210}
956 1211
957sub mouse_motion { 1212sub invoke_mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
959 1214
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
961} 1218}
962 1219
963sub _draw { 1220sub _draw {
964 my ($self) = @_; 1221 my ($self) = @_;
965 1222
1223 my $child = $self->{children}[0];
1224
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1227
969 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1230
972 my $border = $self->border; 1231 my $border = $self->border;
973 1232
974 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1238
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
982 1241
983 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1247 }
994 1248
995 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
996 1250
997 $self->{title}->draw if $self->{title};
998
999 $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};
1000} 1262}
1001 1263
1002############################################################################# 1264#############################################################################
1003 1265
1004package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1012sub new { 1274sub new {
1013 my $class = shift; 1275 my $class = shift;
1014 1276
1015 $class->SUPER::new ( 1277 $class->SUPER::new (
1016 col_expand => [], 1278 col_expand => [],
1017 @_ 1279 @_,
1018 ) 1280 )
1281}
1282
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1285}
1020 1286
1021sub add { 1287sub add {
1022 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1023 1289
1024 $child->set_parent ($self); 1290 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1026 1292
1027 $child->check_size; 1293 $self->realloc;
1028} 1294}
1029 1295
1030sub children { 1296sub remove {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1297 my ($self, $child) = @_;
1032}
1033 1298
1299 # TODO: not yet implemented
1300}
1301
1034# 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?
1035sub clear { 1303sub clear {
1036 my ($self) = @_; 1304 my ($self) = @_;
1037 1305
1038 my @children = $self->children; 1306 my @children = $self->children;
1039 delete $self->{children}; 1307 delete $self->{children};
… …
1041 for (@children) { 1309 for (@children) {
1042 delete $_->{parent}; 1310 delete $_->{parent};
1043 $_->hide; 1311 $_->hide;
1044 } 1312 }
1045 1313
1046 $self->update; 1314 $self->realloc;
1047} 1315}
1048 1316
1049sub get_wh { 1317sub get_wh {
1050 my ($self) = @_; 1318 my ($self) = @_;
1051 1319
… …
1077 (sum @$ws), 1345 (sum @$ws),
1078 (sum @$hs), 1346 (sum @$hs),
1079 ) 1347 )
1080} 1348}
1081 1349
1082sub size_allocate { 1350sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1084 1352
1085 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1086 1354
1087 my $req_w = sum @$ws; 1355 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1356 my $req_h = (sum @$hs) || 1;
1089 1357
1090 # TODO: nicer code && do row_expand 1358 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1359 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1360 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1361 my $col_expand = (sum @col_expand) || 1;
… …
1119 } 1387 }
1120 1388
1121 $y += $row_h; 1389 $y += $row_h;
1122 } 1390 }
1123 1391
1392 1
1124} 1393}
1125 1394
1126sub find_widget { 1395sub find_widget {
1127 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1128 1397
… …
1147 } 1416 }
1148} 1417}
1149 1418
1150############################################################################# 1419#############################################################################
1151 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
1152package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1153 1482
1154# TODO: wrap into common Box base class
1155
1156our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1157 1484
1158sub size_request { 1485sub new {
1159 my ($self) = @_; 1486 my $class = shift;
1160 1487
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1162 1489 vertical => 0,
1163 ( 1490 @_,
1164 (List::Util::sum map $_->[0], @alloc),
1165 (List::Util::max map $_->[1], @alloc),
1166 ) 1491 )
1167} 1492}
1168 1493
1169sub size_allocate {
1170 my ($self, $w, $h) = @_;
1171
1172 ($h, $w) = ($w, $h);
1173
1174 my $children = $self->{children};
1175
1176 my @h = map $_->{req_w}, @$children;
1177
1178 my $req_h = List::Util::sum @h;
1179
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children;
1185 $exp ||= 1;
1186
1187 for (0 .. $#$children) {
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 }
1194 }
1195
1196 CFClient::UI::harmonize \@h;
1197
1198 my $y = 0;
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_];
1202 $child->configure ($y, 0, $h, $w);
1203
1204 $y += $h;
1205 }
1206
1207 1
1208}
1209
1210############################################################################# 1494#############################################################################
1211 1495
1212package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1213 1497
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1217 1499
1218sub size_request { 1500sub new {
1219 my ($self) = @_; 1501 my $class = shift;
1220 1502
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1222 1504 vertical => 1,
1223 ( 1505 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1506 )
1227} 1507}
1228 1508
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1509#############################################################################
1269 1510
1270package CFClient::UI::Label; 1511package CFClient::UI::Label;
1271 1512
1272our @ISA = CFClient::UI::Base::; 1513our @ISA = CFClient::UI::DrawBG::;
1273 1514
1274use CFClient::OpenGL; 1515use CFClient::OpenGL;
1275 1516
1276sub new { 1517sub new {
1277 my ($class, %arg) = @_; 1518 my ($class, %arg) = @_;
1278 1519
1279 my $self = $class->SUPER::new ( 1520 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1521 fg => [1, 1, 1],
1522 #bg => none
1523 #active_bg => none
1281 #font => default_font 1524 #font => default_font
1282 #text => initial text 1525 #text => initial text
1283 #markup => initial narkup 1526 #markup => initial narkup
1527 #max_w => maximum pixel width
1528 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1285 fontsize => 1, 1530 fontsize => 1,
1286 align => -1, 1531 align => -1,
1287 valign => -1, 1532 valign => -1,
1288 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1289 can_events => 0, 1535 can_events => 0,
1290 %arg 1536 %arg
1291 ); 1537 );
1292 1538
1293 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1303 } 1549 }
1304 1550
1305 $self 1551 $self
1306} 1552}
1307 1553
1308sub escape { 1554sub escape($) {
1309 local $_ = $_[1]; 1555 local $_ = $_[0];
1310 1556
1311 s/&/&amp;/g; 1557 s/&/&amp;/g;
1312 s/>/&gt;/g; 1558 s/>/&gt;/g;
1313 s/</&lt;/g; 1559 s/</&lt;/g;
1314 1560
1315 $_[1] 1561 $_
1316} 1562}
1317 1563
1318sub update { 1564sub update {
1319 my ($self) = @_; 1565 my ($self) = @_;
1320 1566
1321 delete $self->{texture}; 1567 delete $self->{texture};
1322 $self->SUPER::update; 1568 $self->SUPER::update;
1323} 1569}
1324 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1325sub set_text { 1578sub set_text {
1326 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1327 1580
1328 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1330 1583
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1333 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1334 $self->update; 1589 $self->update;
1335 $self->check_size;
1336} 1590}
1337 1591
1338sub set_markup { 1592sub set_markup {
1339 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1340 1594
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1599
1346 $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;
1347 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1348 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1349 $self->update; 1605 $self->update;
1350 $self->check_size;
1351} 1606}
1352 1607
1353sub size_request { 1608sub size_request {
1354 my ($self) = @_; 1609 my ($self) = @_;
1355 1610
1611 $self->{size_req} ||= do {
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1617
1360 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1361 1619
1362 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1363 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1364 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1623
1366 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1367 1625
1368 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1370 } 1631 };
1371 1632
1372 ( 1633 @{ $self->{size_req} }
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1634}
1377 1635
1378sub size_allocate { 1636sub invoke_size_allocate {
1379 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1380 1638
1639 delete $self->{ox};
1640
1381 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1382} 1645}
1383 1646
1384sub set_fontsize { 1647sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1386 1649
1387 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1651 delete $self->{texture};
1389 1652
1390 $self->update; 1653 $self->realloc;
1391 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1392} 1662}
1393 1663
1394sub _draw { 1664sub _draw {
1395 my ($self) = @_; 1665 my ($self) = @_;
1666
1667 $self->SUPER::_draw; # draw background, if applicable
1396 1668
1397 my $tex = $self->{texture} ||= do { 1669 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1670 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1671 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1676
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1414 }; 1678 };
1415 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
1416 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1417 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};
1418 1694
1419 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1420 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1422 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1424 } 1702 }
1425 1703
1426 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1427} 1705}
1428 1706
… …
1444 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1445 can_hover => 1, 1723 can_hover => 1,
1446 can_focus => 1, 1724 can_focus => 1,
1447 valign => 0, 1725 valign => 0,
1448 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1449 @_ 1729 @_
1450 ) 1730 )
1451} 1731}
1452 1732
1453sub _set_text { 1733sub _set_text {
… …
1455 1735
1456 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1457 1737
1458 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1459 1739
1460 delete $self->{texture};
1461
1462 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1463 $self->{text} = $text; 1741 $self->{text} = $text;
1464 1742
1465 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1467 1746
1468 $self->emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1469} 1751}
1470 1752
1471sub set_text { 1753sub set_text {
1472 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1473 1755
1474 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1757 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478} 1758}
1479 1759
1480sub get_text { 1760sub get_text {
1481 $_[0]{text} 1761 $_[0]{text}
1482} 1762}
… …
1487 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1488 1768
1489 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1490} 1770}
1491 1771
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496}
1497
1498sub key_down { 1772sub invoke_key_down {
1499 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1500 1774
1501 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1502 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1503 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1518 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1794 $self->emit ('escape');
1521 } elsif ($uni) { 1795 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1523 } 1799 }
1524 1800
1525 $self->_set_text ($text); 1801 $self->_set_text ($text);
1526 $self->update;
1527}
1528 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1529sub focus_in { 1808sub invoke_focus_in {
1530 my ($self) = @_; 1809 my ($self) = @_;
1531 1810
1532 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1533 1812
1534 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1535} 1814}
1536 1815
1537sub button_down { 1816sub invoke_button_down {
1538 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1539 1818
1540 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1541 1820
1542 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1543 1822
1544 # byte-index to char-index 1823 # byte-index to char-index
1545 my $text = $self->{text}; 1824 my $text = $self->{text};
1546 utf8::encode $text; 1825 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1548 1827
1549 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1550 $self->update; 1829 $self->update;
1830
1831 1
1551} 1832}
1552 1833
1553sub mouse_motion { 1834sub invoke_mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1555# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1556} 1839}
1557 1840
1558sub _draw { 1841sub _draw {
1559 my ($self) = @_; 1842 my ($self) = @_;
1560 1843
1561 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1562 1845
1563 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1564 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1565 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1566 } else { 1849 } else {
1567 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1568 } 1851 }
1569 1852
1570 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1571 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1573 glVertex 0 , 0; 1856 glVertex 0 , 0;
1574 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1575 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1576 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1601 1884
1602our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1603 1886
1604use CFClient::OpenGL; 1887use CFClient::OpenGL;
1605 1888
1606sub key_down { 1889sub invoke_key_down {
1607 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1608 1891
1609 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1610 1893
1611 if ($sym == 13) { 1894 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1614 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1617 $self->update; 1901 $self->update;
1618 1902
… …
1637 } else { 1921 } else {
1638 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1639 } 1923 }
1640 1924
1641 } else { 1925 } else {
1642 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1643 } 1929 1
1644
1645} 1930}
1646 1931
1647############################################################################# 1932#############################################################################
1648 1933
1649package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1658 1943
1659sub new { 1944sub new {
1660 my $class = shift; 1945 my $class = shift;
1661 1946
1662 $class->SUPER::new ( 1947 $class->SUPER::new (
1663 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1664 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1667 can_hover => 1, 1952 can_hover => 1,
1668 align => 0, 1953 align => 0,
1669 valign => 0, 1954 valign => 0,
1670 can_events => 1, 1955 can_events => 1,
1671 @_ 1956 @_
1672 ) 1957 )
1673} 1958}
1674 1959
1675sub button_up { 1960sub invoke_button_up {
1676 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1677 1962
1963 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1966
1681 } 1967 1
1682} 1968}
1683 1969
1684sub _draw { 1970sub _draw {
1685 my ($self) = @_; 1971 my ($self) = @_;
1686 1972
1687 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1688
1689 if ($GRAB == $self) {
1690 $self->{fg} = $self->{active_fg};
1691 }
1692 1974
1693 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1696 1978
… …
1701 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1702} 1984}
1703 1985
1704############################################################################# 1986#############################################################################
1705 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1706package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1707 2025
1708our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1709 2027
1710my @tex = 2028my @tex =
… …
1715 2033
1716sub new { 2034sub new {
1717 my $class = shift; 2035 my $class = shift;
1718 2036
1719 $class->SUPER::new ( 2037 $class->SUPER::new (
1720 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1721 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 2044 state => 0,
1724 can_hover => 1, 2045 can_hover => 1,
1725 @_ 2046 @_
1726 ) 2047 )
1727} 2048}
1728 2049
1729sub size_request { 2050sub size_request {
1730 my ($self) = @_; 2051 my ($self) = @_;
1731 2052
1732 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1733} 2054}
1734 2055
1735sub button_down { 2056sub invoke_button_down {
1736 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1737 2058
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1742 } 2067 1
1743} 2068}
1744 2069
1745sub _draw { 2070sub _draw {
1746 my ($self) = @_; 2071 my ($self) = @_;
1747 2072
1748 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1749 2074
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 2076
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 2080
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 2082
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 2084
… …
1912 2239
1913 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
1914 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
1915 2242
1916 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1917 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;
1918 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
1919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920 2248
1921 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
1922 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2339 qw(s1_slider.png s1_slider_bg.png);
2012 2340
2013sub new { 2341sub new {
2014 my $class = shift; 2342 my $class = shift;
2015 2343
2016 # range [value, low, high, page] 2344 # range [value, low, high, page, unit]
2017 2345
2018 # TODO: 0-width page 2346 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2347 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2348 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2349 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2354 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2027 vertical => 0, 2357 vertical => 0,
2028 can_hover => 1, 2358 can_hover => 1,
2029 inner_pad => 5, 2359 inner_pad => 0.02,
2030 @_ 2360 @_
2031 ); 2361 );
2032 2362
2363 $self->set_value ($self->{range}[0]);
2364 $self->update;
2365
2033 $self 2366 $self
2034} 2367}
2035 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
2380sub set_value {
2381 my ($self, $value) = @_;
2382
2383 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2384
2385 $hi = $lo + 1 if $hi <= $lo;
2386
2387 $page = $hi - $lo if $page > $hi - $lo;
2388
2389 $value = $lo if $value < $lo;
2390 $value = $hi - $page if $value > $hi - $page;
2391
2392 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2393 if $unit;
2394
2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2396
2397 if ($value != $old_value) {
2398 $self->emit (changed => $value);
2399 $self->update;
2400 }
2401}
2402
2036sub size_request { 2403sub size_request {
2037 my ($self) = @_; 2404 my ($self) = @_;
2038 2405
2039 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2407}
2044 2408
2045sub button_down { 2409sub invoke_button_down {
2046 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2047 2411
2048 $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
2049 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2050} 2417}
2051 2418
2052sub mouse_motion { 2419sub invoke_mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2054 2421
2055 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2424
2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2426
2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2428
2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2434 1
2435}
2436
2437sub update {
2438 my ($self) = @_;
2439
2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2448 $self->set_value ($self->{range}[0]);
2449
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2451 my $range = ($hi - $page - $lo) || 1e-100;
2057 2452
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2453 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2454
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2455 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2456 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2457
2063 $x -= $inner_pad_px; # substract the padding 2458 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2459 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2460
2069 $self->emit (changed => $x); 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2462 $self->{knob_w} = $knob_w;
2071 } 2463 }
2072}
2073
2074# the inner_* stuff is for generating a padding for the slider handle,
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084 2464
2085 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2086 2466
2087 my ($w, $h) = @$self{qw(w h)}; 2467 glScale $self->{w}, $self->{h};
2088 2468
2089 if ($self->{vertical}) { 2469 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2470 # draw a vertical slider like a rotated horizontal slider
2091 2471
2472 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2473 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2474 }
2097 2475
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2476 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2477 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2478
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2479 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2480 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2481
2122 # draw background 2482 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2483 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2484
2125 # draw handle 2485 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2486 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2487
2128 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2129} 2489}
2130 2490
2131############################################################################# 2491#############################################################################
2132 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
2133package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2134 2535
2135our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2136 2537
2137use CFClient::OpenGL; 2538use CFClient::OpenGL;
2138 2539
… …
2140 my $class = shift; 2541 my $class = shift;
2141 2542
2142 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2143 fontsize => 1, 2544 fontsize => 1,
2144 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2145 #font => default_font 2547 #font => default_font
2146 @_, 2548 @_,
2147 2549
2148 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2149 par => [], 2551 par => [],
… …
2164 2566
2165 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2568 $self->reflow;
2167} 2569}
2168 2570
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2571sub invoke_size_allocate {
2189 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2190
2191 $self->SUPER::size_allocate ($w, $h);
2192 2573
2193 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2195 $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});
2196 2578
2197 $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]);
2198} 2617}
2199 2618
2200sub add_paragraph { 2619sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2620 my ($self, $color, $text, $indent) = @_;
2202 2621
2203 #TODO: intelligently "reformat" paragraph 2622 for my $line (split /\n/, $text) {
2204 2623 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2624 $self->{height} += $h;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2626 }
2208 2627
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $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]);
2212 $self->{children}[1]->update;
2213} 2629}
2214 2630
2215sub update { 2631sub update {
2216 my ($self) = @_; 2632 my ($self) = @_;
2217 2633
… …
2219 2635
2220 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2221 2637
2222 delete $self->{texture}; 2638 delete $self->{texture};
2223 2639
2224 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642
2225 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2644 my $height = 0;
2227 2645
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2229 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 }
2230 2662
2231 $self->{height} = $height; 2663 $self->{height} = $height;
2232 2664
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2666
2235 delete $self->{texture}; 2667 delete $self->{texture};
2236 } 2668 }
2237 2669
2238 $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 {
2239 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2241 2673
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2246 2675
2247 my $y0 = $top; 2676 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2677 my $y1 = $top + $H;
2249 2678
2250 my $y = 0; 2679 my $y = 0;
2251 2680
2252 my $layout = $self->{layout}; 2681 my $layout = $self->{layout};
2253 2682
2254 $layout->set_font ($self->{font}) if $self->{font}; 2683 $layout->set_font ($self->{font}) if $self->{font};
2255 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
2256 for my $par (@{$self->{par}}) { 2689 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2690 my $h = $par->[1];
2258 2691
2259 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2260 $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});
2261 $layout->set_markup ($par->[2]); 2696 $layout->set_markup ($par->[4]);
2262 2697
2263 my ($W, $H) = $layout->size; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 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;
2265 } 2702 }
2266 2703
2267 $y += $h; 2704 $y += $h;
2268 } 2705 }
2269 2706
2270 glDisable GL_TEXTURE_2D; 2707 glDisable GL_BLEND;
2271 }; 2708 };
2272 }); 2709 });
2273} 2710}
2274 2711
2275sub _draw { 2712sub _draw {
2276 my ($self) = @_; 2713 my ($self) = @_;
2277 2714
2278 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2281 $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});
2282 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2283 2720
2284 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2285 2722
… …
2335 2772
2336sub new { 2773sub new {
2337 my $class = shift; 2774 my $class = shift;
2338 2775
2339 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2340 state => 0, 2777 state => 0,
2341 connect_activate => \&toggle_flopper, 2778 on_activate => \&toggle_flopper,
2342 @_ 2779 @_
2343 ); 2780 );
2344 2781
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2782 $self
2351} 2783}
2352 2784
2353sub toggle_flopper { 2785sub toggle_flopper {
2354 my ($self) = @_; 2786 my ($self) = @_;
2355 2787
2356 # TODO: use animation 2788 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2789}
2368 2790
2369############################################################################# 2791#############################################################################
2370 2792
2371package CFClient::UI::Tooltip; 2793package CFClient::UI::Tooltip;
… …
2384} 2806}
2385 2807
2386sub set_tooltip_from { 2808sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2388 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
2389 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2826 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2828 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2830 );
2396} 2831}
2397 2832
2398sub size_request { 2833sub size_request {
2399 my ($self) = @_; 2834 my ($self) = @_;
… …
2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2402 2837
2403 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2404} 2839}
2405 2840
2406sub size_allocate { 2841sub invoke_size_allocate {
2407 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2408 2843
2409 $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 });
2410} 2863}
2411 2864
2412sub _draw { 2865sub _draw {
2413 my ($self) = @_; 2866 my ($self) = @_;
2414 2867
… …
2431 glVertex $w, $h; 2884 glVertex $w, $h;
2432 glVertex $w, 0; 2885 glVertex $w, 0;
2433 glEnd; 2886 glEnd;
2434 2887
2435 glTranslate 2 - 0.375, 2 - 0.375; 2888 glTranslate 2 - 0.375, 2 - 0.375;
2889
2436 $self->SUPER::_draw; 2890 $self->SUPER::_draw;
2437} 2891}
2438 2892
2439############################################################################# 2893#############################################################################
2440 2894
… …
2445use CFClient::OpenGL; 2899use CFClient::OpenGL;
2446 2900
2447sub new { 2901sub new {
2448 my $class = shift; 2902 my $class = shift;
2449 2903
2450 $class->SUPER::new ( 2904 my $self = $class->SUPER::new (
2451 aspect => 1, 2905 aspect => 1,
2906 can_events => 0,
2452 @_, 2907 @_,
2453 ) 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
2454} 2925}
2455 2926
2456sub size_request { 2927sub size_request {
2457 (32, 8) 2928 (32, 8)
2458} 2929}
2459 2930
2931sub update {
2932 my ($self) = @_;
2933
2934 return unless $self->{visible};
2935
2936 $self->SUPER::update;
2937}
2938
2460sub _draw { 2939sub _draw {
2461 my ($self) = @_; 2940 my ($self) = @_;
2462 2941
2463 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2954
2466 # TODO animation
2467 if ($tex) { 2955 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2473 } 2961 }
2474} 2962}
2475 2963
2964sub destroy {
2965 my ($self) = @_;
2966
2967 $self->{timer}->cancel
2968 if $self->{timer};
2969
2970 $self->SUPER::destroy;
2971}
2972
2476############################################################################# 2973#############################################################################
2477 2974
2478package CFClient::UI::InventoryItem; 2975package CFClient::UI::Buttonbar;
2479 2976
2480our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFClient::UI::HBox::;
2481 2978
2482sub new { 2979# TODO: should actualyl wrap buttons and other goodies.
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589 2980
2590############################################################################# 2981#############################################################################
2591 2982
2592package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2593 2984
… …
2605 ); 2996 );
2606 2997
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2608 2999
2609 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2611 3002
2612 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2613 if (!ref $widget) { 3004 if (!ref $widget) {
2614 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2615 can_hover => 1, 3006 can_hover => 1,
2616 can_events => 1, 3007 can_events => 1,
2617 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2618 } 3010 }
2619 3011
2620 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2621 3013
2622 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2634 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 3027 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2637 3029
2638 $self->show; 3030 $self->show;
2639 $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);
2640} 3032}
2641 3033
2642sub mouse_motion { 3034sub invoke_mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2644 3036
2645 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2648}
2649 3040
3041 0
3042}
3043
2650sub button_up { 3044sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2652 3046
2653 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 3048 undef $GRAB;
2655 $self->hide; 3049 $self->hide;
2656 3050
2657 $self->emit ("popdown"); 3051 $self->emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2659 } 3057 1
2660} 3058}
2661 3059
2662############################################################################# 3060#############################################################################
2663 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
2664package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
2665 3229
2666our @ISA = CFClient::UI::VBox::; 3230our @ISA = CFClient::UI::VBox::;
2667 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
2668sub reorder { 3247sub reorder {
2669 my ($self) = @_; 3248 my ($self) = @_;
2670 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} };
2671 3255
2672 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 } 3258 }
2675 3259
… …
2678 my @items = sort { 3262 my @items = sort {
2679 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2682 3266
3267 $self->{timer}->interval (1);
3268
2683 my $count = 10 + 1; 3269 my $count = 10 + 1;
2684 for my $item (@items) { 3270 for my $item (@items) {
2685 last unless --$count; 3271 last unless --$count;
2686 3272
2687 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3277 : $item->{text};
2692 3278
2693 for ($short) { 3279 for ($short) {
2694 s/^\s+//; 3280 s/^\s+//;
2695 s/\012.*/…/s; 3281 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3282 }
2699 3283
2700 new CFClient::UI::Label 3284 new CFClient::UI::Label
2701 markup => $short, 3285 markup => $short,
2702 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2706 color => $item->{color}, 3290 max_w => $::WIDTH * 0.44,
3291 fg => [@{ $item->{fg} }],
2707 can_events => 1, 3292 can_events => 1,
2708 can_hover => 1 3293 can_hover => 1
2709 }; 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;
2710 } 3307 }
2711 3308
2712 $self->clear; 3309 $self->clear;
2713 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2714} 3311}
… …
2717 my ($self, $text, %arg) = @_; 3314 my ($self, $text, %arg) = @_;
2718 3315
2719 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2721 3318
3319 return unless $text;
3320
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723 3322
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3324
2726 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2728 $item->{count}++; 3327 $item->{count}++;
2729 } else { 3328 } else {
2730 $item->{count} = 1; 3329 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2732 } 3331 }
2733 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2734 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2735 delete $item->{label}; 3334 delete $item->{label};
2736 } else { 3335 } else {
2737 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3337 id => ++$self->{id},
2739 text => $text, 3338 text => $text,
2740 timeout => $timeout, 3339 timeout => $timeout,
2741 tooltip => $text, 3340 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3341 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3342 pri => 0,
2745 count => 1, 3343 count => 1,
2746 %arg, 3344 %arg,
2747 }; 3345 };
2748 } 3346 }
2749 3347
2750 $self->reorder; 3348 $self->reorder;
2751} 3349}
2752 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
2753############################################################################# 3369#############################################################################
2754 3370
2755package CFClient::UI::Root; 3371package CFClient::UI::Inventory;
2756 3372
2757our @ISA = CFClient::UI::Container::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3374
2761sub new { 3375sub new {
2762 my $class = shift; 3376 my $class = shift;
2763 3377
2764 $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 => [],
2765 @_, 3621 @_,
2766 ) 3622 )
2767} 3623}
2768 3624
2769sub configure { 3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2770 my ($self, $x, $y, $w, $h) = @_;
2771 3626
2772 $self->{w} = $w; 3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2773 $self->{h} = $h; 3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2774} 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");
2775 3637
2776sub 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 {
2777 my ($self) = @_; 3711 my ($self, $spell) = @_;
2778 3712
2779 $self->size_allocate ($self->{w}, $self->{h}) 3713 $self->{spell}->{$spell->{name}} = $spell;
2780 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
2781} 3752}
2782 3753
2783sub size_request { 3754sub size_request {
2784 my ($self) = @_; 3755 my ($self) = @_;
2785 3756
2786 ($self->{w}, $self->{h}) 3757 ($self->{w}, $self->{h})
2787} 3758}
2788 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
2789sub size_allocate { 3774sub invoke_size_allocate {
2790 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
2791
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797 3776
2798 for my $child ($self->children) { 3777 for my $child ($self->children) {
2799 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)};
2800 3779
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3780 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3781 $Y = $child->{force_y} if exists $child->{force_y};
3782
3783 $X = _to_pixel $X, $W, $self->{w};
3784 $Y = _to_pixel $Y, $H, $self->{h};
3785
2803 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
2804 } 3787 }
3788
3789 1
2805} 3790}
2806 3791
2807sub coord2local { 3792sub coord2local {
2808 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
2809 3794
… …
2817} 3802}
2818 3803
2819sub update { 3804sub update {
2820 my ($self) = @_; 3805 my ($self) = @_;
2821 3806
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
2824} 3808}
2825 3809
2826sub add { 3810sub add {
2827 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
2828 3812
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3813 $_->{is_toplevel} = 1
2831 3814 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3815
2837 $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 }
2838} 3832}
2839 3833
2840sub on_refresh { 3834sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3835 my ($self, $id, $cb) = @_;
2842 3836
… …
2855 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
2856 $_->() 3850 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
2858 } 3852 }
2859 3853
2860 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
2861 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
2862 3858
2863 for (;;) { 3859 outer:
2864 if ($self->{check_size}) { 3860 while () {
2865 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
2867 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 }
2868 } 3869 }
2869 3870
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
2871 3873
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3875 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 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}) {
2880 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
2882 3897
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
2884 3899
2885 $widget->{parent}->check_size
2886 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 }
2887 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
2888 } 3910 }
2889 } 3911 }
2890 3912
2891 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 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)};
2894 3921
2895 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
2897 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
2898 $widget->{w} = $w; 3932 $widget->{w} = $w;
2899 $widget->{h} = $h; 3933 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3934
2901 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
2902 } 3937 }
2903 } 3938 }
2904 3939
2905 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
2906 $_->() 3941 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
2908 } 3943 }
2909 3944
3945
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
2913 3949
2914 glMatrixMode GL_PROJECTION; 3950 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3951 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3954 glLoadIdentity;
2919 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
2920 $self->_draw; 3963 $self->_draw;
2921} 3964}
2922 3965
2923############################################################################# 3966#############################################################################
2924 3967
2925package CFClient::UI; 3968package CFClient::UI;
2926 3969
2927$ROOT = new CFClient::UI::Root; 3970$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3971$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3972
29301 39731
2931 3974

Diff Legend

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