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

Diff Legend

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