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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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