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

Diff Legend

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