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.22 by elmex, Sat Apr 8 18:18:09 2006 UTC vs.
Revision 1.42 by root, Sun Apr 9 22:00:58 2006 UTC

… …
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client;
11
10our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 13
13# class methods for events 14# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
18 19
19sub new { 20sub new {
20 my $class = shift; 21 my $class = shift;
21 22
22 bless { @_ }, $class 23 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} 24}
36 25
37sub move { 26sub move {
38 my ($self, $x, $y, $z) = @_; 27 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 28 $self->{x} = $x;
… …
44sub needs_redraw { 33sub needs_redraw {
45 0 34 0
46} 35}
47 36
48sub size_request { 37sub size_request {
38 require Carp;
49 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
50} 47}
51 48
52sub focus_in { 49sub focus_in {
53 my ($widget) = @_; 50 my ($widget) = @_;
54 $FOCUS = $widget; 51 $FOCUS = $widget;
… …
72 69
73sub button_up { 70sub button_up {
74 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
75} 72}
76 73
77sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 79
83sub draw { 80sub draw {
… …
88 $self->_draw; 85 $self->_draw;
89 glPopMatrix; 86 glPopMatrix;
90} 87}
91 88
92sub _draw { 89sub _draw {
93 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
94} 93}
95 94
96sub bbox { 95sub bbox {
97 my ($widget) = @_; 96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
98} 134}
99 135
100sub DESTROY { 136sub DESTROY {
101 my ($self) = @_; 137 my ($self) = @_;
102 138
103 $self->deactivate; 139 #$self->deactivate;
104} 140}
141
142#############################################################################
105 143
106package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
107 145
108our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
109 147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h});
168}
169
170sub remove {
171 my ($self, $widget) = @_;
172
173 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
174
175 $self->size_allocate ($self->{w}, $self->{h});
176}
177
178sub find_widget {
179 my ($self, $x, $y) = @_;
180
181 my $res;
182
183 for (@{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y)
185 and return $res;
186 }
187
188 ()
189}
190
191sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
212package Crossfire::Client::Widget::Bin;
213
214our @ISA = Crossfire::Client::Widget::Container::;
215
216sub child { $_[0]->{children}[0] }
217
218sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220}
221
222sub size_allocate {
223 my ($self, $w, $h) = @_;
224
225 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0]
228}
229
230#############################################################################
231
232package Crossfire::Client::Widget::Toplevel;
233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
254our @ISA = Crossfire::Client::Widget::Bin::;
255
110use SDL::OpenGL; 256use SDL::OpenGL;
111 257
112sub add { $_[0]->{child} = $_[1] } 258sub new {
113sub get { $_[0]->{child} } 259 my ($class, $x, $y, $z, $w, $h) = @_;
114 260
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 261 my $self = $class->SUPER::new;
116 262
117sub _draw { die "Containers can't be drawn!" } 263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264}
118 265
119package Crossfire::Client::Widget::Window; 266sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 267 my ($self) = @_;
127 $self->SUPER::add ($chld); 268
128 $self->render_chld; 269 $self->render_chld;
270 $self->SUPER::update;
129} 271}
130 272
131sub render_chld { 273sub render_chld {
132 my ($self) = @_; 274 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135
136 $w = $h = 256;
137 275
138 $self->{texture} = 276 $self->{texture} =
139 Crossfire::Client::Texture->new_from_opengl ( 277 Crossfire::Client::Texture->new_from_opengl (
140 $w, $h, sub { 278 $self->{w}, $self->{h}, sub { $self->child->draw }
141 glPushMatrix;
142 glLoadIdentity;
143 $chld->_draw;
144 glPopMatrix;
145 }
146 ); 279 );
147 $self->{texture}->upload;
148} 280}
149 281
150sub size_request { 282sub size_allocate {
151 my ($self) = @_; 283 my ($self, $w, $h) = @_;
152 my $chld = $self->get 284
153 or return (0, 0); 285 $self->{w} = $w;
154 $chld->size_request 286 $self->{h} = $h;
287
288 $self->child->size_allocate ($w, $h);
289
290 $self->render_chld;
155} 291}
156 292
157sub _draw { 293sub _draw {
158 my ($self) = @_; 294 my ($self) = @_;
159 295
160 my ($w, $h) = $self->size_request; 296 my ($w, $h) = ($self->w, $self->h);
297
161 my $tex = $self->{texture} 298 my $tex = $self->{texture}
162 or return; 299 or return;
163 300
164 glEnable GL_BLEND; 301 glEnable GL_BLEND;
165 glEnable GL_TEXTURE_2D; 302 glEnable GL_TEXTURE_2D;
166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
167 glBindTexture GL_TEXTURE_2D, $tex->{name}; 304 glBindTexture GL_TEXTURE_2D, $tex->{name};
168 305
169 glColor 1, 1, 1;
170
171 glBegin GL_QUADS; 306 glBegin GL_QUADS;
172 glTexCoord 0, 0; glVertex 0 , 0; 307 glTexCoord 0, 0; glVertex 0, 0;
173 glTexCoord 0, 1; glVertex 0 , $h; 308 glTexCoord 0, 1; glVertex 0, $h;
174 glTexCoord 1, 1; glVertex $w , $h; 309 glTexCoord 1, 1; glVertex $w, $h;
175 glTexCoord 1, 0; glVertex $w , 0; 310 glTexCoord 1, 0; glVertex $w, 0;
176 glEnd; 311 glEnd;
177 312
178 glDisable GL_BLEND; 313 glDisable GL_BLEND;
179 glDisable GL_TEXTURE_2D; 314 glDisable GL_TEXTURE_2D;
180} 315}
181 316
317#############################################################################
318
182package Crossfire::Client::Widget::Frame; 319package Crossfire::Client::Widget::Frame;
183 320
184our @ISA = Crossfire::Client::Widget::Container::; 321our @ISA = Crossfire::Client::Widget::Bin::;
185 322
186use SDL::OpenGL; 323use SDL::OpenGL;
187 324
188sub size_request { 325sub size_request {
189 my ($self) = @_; 326 my ($self) = @_;
190 my $chld = $self->get 327 my $chld = $self->child
191 or return (0, 0); 328 or return (0, 0);
329
330 $chld->move (2, 2);
331
192 map { $_ + 4 } $chld->size_request; 332 map { $_ + 4 } $chld->size_request;
193} 333}
194 334
335sub size_allocate {
336 my ($self, $w, $h) = @_;
337
338 $self->{w} = $w;
339 $self->{h} = $h;
340
341 $self->child->size_allocate ($w - 4, $h - 4);
342 $self->child->move (2, 2);
343}
344
195sub _draw { 345sub _draw {
196 my ($self) = @_; 346 my ($self) = @_;
197 347
198 my $chld = $self->get; 348 my $chld = $self->child;
199 349
200 my ($w, $h) = $chld->size_request; 350 my ($w, $h) = $chld->size_request;
201 351
202 glColor 1, 0, 0;
203 glBegin GL_QUADS; 352 glBegin GL_QUADS;
353 glColor 0, 0, 0;
204 glTexCoord 0, 0; glVertex 0 , 0; 354 glTexCoord 0, 0; glVertex 0 , 0;
205 glTexCoord 0, 1; glVertex 0 , $h + 4; 355 glTexCoord 0, 1; glVertex 0 , $h + 4;
206 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
207 glTexCoord 1, 0; glVertex $w + 4 , 0; 357 glTexCoord 1, 0; glVertex $w + 4 , 0;
208 glEnd; 358 glEnd;
209 359
210 glPushMatrix;
211 glTranslate (2, 2, 0);
212 $chld->_draw; 360 $chld->draw;
213 glPopMatrix;
214} 361}
362
363#############################################################################
364
365package Crossfire::Client::Widget::FancyFrame;
366
367our @ISA = Crossfire::Client::Widget::Bin::;
368
369use SDL::OpenGL;
370
371my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374
375sub size_request {
376 my ($self) = @_;
377
378 my ($w, $h) = $self->SUPER::size_request;
379
380 $h += $tex[1]->{height};
381 $h += $tex[4]->{height};
382 $w += $tex[2]->{width};
383 $w += $tex[3]->{width};
384
385 ($w, $h)
386}
387
388sub size_allocate {
389 my ($self, $w, $h) = @_;
390
391 $self->SUPER::size_allocate ($w, $h);
392
393 $h -= $tex[1]->{height};
394 $h -= $tex[4]->{height};
395 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width};
397
398 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w;
400 warn "CHILD:$w $h\n";
401 $self->child->size_allocate ($w, $h);
402 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
403}
404
405sub _draw {
406 my ($self) = @_;
407
408 my ($w, $h) = ($self->w, $self->h);
409 my ($cw, $ch) = ($self->child->w, $self->child->h);
410
411 glEnable GL_BLEND;
412 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415
416 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name};
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425
426 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name};
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435
436 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name};
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445
446 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455
456 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461
462 my $rep_x = $cw / $bg->{width};
463 my $rep_y = $ch / $bg->{height};
464
465 glBegin GL_QUADS;
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471
472 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D;
474
475 $self->child->draw;
476
477}
478
479#############################################################################
215 480
216package Crossfire::Client::Widget::Table; 481package Crossfire::Client::Widget::Table;
217 482
218our @ISA = Crossfire::Client::Widget::Container::; 483our @ISA = Crossfire::Client::Widget::Bin::;
219 484
220use SDL::OpenGL; 485use SDL::OpenGL;
221 486
222sub add { 487sub add {
223 my ($self, $x, $y, $chld) = @_; 488 my ($self, $x, $y, $chld) = @_;
489 my $old_chld = $self->{children}[$y][$x];
490
224 $self->{childs}[$y][$x] = $chld; 491 $self->{children}[$y][$x] = $chld;
492 $chld->set_parent ($self);
493 $self->update;
225} 494}
226 495
227sub max_row_height { 496sub max_row_height {
228 my ($self, $row) = @_; 497 my ($self, $row) = @_;
229 498
230 my $hs = 0; 499 my $hs = 0;
231 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 500 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
232 my $c = $self->{childs}->[$row]->[$xi]; 501 my $c = $self->{children}->[$row]->[$xi];
233 if ($c) { 502 if ($c) {
234 my ($w, $h) = $c->size_request; 503 my ($w, $h) = $c->size_request;
235 if ($hs < $h) { $hs = $h } 504 if ($hs < $h) { $hs = $h }
236 } 505 }
237 } 506 }
… …
240 509
241sub max_col_width { 510sub max_col_width {
242 my ($self, $col) = @_; 511 my ($self, $col) = @_;
243 512
244 my $ws = 0; 513 my $ws = 0;
245 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 514 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
246 my $c = ($self->{childs}->[$yi] || [])->[$col]; 515 my $c = ($self->{children}->[$yi] || [])->[$col];
247 if ($c) { 516 if ($c) {
248 my ($w, $h) = $c->size_request; 517 my ($w, $h) = $c->size_request;
249 if ($ws < $w) { $ws = $w } 518 if ($ws < $w) { $ws = $w }
250 } 519 }
251 } 520 }
… …
255sub size_request { 524sub size_request {
256 my ($self) = @_; 525 my ($self) = @_;
257 526
258 my ($hs, $ws) = (0, 0); 527 my ($hs, $ws) = (0, 0);
259 528
260 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 529 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
261 $hs += $self->max_row_height ($yi); 530 $hs += $self->max_row_height ($yi);
262 } 531 }
263 532
264 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
265 my $wm = 0; 534 my $wm = 0;
266 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 535 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
267 $wm += $self->max_col_width ($xi) 536 $wm += $self->max_col_width ($xi)
268 } 537 }
269 if ($ws < $wm) { $ws = $wm } 538 if ($ws < $wm) { $ws = $wm }
270 } 539 }
271 540
… …
274 543
275sub _draw { 544sub _draw {
276 my ($self) = @_; 545 my ($self) = @_;
277 546
278 my $y = 0; 547 my $y = 0;
279 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 548 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
280 my $x = 0; 549 my $x = 0;
281 550
282 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 551 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
283 552
284 glPushMatrix;
285 glTranslate ($x, $y, 0);
286 my $c = $self->{childs}->[$yi]->[$xi]; 553 my $c = $self->{children}->[$yi]->[$xi];
554 if ($c) {
555 $c->move ($x, $y, 0); #TODO: Move to size_request
287 $c->_draw if $c; 556 $c->draw if $c;
288 glPopMatrix; 557 }
289 558
290 $x += $self->max_col_width ($xi); 559 $x += $self->max_col_width ($xi);
291 } 560 }
292 561
293 $y += $self->max_row_height ($yi); 562 $y += $self->max_row_height ($yi);
294 } 563 }
295} 564}
296 565
566#############################################################################
567
297package Crossfire::Client::Widget::VBox; 568package Crossfire::Client::Widget::VBox;
298 569
299our @ISA = Crossfire::Client::Widget::Container::; 570our @ISA = Crossfire::Client::Widget::Container::;
300 571
301use SDL::OpenGL; 572use SDL::OpenGL;
302 573
303sub add { 574sub size_allocate {
304 my ($self, $chld) = @_; 575 my ($self, $w, $h) = @_;
305 push @{$self->{childs}}, $chld;
306}
307 576
308sub size_request { 577 $self->w ($w);
309 my ($self) = @_; 578 $self->h ($h);
310 579
311 my ($hs, $ws) = (0, 0); 580 my $exp;
581 my @oth;
582 # find expand widget
312 for (@{$self->{childs} || []}) { 583 for (@{$self->{children}}) {
584 if ($_->{expand}) {
585 $exp = $_;
586 last;
587 }
588 push @oth, $_;
589 }
590
591 my ($ow, $oh);
592
593 # get sizes of other widgets
594 for (@oth) {
313 my ($w, $h) = $_->size_request; 595 my ($w, $h) = $_->size_request;
314 $hs += $h; 596 $oh += $h;
315 if ($ws < $w) { $ws = $w } 597 if ($ow < $w) { $ow = $w }
316 } 598 }
317 599
318 return ($ws, $hs); 600 my $y = 0;
601 for (@{$self->{children}}) {
602 $_->move (0, $y);
603
604 if ($_ == $exp) {
605 $_->size_allocate ($w, $h - $oh);
606 $y += $h - $oh;
607 } else {
608 my ($cw, $h) = $_->size_request;
609 $_->size_allocate ($w, $h);
610 $y += $h;
611 }
612 }
319} 613}
320 614
321sub _draw { 615sub _draw {
322 my ($self) = @_; 616 my ($self) = @_;
323 617
324 my ($x, $y); 618 my ($x, $y);
325 for (@{$self->{childs} || []}) { 619 for (@{$self->{children} || []}) {
326 glPushMatrix;
327 glTranslate (0, $y, 0);
328 $_->_draw; 620 $_->draw;
329 glPopMatrix;
330 my ($w, $h) = $_->size_request;
331 $y += $h; 621 $y += $_->h;
332 } 622 }
333} 623}
624
625#############################################################################
334 626
335package Crossfire::Client::Widget::Label; 627package Crossfire::Client::Widget::Label;
336 628
337our @ISA = Crossfire::Client::Widget::; 629our @ISA = Crossfire::Client::Widget::;
338 630
339use SDL::OpenGL; 631use SDL::OpenGL;
340 632
341sub new { 633sub new {
342 my ($class, $x, $y, $z, $ttf, $text) = @_; 634 my ($class, $x, $y, $z, $height, $text) = @_;
343 635
636 # TODO: color, and make height, xyz etc. optional
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345 638
346 $self->set_text ($text); 639 $self->set_text ($text);
347 640
348 $self 641 $self
349} 642}
350 643
351sub set_text { 644sub set_text {
352 my ($self, $text) = @_; 645 my ($self, $text) = @_;
646
647 $self->{text} = $text;
353 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
649
650 $self->update;
354} 651}
355 652
356sub get_text { 653sub get_text {
357 my ($self, $text) = @_; 654 my ($self, $text) = @_;
655
358 $self->{text} 656 $self->{text}
359} 657}
360 658
361sub size_request { 659sub size_request {
362 my ($self) = @_; 660 my ($self) = @_;
… …
372 670
373 my $tex = $self->{texture}; 671 my $tex = $self->{texture};
374 672
375 glEnable GL_BLEND; 673 glEnable GL_BLEND;
376 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
377 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
378 glBindTexture GL_TEXTURE_2D, $tex->{name}; 677 glBindTexture GL_TEXTURE_2D, $tex->{name};
379 678
380 glColor 1, 1, 1; 679 glColor 1, 0, 0, 1; # TODO color
381 680
382 glBegin GL_QUADS; 681 glBegin GL_QUADS;
383 glTexCoord 0, 0; glVertex 0 , 0; 682 glTexCoord 0, 0; glVertex 0 , 0;
384 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
385 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
388 687
389 glDisable GL_BLEND; 688 glDisable GL_BLEND;
390 glDisable GL_TEXTURE_2D; 689 glDisable GL_TEXTURE_2D;
391} 690}
392 691
692#############################################################################
693
393package Crossfire::Client::Widget::TextView; 694package Crossfire::Client::Widget::TextEntry;
695
696our @ISA = Crossfire::Client::Widget::Label::;
697
698use SDL;
699use SDL::OpenGL;
700
701sub key_down {
702 my ($self, $ev) = @_;
703
704 my $mod = $ev->key_mod;
705 my $sym = $ev->key_sym;
706
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode;
709
710 my $text = $self->get_text;
711
712 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, '';
714
715 } elsif ($uni) {
716 $text .= chr $uni;
717 }
718 $self->set_text ($text);
719}
720
721#############################################################################
722
723package Crossfire::Client::Widget::MapWidget;
394 724
395use strict; 725use strict;
396 726
397our @ISA = qw/Crossfire::Client::Widget/; 727use List::Util qw(min max);
398
399use SDL::OpenGL;
400use SDL::OpenGL::Constants;
401
402sub add_line {
403 my ($self, $line) = @_;
404 push @{$self->{lines}}, $line;
405}
406
407sub _draw {
408 my ($self) = @_;
409
410}
411
412package Crossfire::Client::Widget::MapWidget;
413
414use strict;
415
416our @ISA = qw/Crossfire::Client::Widget/;
417 728
418use SDL; 729use SDL;
419use SDL::OpenGL; 730use SDL::OpenGL;
420use SDL::OpenGL::Constants; 731use SDL::OpenGL::Constants;
421 732
733our @ISA = Crossfire::Client::Widget::;
734
422sub key_down { 735sub key_down {
423 print "MAPKEYDOWN\n"; 736 print "MAPKEYDOWN\n";
424} 737}
425 738
426sub key_up { 739sub key_up {
427} 740}
428 741
742sub size_request {
743
744}
745
746sub size_allocate {
747}
748
429sub _draw { 749sub _draw {
430 my ($self) = @_; 750 my ($self) = @_;
751
752 my $mx = $::CONN->{mapx};
753 my $my = $::CONN->{mapy};
754
755 my $map = $::CONN->{map};
756
757 my ($xofs, $yofs);
758
759 my $sw = 1 + int $::WIDTH / 32;
760 my $sh = 1 + int $::HEIGHT / 32;
761
762 if ($::CONN->{mapw} > $sw) {
763 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
764 } else {
765 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
766 }
767
768 if ($::CONN->{maph} > $sh) {
769 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
770 } else {
771 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
772 }
431 773
432 glEnable GL_TEXTURE_2D; 774 glEnable GL_TEXTURE_2D;
433 glEnable GL_BLEND; 775 glEnable GL_BLEND;
434 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
435 777
436 my $map = $::CONN->{map}; 778 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh);
437 780
438 for my $x (0 .. int $::WIDTH / 32) { 781 for my $x (0 .. $sw - 1) {
439 for my $y (0 .. int $::HEIGHT / 32) { 782 for my $y (0 .. $sh - 1) {
440 783
441 my $cell = $map->[$x + $::CONN->{mapx}] 784 my $cell = $map->[$x + $xofs][$y + $yofs]
442 [$y + $::CONN->{mapy}]
443 or next; 785 or next;
444 786
445 my $darkness = $cell->[0] * (1 / 255); 787 my $darkness = $cell->[0] * (1 / 255);
446 if ($darkness < 0) { 788 if ($darkness < 0) {
447 $darkness = 0.5; 789 $darkness = 0.15;
448 } 790 }
449 glColor $darkness, $darkness, $darkness; 791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
450 792
451 for my $num (grep $_, @$cell[1,2,3]) { 793 for my $num (grep $_, @$cell[1,2,3]) {
452 my $tex = $::CONN->{face}[$num]{texture} || next; 794 my $tex = $::CONN->{face}[$num]{texture} || next;
453 795
454 glBindTexture GL_TEXTURE_2D, $tex->{name}; 796 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
466 glTexCoord 1, 0; glVertex $px + $w, $py; 808 glTexCoord 1, 0; glVertex $px + $w, $py;
467 glEnd; 809 glEnd;
468 } 810 }
469 } 811 }
470 } 812 }
813
814# if (1) { # higher quality darkness
815# $lighting =~ s/(.)/$1$1$1/gs;
816# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
817#
818# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
819#
820# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs;
822# }
823
824 $lighting = new Crossfire::Client::Texture
825 width => $sw4,
826 height => $sh,
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
832 glColor 0, 0, 0, 0.75;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
471 842
472 glDisable GL_TEXTURE_2D; 843 glDisable GL_TEXTURE_2D;
473 glDisable GL_BLEND; 844 glDisable GL_BLEND;
474} 845}
475 846
… …
522 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 893 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
523 $::CONN->send ("command run_stop"); 894 $::CONN->send ("command run_stop");
524 } 895 }
525} 896}
526 897
898#############################################################################
899
900package Crossfire::Client::Widget::Animator;
901
902use SDL::OpenGL;
903
904our @ISA = Crossfire::Client::Widget::Bin::;
905
906sub moveto {
907 my ($self, $x, $y) = @_;
908
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2;
911 $self->{time} = 1;
912
913 ::animation_start $self;
914}
915
916sub animate {
917 my ($self, $interval) = @_;
918
919 $self->{time} -= $interval * $self->{speed};
920 if ($self->{time} <= 0) {
921 $self->{time} = 0;
922 ::animation_stop $self;
923 }
924
925 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
926
927 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
928 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
929}
930
931sub _draw {
932 my ($self) = @_;
933
934 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0;
936 $self->{children}[0]->draw;
937 glPopMatrix;
938}
939
5271; 9401;
528 941

Diff Legend

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