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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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