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

Diff Legend

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