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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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