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

Diff Legend

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