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.29 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.64 by root, Tue Apr 11 13:38:22 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 79}
36 80
37sub move { 81sub move {
38 my ($self, $x, $y, $z) = @_; 82 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 83 $self->{x} = $x;
… …
44sub needs_redraw { 88sub needs_redraw {
45 0 89 0
46} 90}
47 91
48sub size_request { 92sub size_request {
93 require Carp;
49 die "size_request is abtract"; 94 Carp::confess "size_request is abtract";
95}
96
97sub size_allocate {
98 my ($self, $w, $h) = @_;
99
100 $self->{w} = $w;
101 $self->{h} = $h;
102}
103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 109}
51 110
52sub focus_in { 111sub focus_in {
53 my ($widget) = @_; 112 my ($self) = @_;
54 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
55} 117}
56 118
57sub focus_out { 119sub focus_out {
58 my ($widget) = @_; 120 my ($self) = @_;
59}
60 121
61sub key_down { 122 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 123
65sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
67} 126}
68 127
128sub mouse_motion { }
129sub button_up { }
69sub button_down { 130sub button_down { }
70 my ($widget, $sdlev) = @_; 131sub key_down { }
71} 132sub key_up { }
72 133
73sub button_up { 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 139
83sub draw { 140sub draw {
84 my ($self) = @_; 141 my ($self) = @_;
85 142
86 glPushMatrix; 143 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
89 glPopMatrix; 157 glPopMatrix;
90} 158}
91 159
92sub _draw { 160sub _draw {
93 my ($widget) = @_; 161 my ($self) = @_;
162
163 warn "no draw defined for $self\n";
94} 164}
95 165
96sub bbox { 166sub bbox {
97 my ($widget) = @_; 167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175}
176
177sub find_widget {
178 my ($self, $x, $y) = @_;
179
180 return $self
181 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183
184 ()
185}
186
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent {
190 my ($self, $par) = @_;
191
192 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent};
194}
195
196sub get_parent {
197 $_[0]->{parent}
198}
199
200sub update {
201 my ($self) = @_;
202
203 $self->{parent}->update
204 if $self->{parent};
98} 205}
99 206
100sub DESTROY { 207sub DESTROY {
101 my ($self) = @_; 208 my ($self) = @_;
102 209
103 $self->deactivate; 210 #$self->deactivate;
104} 211}
105 212
213#############################################################################
214
106package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
107 216
108our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
218
219sub new {
220 my ($class, %arg) = @_;
221
222 my $children = delete $arg{children} || [];
223
224 my $self = $class->SUPER::new (children => []);
225 $self->add ($_) for @$children;
226
227 $self
228}
229
230sub add {
231 my ($self, $chld, $expand) = @_;
232
233 $chld->{expand} = $expand;
234 $chld->set_parent ($self);
235
236 @{$self->{children}} =
237 sort { $a->{z} <=> $b->{z} }
238 @{$self->{children}}, $chld;
239
240 $self->size_allocate ($self->{w}, $self->{h})
241 if $self->{w}; #TODO: check for "realised state"
242}
243
244sub remove {
245 my ($self, $widget) = @_;
246
247 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
248
249 $self->size_allocate ($self->{w}, $self->{h});
250}
251
252sub find_widget {
253 my ($self, $x, $y) = @_;
254
255 $x -= $self->{x};
256 $y -= $self->{y};
257
258 my $res;
259
260 for (reverse @{ $self->{children} }) {
261 $res = $_->find_widget ($x, $y)
262 and return $res;
263 }
264
265 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
266}
267
268sub _draw {
269 my ($self) = @_;
270
271 $_->draw for @{$self->{children}};
272}
273
274#############################################################################
275
276package CFClient::Widget::Bin;
277
278our @ISA = CFClient::Widget::Container::;
279
280sub child { $_[0]->{children}[0] }
281
282sub size_request {
283 $_[0]{children}[0]->size_request if $_[0]{children}[0];
284}
285
286sub size_allocate {
287 my ($self, $w, $h) = @_;
288
289 $self->SUPER::size_allocate ($w, $h);
290 $self->{children}[0]->size_allocate ($w, $h)
291 if $self->{children}[0]
292}
293
294#############################################################################
295
296package CFClient::Widget::Window;
297
298our @ISA = CFClient::Widget::Bin::;
109 299
110use SDL::OpenGL; 300use SDL::OpenGL;
111 301
112sub add { $_[0]->{child} = $_[1] } 302sub new {
113sub get { $_[0]->{child} } 303 my ($class, %arg) = @_;
114 304
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 305 my $self = $class->SUPER::new (%arg);
306}
116 307
117sub _draw { die "Containers can't be drawn!" } 308sub update {
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 309 my ($self) = @_;
127 $self->SUPER::add ($chld); 310
128 $self->render_chld; #TODO: Move this to the size_request event propably? 311 # we want to do this delayed...
312 $self->render_chld;
313 $self->SUPER::update;
129} 314}
130 315
131sub render_chld { 316sub render_chld {
132 my ($self) = @_; 317 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 318
136 $self->{texture} = 319 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 320 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 321 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 322 );
140 $self->{texture}->upload;
141} 323}
142 324
143sub size_request { 325sub size_allocate {
144 my ($self) = @_; 326 my ($self, $w, $h) = @_;
145 my $chld = $self->get 327
146 or return (0, 0); 328 $self->{w} = $w;
147 $chld->size_request 329 $self->{h} = $h;
330
331 $self->child->size_allocate ($w, $h);
332
333 $self->render_chld;
148} 334}
149 335
150sub _draw { 336sub _draw {
151 my ($self) = @_; 337 my ($self) = @_;
152 338
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 339 my ($w, $h) = ($self->w, $self->h);
154 340
155 my $tex = $self->{texture} 341 my $tex = $self->{texture}
156 or return; 342 or return;
157 343
158 glEnable GL_BLEND; 344 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 345 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162 347
163 glColor 1, 1, 1; 348 $tex->draw_quad (0, 0, $w, $h);
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171 349
172 glDisable GL_BLEND; 350 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 351 glDisable GL_TEXTURE_2D;
174} 352}
175 353
354#############################################################################
355
176package Crossfire::Client::Widget::Frame; 356package CFClient::Widget::Frame;
177 357
178our @ISA = Crossfire::Client::Widget::Container::; 358our @ISA = CFClient::Widget::Bin::;
179 359
180use SDL::OpenGL; 360use SDL::OpenGL;
181 361
182sub size_request { 362sub size_request {
183 my ($self) = @_; 363 my ($self) = @_;
184 my $chld = $self->get 364 my $chld = $self->child
185 or return (0, 0); 365 or return (0, 0);
366
367 $chld->move (2, 2);
368
186 map { $_ + 4 } $chld->size_request; 369 map { $_ + 4 } $chld->size_request;
187} 370}
188 371
372sub size_allocate {
373 my ($self, $w, $h) = @_;
374
375 $self->{w} = $w;
376 $self->{h} = $h;
377
378 $self->child->size_allocate ($w - 4, $h - 4);
379 $self->child->move (2, 2);
380}
381
189sub _draw { 382sub _draw {
190 my ($self) = @_; 383 my ($self) = @_;
191 384
192 my $chld = $self->get; 385 my $chld = $self->child;
193
194 $chld->move (2, 2, 0); #TODO:move to size_request
195 386
196 my ($w, $h) = $chld->size_request; 387 my ($w, $h) = $chld->size_request;
197 388
198 glColor 1, 0, 0;
199 glBegin GL_QUADS; 389 glBegin GL_QUADS;
200 glTexCoord 0, 0; glVertex 0 , 0; 390 glColor 0, 0, 0;
391 glVertex 0 , 0;
201 glTexCoord 0, 1; glVertex 0 , $h + 4; 392 glVertex 0 , $h + 4;
202 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 393 glVertex $w + 4 , $h + 4;
203 glTexCoord 1, 0; glVertex $w + 4 , 0; 394 glVertex $w + 4 , 0;
204 glEnd; 395 glEnd;
205 396
206 $chld->draw; 397 $chld->draw;
207} 398}
208 399
400#############################################################################
401
402package CFClient::Widget::FancyFrame;
403
404our @ISA = CFClient::Widget::Bin::;
405
406use SDL::OpenGL;
407
408my @tex =
409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
411
412sub size_request {
413 my ($self) = @_;
414
415 my ($w, $h) = $self->SUPER::size_request;
416
417 $h += $tex[1]->{height};
418 $h += $tex[4]->{height};
419 $w += $tex[2]->{width};
420 $w += $tex[3]->{width};
421
422 ($w, $h)
423}
424
425sub size_allocate {
426 my ($self, $w, $h) = @_;
427
428 $self->SUPER::size_allocate ($w, $h);
429
430 $h -= $tex[1]->{height};
431 $h -= $tex[4]->{height};
432 $w -= $tex[2]->{width};
433 $w -= $tex[3]->{width};
434
435 $h = $h < 0 ? 0 : $h;
436 $w = $w < 0 ? 0 : $w;
437
438 $self->child->size_allocate ($w, $h);
439 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
440}
441
442sub _draw {
443 my ($self) = @_;
444
445 my ($w, $h) = ($self->{w}, $self->{h});
446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
447
448 glEnable GL_BLEND;
449 glEnable GL_TEXTURE_2D;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452
453 my $top = $tex[1];
454 $top->draw_quad (0, 0, $w, $top->{height});
455
456 my $left = $tex[3];
457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
458
459 my $right = $tex[2];
460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
461
462 my $bottom = $tex[4];
463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
464
465 my $bg = $tex[0];
466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470
471 my $rep_x = $cw / $bg->{width};
472 my $rep_y = $ch / $bg->{height};
473
474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
475
476 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D;
478
479 $self->child->draw;
480
481}
482
483#############################################################################
484
209package Crossfire::Client::Widget::Table; 485package CFClient::Widget::Table;
210 486
211our @ISA = Crossfire::Client::Widget::Container::; 487our @ISA = CFClient::Widget::Bin::;
212 488
213use SDL::OpenGL; 489use SDL::OpenGL;
214 490
215sub add { 491sub add {
216 my ($self, $x, $y, $chld) = @_; 492 my ($self, $x, $y, $chld) = @_;
493 my $old_chld = $self->{children}[$y][$x];
494
217 $self->{childs}[$y][$x] = $chld; 495 $self->{children}[$y][$x] = $chld;
496 $chld->set_parent ($self);
497 $self->update;
218} 498}
219 499
220sub max_row_height { 500sub max_row_height {
221 my ($self, $row) = @_; 501 my ($self, $row) = @_;
222 502
223 my $hs = 0; 503 my $hs = 0;
224 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 504 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
225 my $c = $self->{childs}->[$row]->[$xi]; 505 my $c = $self->{children}->[$row]->[$xi];
226 if ($c) { 506 if ($c) {
227 my ($w, $h) = $c->size_request; 507 my ($w, $h) = $c->size_request;
228 if ($hs < $h) { $hs = $h } 508 if ($hs < $h) { $hs = $h }
229 } 509 }
230 } 510 }
… …
233 513
234sub max_col_width { 514sub max_col_width {
235 my ($self, $col) = @_; 515 my ($self, $col) = @_;
236 516
237 my $ws = 0; 517 my $ws = 0;
238 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 518 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
239 my $c = ($self->{childs}->[$yi] || [])->[$col]; 519 my $c = ($self->{children}->[$yi] || [])->[$col];
240 if ($c) { 520 if ($c) {
241 my ($w, $h) = $c->size_request; 521 my ($w, $h) = $c->size_request;
242 if ($ws < $w) { $ws = $w } 522 if ($ws < $w) { $ws = $w }
243 } 523 }
244 } 524 }
… …
248sub size_request { 528sub size_request {
249 my ($self) = @_; 529 my ($self) = @_;
250 530
251 my ($hs, $ws) = (0, 0); 531 my ($hs, $ws) = (0, 0);
252 532
253 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
254 $hs += $self->max_row_height ($yi); 534 $hs += $self->max_row_height ($yi);
255 } 535 }
256 536
257 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 537 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
258 my $wm = 0; 538 my $wm = 0;
259 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
260 $wm += $self->max_col_width ($xi) 540 $wm += $self->max_col_width ($xi)
261 } 541 }
262 if ($ws < $wm) { $ws = $wm } 542 if ($ws < $wm) { $ws = $wm }
263 } 543 }
264 544
… …
267 547
268sub _draw { 548sub _draw {
269 my ($self) = @_; 549 my ($self) = @_;
270 550
271 my $y = 0; 551 my $y = 0;
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 552 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
273 my $x = 0; 553 my $x = 0;
274 554
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 555 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
276 556
277 my $c = $self->{childs}->[$yi]->[$xi]; 557 my $c = $self->{children}->[$yi]->[$xi];
278 if ($c) { 558 if ($c) {
279 $c->move ($x, $y, 0); #TODO: Move to size_request 559 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 560 $c->draw if $c;
281 } 561 }
282 562
… …
285 565
286 $y += $self->max_row_height ($yi); 566 $y += $self->max_row_height ($yi);
287 } 567 }
288} 568}
289 569
570#############################################################################
571
290package Crossfire::Client::Widget::VBox; 572package CFClient::Widget::VBox;
291 573
292our @ISA = Crossfire::Client::Widget::Container::; 574our @ISA = CFClient::Widget::Container::;
293 575
294use SDL::OpenGL; 576use SDL::OpenGL;
295 577
296sub add {
297 my ($self, $chld) = @_;
298 push @{$self->{childs}}, $chld;
299}
300
301sub size_request { 578sub size_request {
302 my ($self) = @_; 579 my ($self) = @_;
303 580
304 my ($hs, $ws) = (0, 0); 581 my @alloc = map [$_->size_request], @{$self->{children}};
582
583 (
584 (List::Util::max map $_->[0], @alloc),
585 (List::Util::sum map $_->[1], @alloc),
586 )
587}
588
589sub size_allocate {
590 my ($self, $w, $h) = @_;
591
592 $self->w ($w);
593 $self->h ($h);
594
595 my $exp;
596 my @oth;
597 # find expand widget
305 for (@{$self->{childs} || []}) { 598 for (@{$self->{children}}) {
599 if ($_->{expand}) {
600 $exp = $_;
601 last;
602 }
603 push @oth, $_;
604 }
605
606 my ($ow, $oh);
607
608 # get sizes of other widgets
609 for (@oth) {
306 my ($w, $h) = $_->size_request; 610 my ($w, $h) = $_->size_request;
307 $hs += $h; 611 $oh += $h;
308 if ($ws < $w) { $ws = $w } 612 if ($ow < $w) { $ow = $w }
309 } 613 }
310 614
311 return ($ws, $hs); 615 my $y = 0;
312}
313
314sub _draw {
315 my ($self) = @_;
316
317 my ($x, $y);
318 for (@{$self->{childs} || []}) { 616 for (@{$self->{children}}) {
319 $_->move (0, $y, 0); #TODO: move to size_request 617 $_->move (0, $y);
320 $_->draw; 618
619 if ($_ == $exp) {
620 $_->size_allocate ($w, $h - $oh);
621 $y += $h - $oh;
622 } else {
321 my ($w, $h) = $_->size_request; 623 my ($cw, $h) = $_->size_request;
624 $_->size_allocate ($w, $h);
322 $y += $h; 625 $y += $h;
626 }
323 } 627 }
324} 628}
325 629
630#############################################################################
631
326package Crossfire::Client::Widget::Label; 632package CFClient::Widget::Label;
327 633
328our @ISA = Crossfire::Client::Widget::; 634our @ISA = CFClient::Widget::;
329 635
330use SDL::OpenGL; 636use SDL::OpenGL;
331 637
332sub new { 638sub new {
333 my ($class, $x, $y, $z, $height, $text) = @_; 639 my ($class, %arg) = @_;
334 640
335 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 641 # TODO: color, and make height, xyz etc. optional
642 my $self = $class->SUPER::new (
643 color => [1, 1, 1],
644 height => $::FONTSIZE,
645 text => "",
646 layout => new CFClient::Layout,
647 %arg
648 );
336 649
337 $self->set_text ($text); 650 $self->set_text ($self->{text});
338 651
339 $self 652 $self
340} 653}
341 654
342sub set_text { 655sub set_text {
343 my ($self, $text) = @_; 656 my ($self, $text) = @_;
344 657
345 $self->{text} = $text; 658 $self->{text} = $text;
659 $self->{layout}->set_markup ($text);
346 660
347 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 661 delete $self->{texture};
348} 662}
349 663
350sub get_text { 664sub get_text {
351 my ($self, $text) = @_; 665 my ($self, $text) = @_;
352 666
… …
354} 668}
355 669
356sub size_request { 670sub size_request {
357 my ($self) = @_; 671 my ($self) = @_;
358 672
359 ( 673 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
677# (
360 $self->{texture}{width}, 678# $self->{texture}{width},
361 $self->{texture}{height}, 679# $self->{texture}{height},
362 ) 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
363} 693}
364 694
365sub _draw { 695sub _draw {
366 my ($self) = @_; 696 my ($self) = @_;
367 697
368 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
369 702
370 glEnable GL_BLEND; 703 glEnable GL_BLEND;
371 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
373 glBindTexture GL_TEXTURE_2D, $tex->{name};
374 707
375 glColor 1, 1, 1, 0.8; 708 glColor @{$self->{color}};
376 709
377 glBegin GL_QUADS; 710 $tex->draw_quad (0, 0);
378 glTexCoord 0, 0; glVertex 0 , 0;
379 glTexCoord 0, 1; glVertex 0 , $tex->{height};
380 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
381 glTexCoord 1, 0; glVertex $tex->{width}, 0;
382 glEnd;
383 711
384 glDisable GL_BLEND; 712 glDisable GL_BLEND;
385 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
386} 714}
387 715
388package Crossfire::Client::Widget::TextView; 716#############################################################################
389 717
390use strict; 718package CFClient::Widget::Entry;
391 719
392our @ISA = qw/Crossfire::Client::Widget/; 720our @ISA = CFClient::Widget::Label::;
393 721
722use SDL;
394use SDL::OpenGL; 723use SDL::OpenGL;
395use SDL::OpenGL::Constants;
396 724
397sub add_line { 725sub key_down {
398 my ($self, $line) = @_; 726 my ($self, $ev) = @_;
399 push @{$self->{lines}}, $line; 727
728 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym;
730
731 my $uni = $ev->key_unicode;
732
733 my $text = $self->get_text;
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742}
743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
400} 753}
401 754
402sub _draw { 755sub _draw {
403 my ($self) = @_; 756 my ($self) = @_;
404 757
405} 758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
406 763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
407package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
408 777
409use strict; 778use strict;
410 779
411use List::Util qw(min max); 780use List::Util qw(min max);
412 781
413use SDL; 782use SDL;
414use SDL::OpenGL; 783use SDL::OpenGL;
415use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
416 785
417our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
787
788sub new {
789 my $class = shift;
790
791 $class->SUPER::new (z => -1, @_)
792}
418 793
419sub key_down { 794sub key_down {
420 print "MAPKEYDOWN\n"; 795 print "MAPKEYDOWN\n";
421} 796}
422 797
423sub key_up { 798sub key_up {
799}
800
801sub size_request {
802 (
803 1 + int $::WIDTH / 32,
804 1 + int $::HEIGHT / 32,
805 )
424} 806}
425 807
426sub _draw { 808sub _draw {
427 my ($self) = @_; 809 my ($self) = @_;
428 810
… …
448 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 830 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
449 } 831 }
450 832
451 glEnable GL_TEXTURE_2D; 833 glEnable GL_TEXTURE_2D;
452 glEnable GL_BLEND; 834 glEnable GL_BLEND;
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836
837 my $sw4 = ($sw + 3) & ~3;
838 my $darkness = "\x00" x ($sw4 * $sh);
454 839
455 for my $x (0 .. $sw - 1) { 840 for my $x (0 .. $sw - 1) {
841 my $row = $map->[$x + $xofs];
456 for my $y (0 .. $sh - 1) { 842 for my $y (0 .. $sh - 1) {
457 843
458 my $cell = $map->[$x + $xofs][$y + $yofs] 844 my $cell = $row->[$y + $yofs]
459 or next; 845 or next;
460 846
461 my $darkness = $cell->[0] * (1 / 255); 847 my $dark = $cell->[0];
462 if ($darkness < 0) { 848 if ($dark < 0) {
463 glColor 0.3, 0.3, 0.3; 849 substr $darkness, $y * $sw4 + $x, 1, chr 224;
464 } else { 850 } else {
465 glColor $darkness, $darkness, $darkness; 851 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
466 } 852 }
467 853
468 for my $num (grep $_, @$cell[1,2,3]) { 854 for my $num (grep $_, @$cell[1,2,3]) {
469 my $tex = $::CONN->{face}[$num]{texture} || next; 855 my $tex = $::CONN->{face}[$num]{texture} || next;
470 856
471 glBindTexture GL_TEXTURE_2D, $tex->{name};
472
473 my $w = $tex->{width}; 857 my $w = $tex->{width};
474 my $h = $tex->{height}; 858 my $h = $tex->{height};
475 859
476 my $px = ($x + 1) * 32 - $w; 860 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
477 my $py = ($y + 1) * 32 - $h;
478
479 glBegin GL_QUADS;
480 glTexCoord 0, 0; glVertex $px , $py;
481 glTexCoord 0, 1; glVertex $px , $py + $h;
482 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
483 glTexCoord 1, 0; glVertex $px + $w, $py;
484 glEnd;
485 } 861 }
486 } 862 }
487 } 863 }
864
865# if (1) { # higher quality darkness
866# $lighting =~ s/(.)/$1$1$1/gs;
867# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
868#
869# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
870#
871# $lighting = $pb->get_pixels;
872# $lighting =~ s/(.)../$1/gs;
873# }
874
875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
877
878 $darkness = new CFClient::Texture
879 width => $sw4,
880 height => $sh,
881 data => $darkness,
882 internalformat => GL_ALPHA,
883 format => GL_ALPHA;
884
885 glColor 0.45, 0.45, 0.45, 1;
886 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
488 887
489 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
490 glDisable GL_BLEND; 889 glDisable GL_BLEND;
491} 890}
492 891
… …
539 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 938 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
540 $::CONN->send ("command run_stop"); 939 $::CONN->send ("command run_stop");
541 } 940 }
542} 941}
543 942
5441; 943#############################################################################
545 944
945package CFClient::Widget::Animator;
946
947use SDL::OpenGL;
948
949our @ISA = CFClient::Widget::Bin::;
950
951sub moveto {
952 my ($self, $x, $y) = @_;
953
954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
955 $self->{speed} = 0.001;
956 $self->{time} = 1;
957
958 ::animation_start $self;
959}
960
961sub animate {
962 my ($self, $interval) = @_;
963
964 $self->{time} -= $interval * $self->{speed};
965 if ($self->{time} <= 0) {
966 $self->{time} = 0;
967 ::animation_stop $self;
968 }
969
970 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
971
972 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
973 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
974}
975
976sub _draw {
977 my ($self) = @_;
978
979 glPushMatrix;
980 glRotate $self->{time} * 1000, 0, 1, 0;
981 $self->{children}[0]->draw;
982 glPopMatrix;
983}
984
985#############################################################################
986
987package CFClient::Widget::Toplevel;
988
989our @ISA = CFClient::Widget::Container::;
990
991sub size_request {
992 ($::WIDTH, $::HEIGHT)
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 $_->size_allocate ($_->size_request)
1001 for @{$self->{children}};
1002}
1003
1004sub translate {
1005 my ($self, $x, $y) = @_;
1006
1007 ($x, $y)
1008}
1009
1010sub update {
1011 my ($self) = @_;
1012
1013 $self->size_allocate ($self->size_request);
1014 ::refresh ();
1015}
1016
1017sub add {
1018 my ($self, $widget) = @_;
1019
1020 $self->SUPER::add ($widget);
1021
1022 $widget->size_allocate ($widget->size_request);
1023}
1024
1025sub draw {
1026 my ($self) = @_;
1027
1028 $self->_draw;
1029}
1030
1031#############################################################################
1032
1033package CFClient::Widget;
1034
1035$TOPLEVEL = new CFClient::Widget::Toplevel;
1036
10371
1038

Diff Legend

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