Handle close button in SkOSWindow_Unix.

src/views/unix/SkOSWindow_Unix.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
@@ skipping 182 matching lines @@
         if (!select(x11_fd + 1, &input_fds, NULL, NULL, &tv)) {
             if (!XPending(dsp)) {
                 return false;
             }
         }
     }
     XNextEvent(dsp, evt);
     return true;
 }
 
+static Atom wm_delete_window_message;
+
 SkOSWindow::NextXEventResult SkOSWindow::nextXEvent() {
     XEvent evt;
     Display* dsp = fUnixWindow.fDisplay;
 
-    if (!MyXNextEventWithDelay(fUnixWindow.fDisplay, &evt)) {
+    if (!MyXNextEventWithDelay(dsp, &evt)) {
         return kContinue_NextXEventResult;
     }
 
     switch (evt.type) {
         case Expose:
             if (0 == evt.xexpose.count) {
                 return kPaintRequest_NextXEventResult;
             }
             break;
         case ConfigureNotify:
@@ skipping 23 matching lines @@
             this->handleKey(XKeyToSkKey(keysym));
             long uni = keysym2ucs(keysym);
             if (uni != -1) {
                 this->handleChar((SkUnichar) uni);
             }
             break;
         }
         case KeyRelease:
             this->handleKeyUp(XKeyToSkKey(XkbKeycodeToKeysym(dsp, evt.xkey.keycode, 0, 0)));
             break;
+        case ClientMessage:
+            if ((Atom)evt.xclient.data.l[0] == wm_delete_window_message) {
+                return kQuitRequest_NextXEventResult;
+            }
+            // fallthrough
         default:
             // Do nothing for other events
             break;
     }
     return kContinue_NextXEventResult;
 }
 
 void SkOSWindow::loop() {
     Display* dsp = fUnixWindow.fDisplay;
     if (NULL == dsp) {
         return;
     }
     Window win = fUnixWindow.fWin;
 
+    wm_delete_window_message = XInternAtom(dsp, "WM_DELETE_WINDOW", False);
+    XSetWMProtocols(dsp, win, &wm_delete_window_message, 1);
+
     XSelectInput(dsp, win, EVENT_MASK);
 
     bool sentExposeEvent = false;
 
     for (;;) {
         SkEvent::ServiceQueueTimer();
 
         bool moreToDo = SkEvent::ProcessEvent();
 
         if (this->isDirty() && !sentExposeEvent) {
@@ skipping 146 matching lines @@
 
 void SkEvent::SignalNonEmptyQueue() {
     // nothing to do, since we spin on our event-queue, polling for XPending
 }
 
 void SkEvent::SignalQueueTimer(SkMSec delay) {
     // just need to record the delay time. We handle waking up for it in
     // MyXNextEventWithDelay()
     gTimerDelay = delay;
 }