Make sender-hash based styling ("colored nicks") work again

[quassel.git] / src / uisupport / qssparser.cpp

diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp
index d93c7b2..c25bceb 100644 (file)
--- a/src/uisupport/qssparser.cpp
+++ b/src/uisupport/qssparser.cpp
@@ -83,7 +83,7 @@ void QssParser::loadStyleSheet(const QString &styleSheet) {
   while((pos = blockrx.indexIn(ss, pos)) >= 0) {
     //qDebug() << blockrx.cap(1) << blockrx.cap(2);
 
   while((pos = blockrx.indexIn(ss, pos)) >= 0) {
     //qDebug() << blockrx.cap(1) << blockrx.cap(2);
 

-    if(blockrx.cap(2) == "ChatLine")
+    if(blockrx.cap(1).startsWith("ChatLine"))

       parseChatLineData(blockrx.cap(1).trimmed(), blockrx.cap(2).trimmed());
     //else
     // TODO: add moar here
       parseChatLineData(blockrx.cap(1).trimmed(), blockrx.cap(2).trimmed());
     //else
     // TODO: add moar here


@@ -98,8 +98,46 @@ void QssParser::parseChatLineData(const QString &decl, const QString &contents)
   if(fmtType == UiStyle::Invalid)
     return;
 
   if(fmtType == UiStyle::Invalid)
     return;
 

-  
+  QTextCharFormat format;

 
 

+  foreach(QString line, contents.split(';', QString::SkipEmptyParts)) {
+    int idx = line.indexOf(':');
+    if(idx <= 0) {
+      qWarning() << Q_FUNC_INFO << tr("Invalid property declaration: %1").arg(line.trimmed());
+      continue;
+    }
+    QString property = line.left(idx).trimmed();
+    QString value = line.mid(idx + 1).simplified();
+
+    if(property == "background" || property == "background-color")
+      format.setBackground(parseBrush(value));
+    else if(property == "foreground" || property == "color")
+      format.setForeground(parseBrush(value));
+
+    // font-related properties
+    else if(property.startsWith("font")) {
+      if(property == "font")
+        parseFont(value, &format);
+      else if(property == "font-style")
+        parseFontStyle(value, &format);
+      else if(property == "font-weight")
+        parseFontWeight(value, &format);
+      else if(property == "font-size")
+        parseFontSize(value, &format);
+      else if(property == "font-family")
+        parseFontFamily(value, &format);
+      else {
+        qWarning() << Q_FUNC_INFO << tr("Invalid font property: %1").arg(line);
+        continue;
+      }
+    }
+
+    else {
+      qWarning() << Q_FUNC_INFO << tr("Unknown ChatLine property: %1").arg(property);
+    }
+  }
+
+  _formats[fmtType] = format;

 }
 
 quint64 QssParser::parseFormatType(const QString &decl) {
 }
 
 quint64 QssParser::parseFormatType(const QString &decl) {


@@ -117,15 +155,17 @@ quint64 QssParser::parseFormatType(const QString &decl) {
 
   // First determine the subelement
   if(!subElement.isEmpty()) {
 
   // First determine the subelement
   if(!subElement.isEmpty()) {

-    if(subElement == "Timestamp")
+    if(subElement == "timestamp")

       fmtType |= UiStyle::Timestamp;
       fmtType |= UiStyle::Timestamp;

-    else if(subElement == "Sender")
+    else if(subElement == "sender")

       fmtType |= UiStyle::Sender;
       fmtType |= UiStyle::Sender;

-    else if(subElement == "Nick")
+    else if(subElement == "nick")

       fmtType |= UiStyle::Nick;
       fmtType |= UiStyle::Nick;

-    else if(subElement == "Hostmask")
+    else if(subElement == "contents")
+      fmtType |= UiStyle::Contents;
+    else if(subElement == "hostmask")

       fmtType |= UiStyle::Hostmask;
       fmtType |= UiStyle::Hostmask;

-    else if(subElement == "ModeFlags")
+    else if(subElement == "modeflags")

       fmtType |= UiStyle::ModeFlags;
     else {
       qWarning() << Q_FUNC_INFO << tr("Invalid subelement name in %1").arg(decl);
       fmtType |= UiStyle::ModeFlags;
     else {
       qWarning() << Q_FUNC_INFO << tr("Invalid subelement name in %1").arg(decl);


@@ -135,28 +175,34 @@ quint64 QssParser::parseFormatType(const QString &decl) {
 
   // Now, figure out the message type
   if(!msgType.isEmpty()) {
 
   // Now, figure out the message type
   if(!msgType.isEmpty()) {

-    if(msgType == "Plain")
+    if(msgType == "plain")

       fmtType |= UiStyle::PlainMsg;
       fmtType |= UiStyle::PlainMsg;

-    else if(msgType == "Notice")
+    else if(msgType == "notice")

       fmtType |= UiStyle::NoticeMsg;
       fmtType |= UiStyle::NoticeMsg;

-    else if(msgType == "Server")
-      fmtType |= UiStyle::ServerMsg;
-    else if(msgType == "Error")
-      fmtType |= UiStyle::ErrorMsg;
-    else if(msgType == "Join")
+    else if(msgType == "action")
+      fmtType |= UiStyle::ActionMsg;
+    else if(msgType == "nick")
+      fmtType |= UiStyle::NickMsg;
+    else if(msgType == "mode")
+      fmtType |= UiStyle::ModeMsg;
+    else if(msgType == "join")

       fmtType |= UiStyle::JoinMsg;
       fmtType |= UiStyle::JoinMsg;

-    else if(msgType == "Part")
+    else if(msgType == "part")

       fmtType |= UiStyle::PartMsg;
       fmtType |= UiStyle::PartMsg;

-    else if(msgType == "Quit")
+    else if(msgType == "quit")

       fmtType |= UiStyle::QuitMsg;
       fmtType |= UiStyle::QuitMsg;

-    else if(msgType == "Kick")
+    else if(msgType == "kick")

       fmtType |= UiStyle::KickMsg;
       fmtType |= UiStyle::KickMsg;

-    else if(msgType == "Rename")
-      fmtType |= UiStyle::RenameMsg;
-    else if(msgType == "Mode")
-      fmtType |= UiStyle::ModeMsg;
-    else if(msgType == "Action")
-      fmtType |= UiStyle::ActionMsg;
+    else if(msgType == "kill")
+      fmtType |= UiStyle::KillMsg;
+    else if(msgType == "server")
+      fmtType |= UiStyle::ServerMsg;
+    else if(msgType == "info")
+      fmtType |= UiStyle::InfoMsg;
+    else if(msgType == "error")
+      fmtType |= UiStyle::ErrorMsg;
+    else if(msgType == "daychange")
+      fmtType |= UiStyle::DayChangeMsg;

     else {
       qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl);
     }
     else {
       qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl);
     }


@@ -191,8 +237,8 @@ quint64 QssParser::parseFormatType(const QString &decl) {
               qWarning() << Q_FUNC_INFO << tr("Invalid senderhash specification: %1").arg(condValue);
               return UiStyle::Invalid;
             }
               qWarning() << Q_FUNC_INFO << tr("Invalid senderhash specification: %1").arg(condValue);
               return UiStyle::Invalid;
             }

-            if(val >= 255) {
-              qWarning() << Q_FUNC_INFO << tr("Senderhash can be at most \"fe\"!");
+            if(val >= 16) {
+              qWarning() << Q_FUNC_INFO << tr("Senderhash can be at most \"0x0f\"!");

               return UiStyle::Invalid;
             }
             fmtType |= val << 48;
               return UiStyle::Invalid;
             }
             fmtType |= val << 48;


@@ -242,7 +288,7 @@ void QssParser::parsePaletteData(const QString &decl, const QString &contents) {
       qWarning() << Q_FUNC_INFO << tr("Unknown palette role name: %1").arg(rolestr);
       continue;
     }
       qWarning() << Q_FUNC_INFO << tr("Unknown palette role name: %1").arg(rolestr);
       continue;
     }

-    QBrush brush = parseBrushValue(brushstr);
+    QBrush brush = parseBrush(brushstr);

     if(colorGroups.count()) {
       foreach(QPalette::ColorGroup group, colorGroups)
         _palette.setBrush(group, _paletteColorRoles.value(rolestr), brush);
     if(colorGroups.count()) {
       foreach(QPalette::ColorGroup group, colorGroups)
         _palette.setBrush(group, _paletteColorRoles.value(rolestr), brush);


@@ -251,10 +297,15 @@ void QssParser::parsePaletteData(const QString &decl, const QString &contents) {
   }
 }
 
   }
 }
 

-QBrush QssParser::parseBrushValue(const QString &str) {
-  QColor c = parseColorValue(str);
-  if(c.isValid())
+QBrush QssParser::parseBrush(const QString &str, bool *ok) {
+  if(ok)
+    *ok = false;
+  QColor c = parseColor(str);
+  if(c.isValid()) {
+    if(ok)
+      *ok = true;

     return QBrush(c);
     return QBrush(c);

+  }

 
   if(str.startsWith("palette")) { // Palette color role
     QRegExp rx("palette\\s*\\(\\s*([a-z-]+)\\s*\\)");
 
   if(str.startsWith("palette")) { // Palette color role
     QRegExp rx("palette\\s*\\(\\s*([a-z-]+)\\s*\\)");


@@ -286,6 +337,8 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QLinearGradient gradient(x1, y1, x2, y2);
     gradient.setStops(stops);
     }
     QLinearGradient gradient(x1, y1, x2, y2);
     gradient.setStops(stops);

+    if(ok)
+      *ok = true;

     return QBrush(gradient);
 
   } else if(str.startsWith("qconicalgradient")) {
     return QBrush(gradient);
 
   } else if(str.startsWith("qconicalgradient")) {


@@ -305,6 +358,8 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QConicalGradient gradient(cx, cy, angle);
     gradient.setStops(stops);
     }
     QConicalGradient gradient(cx, cy, angle);
     gradient.setStops(stops);

+    if(ok)
+      *ok = true;

     return QBrush(gradient);
 
   } else if(str.startsWith("qradialgradient")) {
     return QBrush(gradient);
 
   } else if(str.startsWith("qradialgradient")) {


@@ -326,13 +381,15 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QRadialGradient gradient(cx, cy, radius, fx, fy);
     gradient.setStops(stops);
     }
     QRadialGradient gradient(cx, cy, radius, fx, fy);
     gradient.setStops(stops);

+    if(ok)
+      *ok = true;

     return QBrush(gradient);
   }
 
   return QBrush();
 }
 
     return QBrush(gradient);
   }
 
   return QBrush();
 }
 

-QColor QssParser::parseColorValue(const QString &str) {
+QColor QssParser::parseColor(const QString &str) {

   if(str.startsWith("rgba")) {
     ColorTuple tuple = parseColorTuple(str.mid(4));
     if(tuple.count() == 4)
   if(str.startsWith("rgba")) {
     ColorTuple tuple = parseColorTuple(str.mid(4));
     if(tuple.count() == 4)


@@ -398,7 +455,7 @@ QGradientStops QssParser::parseGradientStops(const QString &str_) {
   int idx;
   while((idx = rx.indexIn(str)) == 0) {
     qreal x = rx.cap(1).toDouble();
   int idx;
   while((idx = rx.indexIn(str)) == 0) {
     qreal x = rx.cap(1).toDouble();

-    QColor c = parseColorValue(rx.cap(3));
+    QColor c = parseColor(rx.cap(3));

     if(!c.isValid())
       return QGradientStops();
     result << QGradientStop(x, c);
     if(!c.isValid())
       return QGradientStops();
     result << QGradientStop(x, c);


@@ -409,3 +466,83 @@ QGradientStops QssParser::parseGradientStops(const QString &str_) {
 
   return result;
 }
 
   return result;
 }

+
+/******** Font Properties ********/
+
+void QssParser::parseFont(const QString& value, QTextCharFormat* format) {
+  QRegExp rx("((?:(?:normal|italic|oblique|bold|100|200|300|400|500|600|700|800|900) ){0,2}) ?(\\d+)(pt|px)? \"(.*)\"");
+  if(!rx.exactMatch(value)) {
+    qWarning() << Q_FUNC_INFO << tr("Invalid font specification: %1").arg(value);
+    return;
+  }
+  format->setFontItalic(false);
+  format->setFontWeight(QFont::Normal);
+  QStringList proplist = rx.cap(1).split(' ', QString::SkipEmptyParts);
+  foreach(QString prop, proplist) {
+    if(prop == "italic")
+      format->setFontItalic(true);
+    //else if(prop == "oblique")
+    //  format->setStyle(QFont::StyleOblique);
+    else if(prop == "bold")
+      format->setFontWeight(QFont::Bold);
+    else { // number
+      int w = prop.toInt();
+      format->setFontWeight(qMin(w / 8, 99)); // taken from Qt's qss parser
+    }
+  }
+
+  if(rx.cap(3) == "px")
+    format->setProperty(QTextFormat::FontPixelSize, rx.cap(2).toInt());
+  else
+    format->setFontPointSize(rx.cap(2).toInt());
+
+  format->setFontFamily(rx.cap(4));
+}
+
+void QssParser::parseFontStyle(const QString& value, QTextCharFormat* format) {
+  if(value == "normal")
+    format->setFontItalic(false);
+  else if(value == "italic")
+    format->setFontItalic(true);
+  //else if(value == "oblique")
+  //  format->setStyle(QFont::StyleOblique);
+  else {
+    qWarning() << Q_FUNC_INFO << tr("Invalid font style specification: %1").arg(value);
+  }
+}
+
+void QssParser::parseFontWeight(const QString& value, QTextCharFormat* format) {
+  if(value == "normal")
+    format->setFontWeight(QFont::Normal);
+  else if(value == "bold")
+    format->setFontWeight(QFont::Bold);
+  else {
+    bool ok;
+    int w = value.toInt(&ok);
+    if(!ok) {
+      qWarning() << Q_FUNC_INFO << tr("Invalid font weight specification: %1").arg(value);
+      return;
+    }
+    format->setFontWeight(qMin(w / 8, 99)); // taken from Qt's qss parser
+  }
+}
+
+void QssParser::parseFontSize(const QString& value, QTextCharFormat* format) {
+  QRegExp rx("\\(d+)(pt|px)");
+  if(!rx.exactMatch(value)) {
+    qWarning() << Q_FUNC_INFO << tr("Invalid font size specification: %1").arg(value);
+    return;
+  }
+  if(rx.cap(2) == "px")
+    format->setProperty(QTextFormat::FontPixelSize, rx.cap(1).toInt());
+  else
+    format->setFontPointSize(rx.cap(1).toInt());
+}
+
+void QssParser::parseFontFamily(const QString& value, QTextCharFormat* format) {
+  QString family = value;
+  if(family.startsWith('"') && family.endsWith('"')) {
+    family = family.mid(1, family.length() - 2);
+  }
+  format->setFontFamily(family);
+}