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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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