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

Diff Legend

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