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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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