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.341 by root, Sun Aug 13 03:20:56 2006 UTC

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

Diff Legend

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