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.435 by root, Wed Aug 22 21:40:43 2007 UTC

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

Diff Legend

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