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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

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

Diff Legend

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