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.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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