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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.351 by root, Sun Oct 1 12:08:58 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines