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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.78 by root, Tue Apr 11 22:49:13 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class
84} 92}
85 93
86sub move { 94sub move {
… …
97sub size_request { 105sub size_request {
98 require Carp; 106 require Carp;
99 Carp::confess "size_request is abtract"; 107 Carp::confess "size_request is abtract";
100} 108}
101 109
102sub size_allocate { 110sub _size_allocate {
103 my ($self, $w, $h) = @_; 111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
104 117
105 $self->{w} = $w; 118 $self->{w} = $w;
106 $self->{h} = $h; 119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
107} 128}
108 129
109# translate global koordinates to local coordinate system 130# translate global koordinates to local coordinate system
110sub translate { 131sub translate {
111 my ($self, $x, $y) = @_; 132 my ($self, $x, $y) = @_;
… …
114} 135}
115 136
116sub focus_in { 137sub focus_in {
117 my ($self) = @_; 138 my ($self) = @_;
118 139
140 return if $FOCUS == $self;
141
119 my $focus = $FOCUS; $FOCUS = $self; 142 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 143 $focus->update if $focus;
121 $FOCUS->update; 144 $FOCUS->update;
122} 145}
123 146
… …
130 $focus->update if $focus; #? 153 $focus->update if $focus; #?
131} 154}
132 155
133sub mouse_motion { } 156sub mouse_motion { }
134sub button_up { } 157sub button_up { }
135sub button_down { }
136sub key_down { } 158sub key_down { }
137sub key_up { } 159sub key_up { }
160
161sub button_down {
162 my ($self, $ev, $x, $y) = @_;
163
164 $self->focus_in;
165}
138 166
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 167sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 168sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 169sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 170sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 171sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 172
145sub draw { 173sub draw {
146 my ($self) = @_; 174 my ($self) = @_;
147 175
176 return unless $self->{h} && $self->{w};
177
148 glPushMatrix; 178 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 179 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 180 $self->_draw;
181 glPopMatrix;
182
151 if ($self == $HOVER) { 183 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4; 184 my ($x, $y) = @$self{qw(x y)};
185
186 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 187 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 189 glBegin GL_QUADS;
155 glVertex 0 , 0; 190 glVertex $x , $y;
156 glVertex $self->{w}, 0; 191 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 192 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 193 glVertex $x , $y + $self->{h};
159 glEnd; 194 glEnd;
160 glDisable GL_BLEND; 195 glDisable GL_BLEND;
161 } 196 }
162 glPopMatrix;
163} 197}
164 198
165sub _draw { 199sub _draw {
166 my ($self) = @_; 200 my ($self) = @_;
167 201
168 warn "no draw defined for $self\n"; 202 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 203}
181 204
182sub find_widget { 205sub find_widget {
183 my ($self, $x, $y) = @_; 206 my ($self, $x, $y) = @_;
184 207
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 210 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 211
189 () 212 ()
190} 213}
191 214
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 215sub set_parent {
195 my ($self, $par) = @_; 216 my ($self, $par) = @_;
196 217
197 $self->{parent} = $par; 218 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 219 Scalar::Util::weaken $self->{parent};
… …
207 228
208 $self->{parent}->update 229 $self->{parent}->update
209 if $self->{parent}; 230 if $self->{parent};
210} 231}
211 232
233sub connect {
234 my ($self, $signal, $cb) = @_;
235
236 push @{ $self->{cb}{$signal} }, $cb;
237}
238
239sub emit {
240 my ($self, $signal, @args) = @_;
241
242 $_->($self, @args)
243 for @{$self->{cb}{$signal} || []};
244}
245
212sub DESTROY { 246sub DESTROY {
213 my ($self) = @_; 247 my ($self) = @_;
214 248
215 #$self->deactivate; 249 #$self->deactivate;
216} 250}
217 251
218############################################################################# 252#############################################################################
219 253
254package CFClient::UI::DrawBG;
255
256our @ISA = CFClient::UI::Base::;
257
258use strict;
259use SDL::OpenGL;
260
261sub new {
262 my $class = shift;
263
264 # range [value, low, high, page]
265
266 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1],
269 @_
270 )
271}
272
273sub _draw {
274 my ($self) = @_;
275
276 my ($w, $h) = @$self{qw(w h)};
277
278 glEnable GL_BLEND;
279 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
280 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
281
282 glBegin GL_QUADS;
283 glVertex 0 , 0;
284 glVertex 0 , $h;
285 glVertex $w, $h;
286 glVertex $w, 0;
287 glEnd;
288
289 glDisable GL_BLEND;
290}
291
292#############################################################################
293
220package CFClient::Widget::Empty; 294package CFClient::UI::Empty;
221 295
222our @ISA = CFClient::Widget::; 296our @ISA = CFClient::UI::Base::;
223 297
224sub size_request { 298sub size_request {
225 (0, 0) 299 (0, 0)
226} 300}
227 301
228sub draw { } 302sub draw { }
229 303
230############################################################################# 304#############################################################################
231 305
232package CFClient::Widget::Container; 306package CFClient::UI::Container;
233 307
234our @ISA = CFClient::Widget::; 308our @ISA = CFClient::UI::Base::;
235 309
236sub new { 310sub new {
237 my ($class, %arg) = @_; 311 my ($class, %arg) = @_;
238 312
239 my $children = delete $arg{children} || []; 313 my $children = delete $arg{children} || [];
… …
243 317
244 $self 318 $self
245} 319}
246 320
247sub add { 321sub add {
248 my ($self, $chld, $expand) = @_; 322 my ($self, $chld) = @_;
249 323
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self); 324 $chld->set_parent ($self);
252 325
253 $self->{children} = [ 326 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} } 327 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld 328 @{$self->{children}}, $chld
256 ]; 329 ];
257 330
258 $self->size_allocate ($self->{w}, $self->{h}) 331 $self->{w} = $self->{h} = -1;
259 if $self->{w}; #TODO: check for "realised state" 332 $self->update;
260} 333}
261 334
262sub remove { 335sub remove {
263 my ($self, $widget) = @_; 336 my ($self, $widget) = @_;
264 337
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 338 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266 339
267 $self->size_allocate ($self->{w}, $self->{h}); 340 $self->size_allocate (0, 0, $self->{w}, $self->{h});
268} 341}
269 342
270sub find_widget { 343sub find_widget {
271 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
272 345
… …
289 $_->draw for @{$self->{children}}; 362 $_->draw for @{$self->{children}};
290} 363}
291 364
292############################################################################# 365#############################################################################
293 366
294package CFClient::Widget::Bin; 367package CFClient::UI::Bin;
295 368
296our @ISA = CFClient::Widget::Container::; 369our @ISA = CFClient::UI::Container::;
297 370
298sub new { 371sub new {
299 my ($class, %arg) = @_; 372 my ($class, %arg) = @_;
300 373
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 374 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
302 375
303 $class->SUPER::new (children => [$child], %arg) 376 $class->SUPER::new (children => [$child], %arg)
304} 377}
305 378
306sub add { 379sub add {
… …
314sub remove { 387sub remove {
315 my ($self, $widget) = @_; 388 my ($self, $widget) = @_;
316 389
317 $self->SUPER::remove ($widget); 390 $self->SUPER::remove ($widget);
318 391
319 $self->{children} = [new CFClient::Widget::Empty] 392 $self->{children} = [new CFClient::UI::Empty]
320 unless @{$self->{children}}; 393 unless @{$self->{children}};
321} 394}
322 395
323sub child { $_[0]->{children}[0] } 396sub child { $_[0]->{children}[0] }
324 397
325sub size_request { 398sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 399 $_[0]{children}[0]->size_request
327} 400}
328 401
329sub size_allocate { 402sub size_allocate {
330 my ($self, $w, $h) = @_; 403 my ($self, $x, $y, $w, $h) = @_;
331 404
332 $self->SUPER::size_allocate ($w, $h); 405 $self->_size_allocate ($x, $y, $w, $h) or return;
406
333 $self->{children}[0]->size_allocate ($w, $h) 407 $self->{children}[0]->size_allocate (0, 0, $w, $h);
334 if $self->{children}[0]
335} 408}
336 409
337############################################################################# 410#############################################################################
338 411
339package CFClient::Widget::Window; 412package CFClient::UI::Window;
340 413
341our @ISA = CFClient::Widget::Bin::; 414our @ISA = CFClient::UI::Bin::;
342 415
343use SDL::OpenGL; 416use SDL::OpenGL;
344 417
345sub new { 418sub new {
346 my ($class, %arg) = @_; 419 my ($class, %arg) = @_;
… …
364 $self->{w}, $self->{h}, sub { $self->child->draw } 437 $self->{w}, $self->{h}, sub { $self->child->draw }
365 ); 438 );
366} 439}
367 440
368sub size_allocate { 441sub size_allocate {
369 my ($self, $w, $h) = @_; 442 my ($self, $x, $y, $w, $h) = @_;
370 443
371 $self->{w} = $w; 444 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 445
374 $self->child->size_allocate ($w, $h); 446 $self->child->size_allocate (0, 0, $w, $h);
375 447
376 $self->render_chld; 448 $self->render_chld;
377} 449}
378 450
379sub _draw { 451sub _draw {
… …
383 455
384 my $tex = $self->{texture} 456 my $tex = $self->{texture}
385 or return; 457 or return;
386 458
387 glEnable GL_BLEND; 459 glEnable GL_BLEND;
460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glEnable GL_TEXTURE_2D; 461 glEnable GL_TEXTURE_2D;
389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390 463
391 $tex->draw_quad (0, 0, $w, $h); 464 $tex->draw_quad (0, 0, $w, $h);
392 465
… …
394 glDisable GL_TEXTURE_2D; 467 glDisable GL_TEXTURE_2D;
395} 468}
396 469
397############################################################################# 470#############################################################################
398 471
399package CFClient::Widget::Frame; 472package CFClient::UI::Frame;
400 473
401our @ISA = CFClient::Widget::Bin::; 474our @ISA = CFClient::UI::Bin::;
402 475
403use SDL::OpenGL; 476use SDL::OpenGL;
404 477
405sub size_request { 478sub size_request {
406 my ($self) = @_; 479 my ($self) = @_;
… …
411 484
412 map { $_ + 4 } $chld->size_request; 485 map { $_ + 4 } $chld->size_request;
413} 486}
414 487
415sub size_allocate { 488sub size_allocate {
416 my ($self, $w, $h) = @_; 489 my ($self, $x, $y, $w, $h) = @_;
417 490
418 $self->{w} = $w; 491 $self->_size_allocate ($x, $y, $w, $h) or return;
419 $self->{h} = $h;
420 492
421 $self->child->size_allocate ($w - 4, $h - 4); 493 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
422 $self->child->move (2, 2);
423} 494}
424 495
425sub _draw { 496sub _draw {
426 my ($self) = @_; 497 my ($self) = @_;
427 498
… …
440 $chld->draw; 511 $chld->draw;
441} 512}
442 513
443############################################################################# 514#############################################################################
444 515
445package CFClient::Widget::FancyFrame; 516package CFClient::UI::FancyFrame;
446 517
447our @ISA = CFClient::Widget::Bin::; 518our @ISA = CFClient::UI::Bin::;
448 519
449use SDL::OpenGL; 520use SDL::OpenGL;
450 521
451my @tex = 522my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 524 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454 525
455sub size_request { 526sub size_request {
456 my ($self) = @_; 527 my ($self) = @_;
457 528
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530
458 my ($w, $h) = $self->SUPER::size_request; 531 my ($w, $h) = $self->SUPER::size_request;
459 532
460 $h += $tex[1]->{height}; 533 $h += $tex[1]->{h};
461 $h += $tex[4]->{height}; 534 $h += $tex[4]->{h};
462 $w += $tex[2]->{width}; 535 $w += $tex[2]->{w};
463 $w += $tex[3]->{width}; 536 $w += $tex[3]->{w};
464 537
465 ($w, $h) 538 ($w, $h)
466} 539}
467 540
468sub size_allocate { 541sub size_allocate {
469 my ($self, $w, $h) = @_; 542 my ($self, $x, $y, $w, $h) = @_;
470 543
471 $self->SUPER::size_allocate ($w, $h); 544 $self->_size_allocate ($x, $y, $w, $h) or return;
472 545
473 $h -= $tex[1]->{height}; 546 $h -= $tex[1]{h};
474 $h -= $tex[4]->{height}; 547 $h -= $tex[4]{h};
475 $w -= $tex[2]->{width}; 548 $w -= $tex[2]{w};
476 $w -= $tex[3]->{width}; 549 $w -= $tex[3]{w};
477 550
478 $h = $h < 0 ? 0 : $h; 551 $h = $h < 0 ? 0 : $h;
479 $w = $w < 0 ? 0 : $w; 552 $w = $w < 0 ? 0 : $w;
480 553
481 my $child = $self->child; 554 my $child = $self->child;
482 555
483 $child->size_allocate ($w, $h); 556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
484 $child->move ($tex[3]->{width}, $tex[1]->{height}); 557}
558
559sub button_down {
560 my ($self, $ev, $x, $y) = @_;
561
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
564
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h});
567
568 $self->{motion} = sub {
569 my ($ev, $x, $y) = @_;
570
571 ($x, $y) = ($ev->motion_x, $ev->motion_y);
572
573 $self->{user_w} = $bw + $x - $ox;
574 $self->{user_h} = $bh + $y - $oy;
575 $self->update;
576 };
577
578 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) {
580
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y});
583
584 $self->{motion} = sub {
585 my ($ev, $x, $y) = @_;
586
587 ($x, $y) = ($ev->motion_x, $ev->motion_y);
588
589 $self->move ($bx + $x - $ox, $by + $y - $oy);
590 $self->update;
591 };
592 }
593}
594
595sub button_up {
596 my ($self, $ev, $x, $y) = @_;
597
598 delete $self->{motion};
599}
600
601sub mouse_motion {
602 my ($self, $ev, $x, $y) = @_;
603
604 $self->{motion}->($ev, $x, $y) if $self->{motion};
485} 605}
486 606
487sub _draw { 607sub _draw {
488 my ($self) = @_; 608 my ($self) = @_;
489 609
490 my ($w, $h) = ($self->{w}, $self->{h}); 610 my ($w, $h) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492 612
493 glEnable GL_BLEND; 613 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494 glEnable GL_TEXTURE_2D; 615 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497 617
498 my $top = $tex[1]; 618 my $top = $tex[1];
499 $top->draw_quad (0, 0, $w, $top->{height}); 619 $top->draw_quad (0, 0, $w, $top->{h});
500 620
501 my $left = $tex[3]; 621 my $left = $tex[3];
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
503 623
504 my $right = $tex[2]; 624 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 625 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
506 626
507 my $bottom = $tex[4]; 627 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
509 629
510 my $bg = $tex[0]; 630 my $bg = $tex[0];
631
511 glBindTexture GL_TEXTURE_2D, $bg->{name}; 632 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515 636
516 my $rep_x = $cw / $bg->{width}; 637 my $rep_x = $cw / $bg->{w};
517 my $rep_y = $ch / $bg->{height}; 638 my $rep_y = $ch / $bg->{h};
518 639
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
520 641
642 glDisable GL_TEXTURE_2D;
521 glDisable GL_BLEND; 643 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523 644
524 $self->child->draw; 645 $self->child->draw;
525 646
526} 647}
527 648
528############################################################################# 649#############################################################################
529 650
530package CFClient::Widget::Table; 651package CFClient::UI::Table;
531 652
532our @ISA = CFClient::Widget::Bin::; 653our @ISA = CFClient::UI::Base::;
654
655use List::Util qw(max sum);
533 656
534use SDL::OpenGL; 657use SDL::OpenGL;
658
659sub new {
660 my $class = shift;
661
662 $class->SUPER::new (
663 col_expand => [],
664 @_
665 )
666}
535 667
536sub add { 668sub add {
537 my ($self, $x, $y, $chld) = @_; 669 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539 670
540 $self->{children}[$y][$x] = $chld; 671 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self); 672 $chld->set_parent ($self);
673
674 $self->{w} = $self->{h} = -1;
542 $self->update; 675 $self->update;
543} 676}
544 677
545sub max_row_height { 678sub get_wh {
546 my ($self, $row) = @_; 679 my ($self) = @_;
547 680
548 my $hs = 0; 681 my (@w, @h);
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 682
683 for my $y (0 .. $#{$self->{children}}) {
550 my $c = $self->{children}->[$row]->[$xi]; 684 my $row = $self->{children}[$y]
551 if ($c) { 685 or next;
686
687 for my $x (0 .. $#$row) {
688 my $widget = $row->[$x]
689 or next;
552 my ($w, $h) = $c->size_request; 690 my ($w, $h) = $widget->size_request;
553 if ($hs < $h) { $hs = $h } 691
692 $w[$x] = max $w[$x], $w;
693 $h[$y] = max $h[$y], $h;
554 } 694 }
555 } 695 }
556 return $hs;
557}
558 696
559sub max_col_width { 697 (\@w, \@h)
698}
699
700sub size_request {
560 my ($self, $col) = @_; 701 my ($self) = @_;
561 702
703 my ($ws, $hs) = $self->get_wh;
704
705 (
706 (sum @$ws),
707 (sum @$hs),
708 )
709}
710
711sub size_allocate {
712 my ($self, $x, $y, $w, $h) = @_;
713
714 $self->_size_allocate ($x, $y, $w, $h) or return;
715
716 my ($ws, $hs) = $self->get_wh;
717
718 my $req_w = sum @$ws;
719 my $req_h = sum @$hs;
720
721 # TODO: nicer code && do row_expand
722 my @col_expand = @{$self->{col_expand}};
723 @col_expand = (1) x @$ws unless @col_expand;
724 my $col_expand = (sum @col_expand) || 1;
725
726 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729
730 my $y;
731
732 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r]
734 or next;
735
562 my $ws = 0; 736 my $x = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 737 my $row_h = $hs->[$r];
564 my $c = ($self->{children}->[$yi] || [])->[$col]; 738
565 if ($c) { 739 for my $c (0 .. $#$row) {
566 my ($w, $h) = $c->size_request; 740 my $widget = $row->[$c]
567 if ($ws < $w) { $ws = $w } 741 or next;
742
743 my $col_w = $ws->[$c];
744
745 $widget->size_allocate ($x, $y, $col_w, $row_h);
746
747 $x += $col_w;
568 } 748 }
749
750 $y += $row_h;
569 } 751 }
570 return $ws; 752
571} 753}
754
755sub find_widget {
756 my ($self, $x, $y) = @_;
757
758 $x -= $self->{x};
759 $y -= $self->{y};
760
761 my $res;
762
763 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
764 $res = $_->find_widget ($x, $y)
765 and return $res;
766 }
767
768 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
769}
770
771sub _draw {
772 my ($self) = @_;
773
774 for (grep $_, @{$self->{children}}) {
775 $_->draw for grep $_, @$_;
776 }
777}
778
779#############################################################################
780
781package CFClient::UI::HBox;
782
783# TODO: wrap into common Box base class
784
785our @ISA = CFClient::UI::Container::;
572 786
573sub size_request { 787sub size_request {
574 my ($self) = @_; 788 my ($self) = @_;
575 789
790 my @alloc = map [$_->size_request], @{$self->{children}};
791
792 (
793 (List::Util::sum map $_->[0], @alloc),
794 (List::Util::max map $_->[1], @alloc),
795 )
796}
797
798sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804
576 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
577 806
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
579 $hs += $self->max_row_height ($yi);
580 }
581 808
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
583 my $wm = 0; 810
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
585 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
586 } 826 }
587 if ($ws < $wm) { $ws = $wm }
588 } 827 }
589
590 return ($ws, $hs);
591}
592
593sub _draw {
594 my ($self) = @_;
595 828
596 my $y = 0; 829 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
598 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
599 834
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 } 836 }
613} 837}
614 838
615############################################################################# 839#############################################################################
616 840
617package CFClient::Widget::VBox; 841package CFClient::UI::VBox;
618 842
843# TODO: wrap into common Box base class
844
619our @ISA = CFClient::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
620
621use SDL::OpenGL;
622 846
623sub size_request { 847sub size_request {
624 my ($self) = @_; 848 my ($self) = @_;
625 849
626 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
630 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
631 ) 855 )
632} 856}
633 857
634sub size_allocate { 858sub size_allocate {
635 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
636 860
637 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h) or return;
638 $self->h ($h);
639 862
640 my $exp; 863 return unless $self->{h};
641 my @oth; 864
642 # find expand widget 865 my $children = $self->{children};
643 for (@{$self->{children}}) { 866
644 if ($_->{expand}) { 867 my @h = map +($_->size_request)[1], @$children;
868
869 my $req_h = List::Util::sum @h;
870
871 if ($req_h > $h) {
872 # ah well, not enough space
873 $_ *= $h / $req_h for @h;
874 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children;
645 $exp = $_; 876 $exp ||= 1;
646 last; 877
878 for (0 .. $#$children) {
879 my $child = $children->[$_];
880
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
647 } 882 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 } 883 }
659 884
660 my $y = 0; 885 my $y = 0;
661 for (@{$self->{children}}) { 886 for (0 .. $#$children) {
662 $_->move (0, $y); 887 my $child = $children->[$_];
663 888 my $h = $h[$_];
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h); 889 $child->size_allocate (0, $y, $w, $h);
890
670 $y += $h; 891 $y += $h;
671 }
672 } 892 }
673} 893}
674 894
675############################################################################# 895#############################################################################
676 896
677package CFClient::Widget::Label; 897package CFClient::UI::Label;
678 898
679our @ISA = CFClient::Widget::; 899our @ISA = CFClient::UI::Base::;
680 900
681use SDL::OpenGL; 901use SDL::OpenGL;
682 902
683sub new { 903sub new {
684 my ($class, %arg) = @_; 904 my ($class, %arg) = @_;
685 905
686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new ( 906 my $self = $class->SUPER::new (
688 color => [1, 1, 1], 907 fg => [1, 1, 1],
689 height => $::FONTSIZE, 908 height => $::FONTSIZE,
690 text => "", 909 text => "",
910 align => -1,
911 padding => 2,
691 layout => new CFClient::Layout, 912 layout => new CFClient::Layout,
692 %arg 913 %arg
693 ); 914 );
694 915
695 $self->set_text ($self->{text}); 916 $self->set_text ($self->{text});
696 917
697 $self 918 $self
698} 919}
699 920
921sub escape_text {
922 local $_ = $_[1];
923
924 s/&/&amp;/g;
925 s/>/&gt;/g;
926 s/</&lt;/g;
927
928 $_[1]
929}
930
700sub set_text { 931sub set_text {
701 my ($self, $text) = @_; 932 my ($self, $text) = @_;
702 933
703 $self->{text} = $text; 934 $self->{text} = $text;
704 $self->{layout}->set_markup ($text); 935 $self->{layout}->set_markup ($text);
705 936
706 delete $self->{texture}; 937 delete $self->{texture};
938 $self->update;
707} 939}
708 940
709sub get_text { 941sub get_text {
710 my ($self, $text) = @_; 942 my ($self, $text) = @_;
711 943
… …
715sub size_request { 947sub size_request {
716 my ($self) = @_; 948 my ($self) = @_;
717 949
718 $self->{layout}->set_width; 950 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height}); 951 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size 952 my ($w, $h) = $self->{layout}->size;
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 953
722# ( 954 (
723# $self->{texture}{width}, 955 $w + $self->{padding} * 2,
724# $self->{texture}{height}, 956 $h + $self->{padding} * 2,
725# ) 957 )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731} 958}
732 959
733sub size_allocate { 960sub size_allocate {
734 my ($self, $w, $h) = @_; 961 my ($self, $x, $y, $w, $h) = @_;
735 962
736 $self->SUPER::size_allocate ($w, $h); 963 $self->_size_allocate ($x, $y, $w, $h) or return;
964
737 delete $self->{texture}; 965 delete $self->{texture};
966}
967
968sub update {
969 my ($self) = @_;
970
971 delete $self->{texture};
972 $self->SUPER::update;
738} 973}
739 974
740sub _draw { 975sub _draw {
741 my ($self) = @_; 976 my ($self) = @_;
742 977
743 my $tex = $self->{texture} ||= do { 978 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w}); 979 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});
745 new_from_layout CFClient::Texture $self->{layout}; 981 new_from_layout CFClient::Texture $self->{layout}
746 }; 982 };
747 983
748 glEnable GL_BLEND; 984 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 986 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
752 988
753 glColor @{$self->{color}}; 989 glColor @{$self->{fg}};
754 990
755 $tex->draw_quad (0, 0); 991 my $x =
992 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5;
756 995
996 $tex->draw_quad ($x, $self->{padding});
997
998 glDisable GL_TEXTURE_2D;
757 glDisable GL_BLEND; 999 glDisable GL_BLEND;
758 glDisable GL_TEXTURE_2D;
759} 1000}
760 1001
761############################################################################# 1002#############################################################################
762 1003
763package CFClient::Widget::Entry; 1004package CFClient::UI::Entry;
764 1005
765our @ISA = CFClient::Widget::Label::; 1006our @ISA = CFClient::UI::Label::;
766 1007
767use SDL; 1008use SDL;
768use SDL::OpenGL; 1009use SDL::OpenGL;
769 1010
1011sub new {
1012 my $class = shift;
1013
1014 $class->SUPER::new (
1015 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1],
1018 active_fg => [0, 0, 0],
1019 @_
1020 )
1021}
1022
1023sub _set_text {
1024 my ($self, $text) = @_;
1025
1026 $self->{last_activity} = $::NOW;
1027
1028 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w});
1030
1031 $text =~ s/./*/g if $self->{hidden};
1032
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034
1035 $text = substr $text, 0, $self->{cursor};
1036 utf8::encode $text;
1037
1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1039}
1040
1041sub size_request {
1042 my ($self) = @_;
1043
1044 my ($w, $h) = $self->SUPER::size_request;
1045
1046 ($w + 1, $h) # add 1 for cursor
1047}
1048
1049sub size_allocate {
1050 my ($self, $x, $y, $w, $h) = @_;
1051
1052 $self->SUPER::size_allocate ($x, $y, $w, $h);
1053
1054 $self->_set_text ($self->{text});
1055}
1056
1057sub set_text {
1058 my ($self, $text) = @_;
1059
1060 $self->{cursor} = length $text;
1061 $self->_set_text ($text);
1062 $self->update;
1063}
1064
770sub key_down { 1065sub key_down {
771 my ($self, $ev) = @_; 1066 my ($self, $ev) = @_;
772 1067
773 my $mod = $ev->key_mod; 1068 my $mod = $ev->key_mod;
774 my $sym = $ev->key_sym; 1069 my $sym = $ev->key_sym;
… …
776 my $uni = $ev->key_unicode; 1071 my $uni = $ev->key_unicode;
777 1072
778 my $text = $self->get_text; 1073 my $text = $self->get_text;
779 1074
780 if ($sym == SDLK_BACKSPACE) { 1075 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, ''; 1076 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1077 } elsif ($sym == SDLK_DELETE) {
1078 substr $text, $self->{cursor}, 1, "";
1079 } elsif ($sym == SDLK_LEFT) {
1080 --$self->{cursor} if $self->{cursor};
1081 } elsif ($sym == SDLK_RIGHT) {
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) {
1084 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) {
1086 $self->{cursor} = length $text;
782 } elsif ($uni) { 1087 } elsif ($uni) {
783 $text .= chr $uni; 1088 substr $text, $self->{cursor}++, 0, chr $uni;
784 } 1089 }
785 1090
786 $self->set_text ($text); 1091 $self->_set_text ($text);
1092 $self->update;
1093}
1094
1095sub focus_in {
1096 my ($self) = @_;
1097
1098 $self->{last_activity} = $::NOW;
1099
1100 $self->SUPER::focus_in;
787} 1101}
788 1102
789sub button_down { 1103sub button_down {
790 my ($self, $ev) = @_; 1104 my ($self, $ev, $x, $y) = @_;
791 1105
792 $self->focus_in; 1106 $self->SUPER::button_down ($ev, $x, $y);
1107
1108 my $idx = $self->{layout}->xy_to_index ($x, $y);
1109
1110 # byte-index to char-index
1111 my $text = $self->{text};
1112 utf8::encode $text;
1113 $self->{cursor} = length substr $text, 0, $idx;
1114
1115 $self->_set_text ($self->{text});
1116 $self->update;
793} 1117}
794 1118
795sub mouse_motion { 1119sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_; 1120 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1121# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798} 1122}
799 1123
800sub _draw { 1124sub _draw {
801 my ($self) = @_; 1125 my ($self) = @_;
802 1126
1127 local $self->{fg} = $self->{fg};
1128
803 if ($FOCUS == $self) { 1129 if ($FOCUS == $self) {
804 glColor 1, 1, 1; 1130 glColor @{$self->{active_bg}};
1131 $self->{fg} = $self->{active_fg};
805 } else { 1132 } else {
806 glColor 0.7, 0.7, 0.7; 1133 glColor @{$self->{bg}};
807 } 1134 }
808 1135
1136 glEnable GL_BLEND;
1137 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glBegin GL_QUADS; 1138 glBegin GL_QUADS;
810 glVertex 0 , 0; 1139 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1; 1140 glVertex 0 , $self->{h};
812 glVertex $self->{w} - 1, $self->{h} - 1; 1141 glVertex $self->{w}, $self->{h};
813 glVertex $self->{w} - 1, 0; 1142 glVertex $self->{w}, 0;
814 glEnd; 1143 glEnd;
1144 glDisable GL_BLEND;
815 1145
816 $self->SUPER::_draw; 1146 $self->SUPER::_draw;
817}
818 1147
819############################################################################# 1148 #TODO: force update every cursor change :(
1149 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1150 glColor @{$self->{fg}};
1151 glBegin GL_LINES;
1152 glVertex $self->{cur_x}, $self->{cur_y};
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1154 glEnd;
1155 }
1156}
820 1157
1158#############################################################################
1159
1160package CFClient::UI::Slider;
1161
1162use strict;
1163
1164use SDL::OpenGL;
1165
1166our @ISA = CFClient::UI::DrawBG::;
1167
1168sub new {
1169 my $class = shift;
1170
1171 # range [value, low, high, page]
1172
1173 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10],
1177 req_w => 40,
1178 req_h => 10,
1179 vertical => 0,
1180 @_
1181 );
1182
1183 $self
1184}
1185
1186sub size_request {
1187 my ($self) = @_;
1188
1189 my $w = $self->{req_w};
1190 my $h = $self->{req_h};
1191
1192 $self->{vertical} ? ($h, $w) : ($w, $h)
1193}
1194
1195sub button_down {
1196 my ($self, $ev, $x, $y) = @_;
1197
1198 $self->SUPER::button_down ($ev, $x, $y);
1199 $self->mouse_motion ($ev, $x, $y);
1200}
1201
1202sub mouse_motion {
1203 my ($self, $ev, $x, $y) = @_;
1204
1205 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209
1210 $x = $x * ($hi - $lo) / $w + $lo;
1211 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x;
1214
1215 $self->emit (changed => $x);
1216 $self->update;
1217 }
1218}
1219
1220sub _draw {
1221 my ($self) = @_;
1222
1223 $self->SUPER::_draw ();
1224
1225 my ($w, $h) = @$self{qw(w h)};
1226
1227 if ($self->{vertical}) {
1228 # draw a vertical slider like a rotated horizontal slider
1229
1230 glRotate 90, 0, 0, 1;
1231 glTranslate 0, -$self->{w}, 0;
1232
1233 ($w, $h) = ($h, $w);
1234 }
1235
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238
1239 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240
1241 $page = int $page * $w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo);
1243
1244 $w -= $page;
1245 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0;
1247
1248 glColor @$fg;
1249 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h;
1252 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253 glEnd;
1254
1255 my $knob_a = $value - $page * 0.5;
1256 my $knob_b = $value + $page * 0.5;
1257
1258 glBegin GL_QUADS;
1259 glColor @$fg;
1260 glVertex $knob_a, 0;
1261 glVertex $knob_a, $h;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264
1265 if ($knob_a < $knob_b - 2) {
1266 glColor @$bg;
1267 glVertex $knob_a + 1, 1;
1268 glVertex $knob_a + 1, $h - 1;
1269 glVertex $knob_b - 1, $h - 1;
1270 glVertex $knob_b - 1, 1;
1271 }
1272 glEnd;
1273}
1274
1275#############################################################################
1276
821package CFClient::Widget::MapWidget; 1277package CFClient::UI::MapWidget;
822 1278
823use strict; 1279use strict;
824 1280
825use List::Util qw(min max); 1281use List::Util qw(min max);
826 1282
827use SDL; 1283use SDL;
828use SDL::OpenGL; 1284use SDL::OpenGL;
829use SDL::OpenGL::Constants;
830 1285
831our @ISA = CFClient::Widget::; 1286our @ISA = CFClient::UI::Base::;
832 1287
833sub new { 1288sub new {
834 my $class = shift; 1289 my $class = shift;
835 1290
836 $class->SUPER::new ( 1291 $class->SUPER::new (
… …
847sub key_up { 1302sub key_up {
848} 1303}
849 1304
850sub size_request { 1305sub size_request {
851 ( 1306 (
852 1 + int $::WIDTH / 32, 1307 1 + 32 * int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32, 1308 1 + 32 * int $::HEIGHT / 32,
854 ) 1309 )
855} 1310}
856 1311
857sub update { 1312sub update {
858 my ($self) = @_; 1313 my ($self) = @_;
859 1314
860 $self->{need_update} = 1; 1315 $self->{need_update} = 1;
1316 $self->SUPER::update;
861} 1317}
862 1318
863sub _draw { 1319sub draw {
864 my ($self) = @_; 1320 my ($self) = @_;
865 1321
866 if (delete $self->{need_update}) { 1322 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE; 1323 glNewList $self->{list}, GL_COMPILE;
868 1324
… …
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
889 } 1345 }
890 1346
891 glEnable GL_TEXTURE_2D; 1347 glEnable GL_TEXTURE_2D;
892 glEnable GL_BLEND; 1348 glEnable GL_BLEND;
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 1351
895 my $sw4 = ($sw + 3) & ~3; 1352 my $sw4 = ($sw + 3) & ~3;
896 my $darkness = "\x00" x ($sw4 * $sh); 1353 my $darkness = "\x00" x ($sw4 * $sh);
897 1354
… …
910 } 1367 }
911 1368
912 for my $num (grep $_, @$cell[1,2,3]) { 1369 for my $num (grep $_, @$cell[1,2,3]) {
913 my $tex = $::CONN->{face}[$num]{texture} || next; 1370 my $tex = $::CONN->{face}[$num]{texture} || next;
914 1371
915 my $w = $tex->{width}; 1372 my ($w, $h) = @$tex{qw(w h)};
916 my $h = $tex->{height};
917 1373
918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
919 } 1375 }
920 } 1376 }
921 } 1377 }
… …
928# 1384#
929# $lighting = $pb->get_pixels; 1385# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs; 1386# $lighting =~ s/(.)../$1/gs;
931# } 1387# }
932 1388
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935 1390
936 $darkness = new CFClient::Texture 1391 $darkness = new CFClient::Texture
937 width => $sw4, 1392 w => $sw4,
938 height => $sh, 1393 h => $sh,
939 data => $darkness, 1394 data => $darkness,
940 internalformat => GL_ALPHA, 1395 internalformat => GL_ALPHA,
941 format => GL_ALPHA; 1396 format => GL_ALPHA;
942 1397
943 glColor 0.45, 0.45, 0.45, 1; 1398 glColor 0.45, 0.45, 0.45, 1;
… …
1003 } 1458 }
1004} 1459}
1005 1460
1006############################################################################# 1461#############################################################################
1007 1462
1008package CFClient::Widget::Animator; 1463package CFClient::UI::Animator;
1009 1464
1010use SDL::OpenGL; 1465use SDL::OpenGL;
1011 1466
1012our @ISA = CFClient::Widget::Bin::; 1467our @ISA = CFClient::UI::Bin::;
1013 1468
1014sub moveto { 1469sub moveto {
1015 my ($self, $x, $y) = @_; 1470 my ($self, $x, $y) = @_;
1016 1471
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1472 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1045 glPopMatrix; 1500 glPopMatrix;
1046} 1501}
1047 1502
1048############################################################################# 1503#############################################################################
1049 1504
1050package CFClient::Widget::Toplevel; 1505package CFClient::UI::Toplevel;
1051 1506
1052our @ISA = CFClient::Widget::Container::; 1507our @ISA = CFClient::UI::Container::;
1053 1508
1054sub size_request { 1509sub size_request {
1055 ($::WIDTH, $::HEIGHT) 1510 ($::WIDTH, $::HEIGHT)
1056} 1511}
1057 1512
1058sub size_allocate { 1513sub size_allocate {
1059 my ($self, $w, $h) = @_; 1514 my ($self, $x, $y, $w, $h) = @_;
1060 1515
1061 $self->SUPER::size_allocate ($w, $h); 1516 $self->_size_allocate ($x, $y, $w, $h);
1062 1517
1063 $_->size_allocate ($_->size_request) 1518 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1064 for @{$self->{children}}; 1519 for @{$self->{children}};
1065} 1520}
1066 1521
1067sub translate { 1522sub translate {
1068 my ($self, $x, $y) = @_; 1523 my ($self, $x, $y) = @_;
… …
1071} 1526}
1072 1527
1073sub update { 1528sub update {
1074 my ($self) = @_; 1529 my ($self) = @_;
1075 1530
1076 $self->size_allocate ($self->size_request); 1531 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1077 ::refresh (); 1532 ::refresh ();
1078} 1533}
1079 1534
1080sub add { 1535sub add {
1081 my ($self, $widget) = @_; 1536 my ($self, $widget) = @_;
1082 1537
1083 $self->SUPER::add ($widget); 1538 $self->SUPER::add ($widget);
1084 1539
1085 $widget->size_allocate ($widget->size_request); 1540 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1086} 1541}
1087 1542
1088sub draw { 1543sub draw {
1089 my ($self) = @_; 1544 my ($self) = @_;
1090 1545
1091 $self->_draw; 1546 $self->_draw;
1092} 1547}
1093 1548
1094############################################################################# 1549#############################################################################
1095 1550
1096package CFClient::Widget; 1551package CFClient::UI;
1097 1552
1098$TOPLEVEL = new CFClient::Widget::Toplevel; 1553$TOPLEVEL = new CFClient::UI::Toplevel;
1099 1554
11001 15551
1101 1556

Diff Legend

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